Changeset 58ac3ec in mainline for uspace/drv/bus/usb/uhci/uhci_batch.h

Timestamp:

2017-10-28T10:39:17Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

40a3bfa

Parents:

8b8c164

Message:

uhci: finished forgotten refactoring to generic batch

File:

• uspace/drv/bus/usb/uhci/uhci_batch.h (modified) (3 diffs)

uspace/drv/bus/usb/uhci/uhci_batch.h

@@ -63 +63 @@
         /** Data buffer, must be accessible by the UHCI hw */
         void *device_buffer;
-        /** Generic transfer data */
-        usb_transfer_batch_t *usb_batch;
         /** List element */
         link_t link;
@@ -95 +93 @@
 {
         assert(uhci_batch);
-        assert(uhci_batch->usb_batch);
         return uhci_transfer_batch_setup_buffer(uhci_batch) +
             (uhci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL ? USB_SETUP_PACKET_SIZE : 0);
@@ -108 +105 @@
 {
         assert(uhci_batch);
-        assert(uhci_batch->usb_batch);
-        uhci_batch->usb_batch->error = EINTR;
-        uhci_batch->usb_batch->transfered_size = 0;
+        uhci_batch->base.error = EINTR;
+        uhci_batch->base.transfered_size = 0;
         usb_transfer_batch_finish(&uhci_batch->base);
 }