Changeset 0f79283b in mainline for uspace/drv/bus/usb/usbhub

Timestamp:

2018-01-18T12:39:27Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2bff2cc2

Parents:

babcc423

Message:

usb: remove speed storing (and fix that misuse in xhci rh)

Location:

uspace/drv/bus/usb/usbhub

Files:

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

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

@@ -134 +134 @@
         port_log(debug, port, "Port reset, enumerating device.");
 
-        if ((err = usbhc_device_enumerate(exch, port->port_number, port->base.speed))) {
+        if ((err = usbhc_device_enumerate(exch, port->port_number, port->speed))) {
                 port_log(error, port, "Failed to enumerate device: %s", str_error(err));
                 /* Disable the port */
@@ -200 +200 @@
         const bool enabled = !!(status & USB_HUB_PORT_STATUS_ENABLED);
 
-        if (enabled)
-                usb_port_enabled(&port->base, usb_port_speed(status));
-        else
+        if (enabled) {
+                // 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);
+                usb_port_enabled(&port->base);
+        } else
                 usb_port_disabled(&port->base, &remove_device);
 }

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

@@ -52 +52 @@
         /** Port number as reported in descriptors. */
         unsigned int port_number;
+        /** Speed at the time of enabling the port */
+        usb_speed_t speed;
 } usb_hub_port_t;