Changeset 888238e9 in mainline for uspace/drv/bus/usb/ehci/hw_struct/queue_head.c

Timestamp:

2017-11-20T12:56:00Z (8 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

d3086873

Parents:

ff14aede

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-20 12:55:58)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-20 12:56:00)

Message:

usbhost: endpoints do not have speed on their own

This information was redundant, and the fact it was never set proves it
should be removed because it is source of errors.

File:

• uspace/drv/bus/usb/ehci/hw_struct/queue_head.c (modified) (2 diffs)

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

@@ -64 +64 @@
                 return;
         }
-        assert(ep->speed < ARRAY_SIZE(speed));
+        assert(ep->device->speed < ARRAY_SIZE(speed));
         EHCI_MEM32_WR(instance->ep_char,
             QH_EP_CHAR_ADDR_SET(ep->device->address) |
             QH_EP_CHAR_EP_SET(ep->endpoint) |
-            speed[ep->speed] |
+            speed[ep->device->speed] |
             QH_EP_CHAR_MAX_LENGTH_SET(ep->max_packet_size)
         );
         if (ep->transfer_type == USB_TRANSFER_CONTROL) {
-                if (ep->speed != USB_SPEED_HIGH)
+                if (ep->device->speed != USB_SPEED_HIGH)
                         EHCI_MEM32_SET(instance->ep_char, QH_EP_CHAR_C_FLAG);
                 /* Let BULK and INT use queue head managed toggle,
@@ -80 +80 @@
         uint32_t ep_cap = QH_EP_CAP_C_MASK_SET(3 << 2) |
                     QH_EP_CAP_MULTI_SET(ep->packets);
-        if (ep->speed != USB_SPEED_HIGH) {
+        if (ep->device->speed != USB_SPEED_HIGH) {
                 ep_cap |=
                     QH_EP_CAP_TT_PORT_SET(ep->device->tt.port) |