Changeset f18d82f0 in mainline for uspace/drv/bus/usb/uhci/uhci_batch.c

Timestamp:

2011-08-31T21:45:59Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9c10e51

Parents:

70fb822

Message:

libusbhost: change finish functions to do the data copying if necessary

uhci: use new finish functions instead of manual copy

File:

• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (1 diff)

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

@@ -66 +66 @@
         assert(uhci_batch);
         assert(uhci_batch->usb_batch);
-        /* Copy data unless we are sure we sent it */
-        if (uhci_batch->usb_batch->ep->direction != USB_DIRECTION_OUT) {
-                memcpy(uhci_batch->usb_batch->buffer,
-                    uhci_transfer_batch_data_buffer(uhci_batch),
-                    uhci_batch->usb_batch->buffer_size);
-        }
-        if (uhci_batch->usb_batch->callback_out)
-                usb_transfer_batch_call_out(uhci_batch->usb_batch);
-        if (uhci_batch->usb_batch->callback_in)
-                usb_transfer_batch_call_in(uhci_batch->usb_batch);
+        usb_transfer_batch_finish(uhci_batch->usb_batch,
+            uhci_transfer_batch_data_buffer(uhci_batch),
+            uhci_batch->usb_batch->buffer_size);
         uhci_transfer_batch_dispose(uhci_batch);
 }