Changeset 129b821f in mainline for uspace/drv/bus/usb/usbhub/status.h

Timestamp:

2018-01-20T12:34:50Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

682c9354

Parents:

60d3f35

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-20 12:33:42)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-20 12:34:50)

Message:

usbhub: be aware of its own speed

This resulted in a bunch of changes just because the roothubs in older
HC's are virtual, and need to be aware of their own speed too.

File:

• uspace/drv/bus/usb/usbhub/status.h (modified) (1 diff)

uspace/drv/bus/usb/usbhub/status.h

@@ -97 +97 @@
     (uint32_usb2host(1 << (16 + USB_HUB_FEATURE_C_HUB_LOCAL_POWER)))
 
-
-/**
- * speed getter for port status
- *
- * @param status
- * @return speed of usb device (for more see usb specification)
- */
-static inline usb_speed_t usb_port_speed(usb_port_status_t status)
+static inline usb_speed_t usb_port_speed(usb_speed_t hub_speed, uint32_t status)
 {
+        if (hub_speed == USB_SPEED_SUPER)
+                return USB_SPEED_SUPER;
+        if (hub_speed == USB_SPEED_HIGH && (status & USB_HUB_PORT_STATUS_HIGH_SPEED))
+                return USB_SPEED_HIGH;
         if ((status & USB_HUB_PORT_STATUS_LOW_SPEED) != 0)
                 return USB_SPEED_LOW;
-        if ((status & USB_HUB_PORT_STATUS_HIGH_SPEED) != 0)
-                return USB_SPEED_HIGH;
-        /* TODO: add super speed */
         return USB_SPEED_FULL;
 }