Changeset 27b0ea0 in mainline

Timestamp:

2017-11-20T22:15:11Z (7 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

9162b27

Parents:

6b433a8

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-20 22:11:32)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-20 22:15:11)

Message:

ehci: fixed bugs introduced by refactoring

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci_batch.c (modified) (1 diff)
• hw_struct/queue_head.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_batch.c

@@ -238 +238 @@
         assert(ehci_batch->base.transfered_size <= ehci_batch->base.buffer_size);
 
+        const size_t setup_size = (ehci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL)
+                ? USB_SETUP_PACKET_SIZE
+                : 0;
+
         if (ehci_batch->base.dir == USB_DIRECTION_IN)
-                memcpy(ehci_batch->base.buffer, ehci_batch->device_buffer, ehci_batch->base.transfered_size);
+                memcpy(ehci_batch->base.buffer,
+                    ehci_batch->device_buffer + setup_size,
+                    ehci_batch->base.transfered_size);
 
         /* Clear TD pointers */

uspace/drv/bus/usb/ehci/hw_struct/queue_head.c

@@ -46 +46 @@
         [USB_SPEED_FULL] = QH_EP_CHAR_EPS_FS,
         [USB_SPEED_HIGH] = QH_EP_CHAR_EPS_HS,
+
+        /* Solely for the roothub */
+        [USB_SPEED_MAX] = 0,
 };