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

Timestamp:

2017-10-30T22:18:28Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

17873ac7

Parents:

ef1a3a8

Message:

uhci: fixed buffer copying on IN transaction

Lost in some refactoring, masked by deadlock.

File:

• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (2 diffs)

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

@@ -64 +64 @@
 }
 
+void uhci_transfer_batch_finish(uhci_transfer_batch_t *batch)
+{
+        if (batch->base.dir == USB_DIRECTION_IN) {
+                assert(batch->base.transfered_size <= batch->base.buffer_size);
+                memcpy(batch->base.buffer, uhci_transfer_batch_data_buffer(batch), batch->base.transfered_size);
+        }
+        usb_transfer_batch_finish(&batch->base);
+}
+
 /** Allocate memory and initialize internal data structure.
  *
@@ -131 +140 @@
         dest += setup_size;
         /* Copy generic data unless they are provided by the device */
-        if (usb_batch->ep->direction != USB_DIRECTION_IN) {
+        if (usb_batch->dir != USB_DIRECTION_IN) {
                 memcpy(dest, usb_batch->buffer, usb_batch->buffer_size);
         }