Changeset 888238e9 in mainline for uspace/drv/bus/usb

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.

Location:

uspace/drv/bus/usb

Files:

• ehci/hw_struct/queue_head.c (modified) (2 diffs)
• ohci/hw_struct/endpoint_descriptor.c (modified) (1 diff)
• uhci/hc.c (modified) (1 diff)
• uhci/uhci_batch.c (modified) (2 diffs)
• xhci/endpoint.c (modified) (1 diff)

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) |

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

@@ -88 +88 @@
 
         /* Low speed flag */
-        if (ep->speed == USB_SPEED_LOW)
+        if (ep->device->speed == USB_SPEED_LOW)
                 OHCI_MEM32_SET(instance->status, ED_STATUS_S_FLAG);
 

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

@@ -475 +475 @@
 
         transfer_list_t *list =
-            instance->transfers[batch->ep->speed][batch->ep->transfer_type];
+            instance->transfers[batch->ep->device->speed][batch->ep->transfer_type];
         assert(list);
         transfer_list_add_batch(list, uhci_batch);

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

@@ -233 +233 @@
         const usb_packet_id pid = direction_pids[dir];
         const bool low_speed =
-            uhci_batch->base.ep->speed == USB_SPEED_LOW;
+            uhci_batch->base.ep->device->speed == USB_SPEED_LOW;
         const size_t mps = uhci_batch->base.ep->max_packet_size;
 
@@ -295 +295 @@
         const usb_packet_id status_stage_pid = status_stage_pids[dir];
         const bool low_speed =
-            uhci_batch->base.ep->speed == USB_SPEED_LOW;
+            uhci_batch->base.ep->device->speed == USB_SPEED_LOW;
         const size_t mps = uhci_batch->base.ep->max_packet_size;
         const usb_target_t target = uhci_batch->base.target;

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

@@ -141 +141 @@
 int xhci_endpoint_request_streams(xhci_hc_t *hc, xhci_device_t *dev, xhci_endpoint_t *xhci_ep, unsigned count) {
         if (xhci_ep->base.transfer_type != USB_TRANSFER_BULK
-                || xhci_ep->base.speed != USB_SPEED_SUPER) {
+                || dev->base.speed != USB_SPEED_SUPER) {
                 usb_log_error("Streams are only supported by superspeed bulk endpoints.");
                 return EINVAL;