Changeset f18d82f0 in mainline

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

Location:

uspace

Files:

• drv/bus/usb/uhci/uhci_batch.c (modified) (1 diff)
• lib/usbhost/include/usb/host/batch.h (modified) (2 diffs)
• lib/usbhost/src/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);
 }

uspace/lib/usbhost/include/usb/host/batch.h

@@ -90 +90 @@
 );
 
-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);
 void usb_transfer_batch_call_in(usb_transfer_batch_t *instance);
 void usb_transfer_batch_call_out(usb_transfer_batch_t *instance);
@@ -120 +121 @@
 /*----------------------------------------------------------------------------*/
 static inline void usb_transfer_batch_finish_error(
-    usb_transfer_batch_t *instance, int error)
+    usb_transfer_batch_t *instance, const void* data, size_t size, int error)
 {
         assert(instance);
         instance->error = error;
-        usb_transfer_batch_finish(instance);
+        usb_transfer_batch_finish(instance, data, size);
 }
 /*----------------------------------------------------------------------------*/

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);
+
 }
 /*----------------------------------------------------------------------------*/