Changeset f18d82f0 in mainline for uspace/lib/usbhost/src/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/lib/usbhost/src/batch.c (modified) (1 diff)

uspace/lib/usbhost/src/batch.c

@@ -84 +84 @@
  *
  */
-void usb_transfer_batch_finish(usb_transfer_batch_t *instance)
+void usb_transfer_batch_finish(
+    usb_transfer_batch_t *instance, const void *data, size_t size)
 {
         assert(instance);
-        if (instance->next_step)
-                instance->next_step(instance);
+        assert(instance->ep);
+        /* we care about the data and there are some to copy */
+        if (instance->ep->direction != USB_DIRECTION_OUT
+            && data) {
+                const size_t min_size =
+                    size < instance->buffer_size ? size : instance->buffer_size;
+                memcpy(instance->buffer, data, min_size);
+        }
+        if (instance->callback_out)
+                usb_transfer_batch_call_out(instance);
+        if (instance->callback_in)
+                usb_transfer_batch_call_in(instance);
+
 }
 /*----------------------------------------------------------------------------*/