Changeset cd3fa47 in mainline for uspace/drv/bus/usb/usbhub/port.c

Timestamp:

2018-01-21T18:35:09Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

3f02935

Parents:

32b2a6f2

Message:

usb: definition of status bits have changed between USB 2 and 3, remove the confusion

File:

• uspace/drv/bus/usb/usbhub/port.c (modified) (6 diffs)

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

@@ -145 +145 @@
         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 */
-                usb_hub_clear_port_feature(port->hub, port->port_number, USB_HUB_FEATURE_PORT_ENABLE);
+                /* Disable the port in USB 2 (impossible in USB3) */
+                if (port->speed <= USB_SPEED_HIGH)
+                        usb_hub_clear_port_feature(port->hub, port->port_number, USB2_HUB_FEATURE_PORT_ENABLE);
                 goto out_address;
         }
@@ -173 +174 @@
 static void port_changed_enabled(usb_hub_port_t *port, usb_port_status_t status)
 {
-        const bool enabled = !!(status & USB_HUB_PORT_STATUS_ENABLED);
+        const bool enabled = !!(status & USB_HUB_PORT_STATUS_ENABLE);
         if (enabled) {
                 port_log(warning, port, "Port unexpectedly changed to enabled.");
@@ -179 +180 @@
                 usb_port_disabled(&port->base, &remove_device);
         }
-}
-
-static void port_changed_suspend(usb_hub_port_t *port, usb_port_status_t status)
-{
-        port_log(error, port, "Port unexpectedly suspend. Weird, we do not support suspending!");
 }
 
@@ -207 +203 @@
 static void port_changed_reset(usb_hub_port_t *port, usb_port_status_t status)
 {
-        const bool enabled = !!(status & USB_HUB_PORT_STATUS_ENABLED);
+        const bool enabled = !!(status & USB_HUB_PORT_STATUS_ENABLE);
 
         if (enabled) {
@@ -220 +216 @@
 typedef void (*change_handler_t)(usb_hub_port_t *, usb_port_status_t);
 
-static const change_handler_t port_change_handlers [] = {
-        [USB_HUB_FEATURE_C_PORT_CONNECTION] = &port_changed_connection,
-        [USB_HUB_FEATURE_C_PORT_ENABLE] = &port_changed_enabled,
-        [USB_HUB_FEATURE_C_PORT_SUSPEND] = &port_changed_suspend,
-        [USB_HUB_FEATURE_C_PORT_OVER_CURRENT] = &port_changed_overcurrent,
-        [USB_HUB_FEATURE_C_PORT_RESET] = &port_changed_reset,
-        [sizeof(usb_port_status_t) * 8] = NULL,
-};
+static void check_port_change(usb_hub_port_t *port, usb_port_status_t *status,
+    change_handler_t handler, usb_port_status_t mask, usb_hub_class_feature_t feature)
+{
+        if ((*status & mask) == 0)
+                return;
+
+        /* Clear the change so it won't come again */
+        usb_hub_clear_port_feature(port->hub, port->port_number, feature);
+
+        if (handler)
+                handler(port, *status);
+
+        /* Mark the change as resolved */
+        *status &= ~mask;
+}
 
 /**
@@ -248 +251 @@
         }
 
-        if (port->hub->speed == USB_SPEED_SUPER)
-                /* Link state change is not a change we shall clear, nor we care about it */
-                status &= ~(1 << USB_HUB_FEATURE_C_PORT_LINK_STATE);
-
-        for (uint32_t feature = 16; feature < sizeof(usb_port_status_t) * 8; ++feature) {
-                uint32_t mask = 1 << feature;
-
-                if ((status & mask) == 0)
-                        continue;
-
-                /* Clear the change so it won't come again */
-                usb_hub_clear_port_feature(port->hub, port->port_number, feature);
-
-                if (!port_change_handlers[feature])
-                        continue;
-
-                /* ACK this change */
-                status &= ~mask;
-
-                port_change_handlers[feature](port, status);
+        check_port_change(port, &status, &port_changed_connection,
+            USB_HUB_PORT_STATUS_C_CONNECTION, USB_HUB_FEATURE_C_PORT_CONNECTION);
+
+        check_port_change(port, &status, &port_changed_overcurrent,
+            USB_HUB_PORT_STATUS_C_OC, USB_HUB_FEATURE_C_PORT_OVER_CURRENT);
+
+        check_port_change(port, &status, &port_changed_reset,
+            USB_HUB_PORT_STATUS_C_RESET, USB_HUB_FEATURE_C_PORT_RESET);
+
+        if (port->hub->speed <= USB_SPEED_HIGH) {
+                check_port_change(port, &status, &port_changed_enabled,
+                    USB2_HUB_PORT_STATUS_C_ENABLE, USB2_HUB_FEATURE_C_PORT_ENABLE);
+        } else {
+                check_port_change(port, &status, &port_changed_reset,
+                    USB3_HUB_PORT_STATUS_C_BH_RESET, USB3_HUB_FEATURE_C_BH_PORT_RESET);
+
+                check_port_change(port, &status, NULL,
+                    USB3_HUB_PORT_STATUS_C_LINK_STATE, USB3_HUB_FEATURE_C_PORT_LINK_STATE);
         }