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

Timestamp:

2018-01-20T12:34:50Z (8 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.

Location:

uspace/drv/bus/usb/usbhub

Files:

• port.c (modified) (2 diffs)
• status.h (modified) (1 diff)
• usbhub.c (modified) (2 diffs)
• usbhub.h (modified) (1 diff)

uspace/drv/bus/usb/usbhub/port.c

@@ -89 +89 @@
 }
 
+
+static usb_speed_t get_port_speed(usb_hub_port_t *port, uint32_t status)
+{
+        assert(port);
+        assert(port->hub);
+
+        return usb_port_speed(port->hub->speed, status);
+}
+
 /**
  * Routine for adding a new device.
@@ -203 +212 @@
                 // The connecting fibril do not touch speed until the port is enabled,
                 // so we do not have to lock
-                port->speed = usb_port_speed(status);
+                port->speed = get_port_speed(port, status);
                 usb_port_enabled(&port->base);
         } else

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;
 }

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -116 +116 @@
         }
         hub_dev->usb_device = usb_dev;
+        hub_dev->speed = usb_device_get_speed(usb_dev);
 
         fibril_mutex_initialize(&hub_dev->default_address_guard);
@@ -187 +188 @@
         }
 
-        usb_log_info("Controlling hub '%s' (%p: %zu ports).",
+        usb_log_info("Controlling %s-speed hub '%s' (%p: %zu ports).",
+            usb_str_speed(hub_dev->speed),
             usb_device_get_name(hub_dev->usb_device), hub_dev,
             hub_dev->port_count);

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

@@ -58 +58 @@
         /** Port structures, one for each port */
         usb_hub_port_t *ports;
+        /** Speed of the hub */
+        usb_speed_t speed;
         /** Generic usb device data*/
         usb_device_t *usb_device;