Changeset 2ca5a198 in mainline

Timestamp:

2018-01-31T22:45:41Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

73a5857

Parents:

0247bd2

Message:

usb: fix some errors

Location:

uspace/drv/bus/usb

Files:

• ehci/ehci_batch.c (modified) (1 diff)
• ohci/ohci_batch.c (modified) (1 diff)

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

@@ -139 +139 @@
         }
 
-        assert(batch_setup[ehci_batch->base.ep->transfer_type]);
+        if (!batch_setup[ehci_batch->base.ep->transfer_type])
+                return ENOTSUP;
+
         batch_setup[ehci_batch->base.ep->transfer_type](ehci_batch);
 

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

@@ -149 +149 @@
                 memcpy(ohci_batch->device_buffer, usb_batch->setup.buffer, setup_size);
                 /* Copy generic data */
-                if (usb_batch->ep->direction != USB_DIRECTION_IN)
+                if (usb_batch->dir == USB_DIRECTION_OUT)
                         memcpy(
                             ohci_batch->device_buffer + setup_size,