Changeset 398a94c in mainline for uspace/drv/bus/usb/xhci/endpoint.c

Timestamp:

2018-01-10T13:32:21Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

8bab0d2

Parents:

4a00bc9

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-10 13:32:19)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-10 13:32:21)

Message:

xhci isoch: bug fixing

File:

• uspace/drv/bus/usb/xhci/endpoint.c (modified) (2 diffs)

uspace/drv/bus/usb/xhci/endpoint.c

@@ -65 +65 @@
         endpoint_init(ep, dev, desc);
 
-        xhci_ep->max_streams = 1 << (USB_SSC_MAX_STREAMS(desc->companion));
         xhci_ep->max_burst = desc->companion.max_burst + 1;
-        xhci_ep->mult = USB_SSC_MULT(desc->companion) + 1;
+
+        if (ep->transfer_type == USB_TRANSFER_BULK)
+                xhci_ep->max_streams = 1 << (USB_SSC_MAX_STREAMS(desc->companion));
+        else
+                xhci_ep->max_streams = 1;
+
+        if (ep->transfer_type == USB_TRANSFER_ISOCHRONOUS)
+                xhci_ep->mult = USB_SSC_MULT(desc->companion) + 1;
+        else
+                xhci_ep->mult = 1;
 
         /* In USB 3, the semantics of wMaxPacketSize changed. Now the number of
@@ -314 +322 @@
         }
 
-        isoch_fini(xhci_ep);
+        if (xhci_ep->base.transfer_type == USB_TRANSFER_ISOCHRONOUS)
+                isoch_fini(xhci_ep);
 }