Changeset 5cfcc64 in mainline

Timestamp:

2011-12-06T12:19:15Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6bba41d

Parents:

2582d8f

Message:

libusbhost: User both stored error value and transferred size in the finish wrapper.

Location:

uspace

Files:

• drv/bus/usb/ohci/ohci_batch.c (modified) (1 diff)
• drv/bus/usb/uhci/uhci_batch.c (modified) (1 diff)
• lib/usbhost/include/usb/host/usb_transfer_batch.h (modified) (1 diff)

uspace/drv/bus/usb/ohci/ohci_batch.c

@@ -70 +70 @@
         assert(ohci_batch->usb_batch);
         usb_transfer_batch_finish(ohci_batch->usb_batch,
-            ohci_batch->device_buffer + ohci_batch->usb_batch->setup_size,
-            ohci_batch->usb_batch->buffer_size);
+            ohci_batch->device_buffer + ohci_batch->usb_batch->setup_size);
         ohci_transfer_batch_dispose(ohci_batch);
 }

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

@@ -64 +64 @@
         assert(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_data_buffer(uhci_batch));
         uhci_transfer_batch_dispose(uhci_batch);
 }

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

@@ -116 +116 @@
  */
 static inline void usb_transfer_batch_finish(
-    const usb_transfer_batch_t *instance, const void* data, size_t size)
+    const usb_transfer_batch_t *instance, const void* data)
 {
         assert(instance);
-        usb_transfer_batch_finish_error(instance, data, size, instance->error);
+        usb_transfer_batch_finish_error(
+            instance, data, instance->transfered_size, instance->error);
 }
 /*----------------------------------------------------------------------------*/