Changeset 2582d8f in mainline for uspace/lib/usbhost/src/usb_transfer_batch.c

Timestamp:

2011-12-06T12:10:54Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5cfcc64

Parents:

f167f55

Message:

libusbhost: Use same size for data copy and callback.

This breaks OHCI root hub driver.

File:

• uspace/lib/usbhost/src/usb_transfer_batch.c (modified) (1 diff)

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -145 +145 @@
         if (instance->callback_in) {
                 /* We care about the data and there are some to copy */
+                const size_t safe_size = min(size, instance->buffer_size);
                 if (data) {
-                        const size_t minsize = min(size, instance->buffer_size);
-                        memcpy(instance->buffer, data, minsize);
+                        memcpy(instance->buffer, data, safe_size);
                 }
                 instance->callback_in(instance->fun, error,
-                    instance->transfered_size, instance->arg);
+                    safe_size, instance->arg);
         }
 }