Changeset cd3fa47 in mainline for uspace/drv/bus/usb/uhci/uhci_rh.c

Timestamp:

2018-01-21T18:35:09Z (6 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/uhci/uhci_rh.c (modified) (6 diffs)

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

@@ -210 +210 @@
 #define BIT_VAL(val, bit) \
         ((val & bit) ? 1 : 0)
-#define UHCI2USB(val, bit, feat) \
-        (BIT_VAL(val, bit) << feat)
+#define UHCI2USB(val, bit, mask) \
+        (BIT_VAL(val, bit) ? (mask) : 0)
 
 /** Port status request handler.
@@ -236 +236 @@
         const uint16_t val = pio_read_16(hub->ports[port]);
         const uint32_t status = uint32_host2usb(
-            UHCI2USB(val, STATUS_CONNECTED, USB_HUB_FEATURE_PORT_CONNECTION) |
-            UHCI2USB(val, STATUS_ENABLED, USB_HUB_FEATURE_PORT_ENABLE) |
-            UHCI2USB(val, STATUS_SUSPEND, USB_HUB_FEATURE_PORT_SUSPEND) |
-            UHCI2USB(val, STATUS_IN_RESET, USB_HUB_FEATURE_PORT_RESET) |
-            UHCI2USB(val, STATUS_ALWAYS_ONE, USB_HUB_FEATURE_PORT_POWER) |
-            UHCI2USB(val, STATUS_LOW_SPEED, USB_HUB_FEATURE_PORT_LOW_SPEED) |
-            UHCI2USB(val, STATUS_CONNECTED_CHANGED, USB_HUB_FEATURE_C_PORT_CONNECTION) |
-            UHCI2USB(val, STATUS_ENABLED_CHANGED, USB_HUB_FEATURE_C_PORT_ENABLE) |
-//          UHCI2USB(val, STATUS_SUSPEND, USB_HUB_FEATURE_C_PORT_SUSPEND) |
-            ((hub->reset_changed[port] ? 1 : 0) << USB_HUB_FEATURE_C_PORT_RESET)
+            UHCI2USB(val, STATUS_CONNECTED, USB_HUB_PORT_STATUS_CONNECTION) |
+            UHCI2USB(val, STATUS_ENABLED, USB_HUB_PORT_STATUS_ENABLE) |
+            UHCI2USB(val, STATUS_SUSPEND, USB2_HUB_PORT_STATUS_SUSPEND) |
+            UHCI2USB(val, STATUS_IN_RESET, USB_HUB_PORT_STATUS_RESET) |
+            UHCI2USB(val, STATUS_ALWAYS_ONE, USB2_HUB_PORT_STATUS_POWER) |
+            UHCI2USB(val, STATUS_LOW_SPEED, USB2_HUB_PORT_STATUS_LOW_SPEED) |
+            UHCI2USB(val, STATUS_CONNECTED_CHANGED, USB_HUB_PORT_STATUS_C_CONNECTION) |
+            UHCI2USB(val, STATUS_ENABLED_CHANGED, USB2_HUB_PORT_STATUS_C_ENABLE) |
+//          UHCI2USB(val, STATUS_SUSPEND, USB2_HUB_PORT_STATUS_C_SUSPEND) |
+            (hub->reset_changed[port] ?  USB_HUB_PORT_STATUS_C_RESET : 0)
         );
         RH_DEBUG(hub, port, "Port status %" PRIx32 " (source %" PRIx16
@@ -274 +274 @@
         const uint16_t val = status & (~STATUS_WC_BITS);
         switch (feature) {
-        case USB_HUB_FEATURE_PORT_ENABLE:
+        case USB2_HUB_FEATURE_PORT_ENABLE:
                 RH_DEBUG(hub, port, "Clear port enable (status %"
                     PRIx16 ")", status);
                 pio_write_16(hub->ports[port], val & ~STATUS_ENABLED);
                 break;
-        case USB_HUB_FEATURE_PORT_SUSPEND:
+        case USB2_HUB_FEATURE_PORT_SUSPEND:
                 RH_DEBUG(hub, port, "Clear port suspend (status %"
                     PRIx16 ")", status);
@@ -302 +302 @@
                 hub->reset_changed[port] = false;
                 break;
-        case USB_HUB_FEATURE_C_PORT_ENABLE:
+        case USB2_HUB_FEATURE_C_PORT_ENABLE:
                 RH_DEBUG(hub, port, "Clear port enable change (status %"
                     PRIx16 ")", status);
                 pio_write_16(hub->ports[port], status | STATUS_ENABLED_CHANGED);
                 break;
-        case USB_HUB_FEATURE_C_PORT_SUSPEND:
+        case USB2_HUB_FEATURE_C_PORT_SUSPEND:
                 RH_DEBUG(hub, port, "Clear port suspend change (status %"
                     PRIx16 ")", status);
@@ -354 +354 @@
                     ")", pio_read_16(hub->ports[port]));
                 break;
-        case USB_HUB_FEATURE_PORT_SUSPEND:
+        case USB2_HUB_FEATURE_PORT_SUSPEND:
                 RH_DEBUG(hub, port, "Set port suspend (status %" PRIx16
                     ")", status);
@@ -368 +368 @@
                 break;
         case USB_HUB_FEATURE_C_PORT_CONNECTION:
-        case USB_HUB_FEATURE_C_PORT_ENABLE:
-        case USB_HUB_FEATURE_C_PORT_SUSPEND:
+        case USB2_HUB_FEATURE_C_PORT_ENABLE:
+        case USB2_HUB_FEATURE_C_PORT_SUSPEND:
         case USB_HUB_FEATURE_C_PORT_OVER_CURRENT:
                 RH_DEBUG(hub, port, "Set port change flag (status %" PRIx16