Changeset cd3fa47 in mainline for uspace/drv/bus/usb/ohci/ohci_rh.c

Timestamp:

2018-01-21T18:35:09Z (7 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/ohci/ohci_rh.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/ohci_rh.c

@@ -340 +340 @@
                 }
 
-        case USB_HUB_FEATURE_PORT_ENABLE:         /*1*/
+        case USB2_HUB_FEATURE_PORT_ENABLE:         /*1*/
                 OHCI_WR(hub->registers->rh_port_status[port],
                     RHPS_CLEAR_PORT_ENABLE);
                 return EOK;
 
-        case USB_HUB_FEATURE_PORT_SUSPEND:        /*2*/
+        case USB2_HUB_FEATURE_PORT_SUSPEND:        /*2*/
                 OHCI_WR(hub->registers->rh_port_status[port],
                     RHPS_CLEAR_PORT_SUSPEND);
@@ -351 +351 @@
 
         case USB_HUB_FEATURE_C_PORT_CONNECTION:   /*16*/
-        case USB_HUB_FEATURE_C_PORT_ENABLE:       /*17*/
-        case USB_HUB_FEATURE_C_PORT_SUSPEND:      /*18*/
+        case USB2_HUB_FEATURE_C_PORT_ENABLE:       /*17*/
+        case USB2_HUB_FEATURE_C_PORT_SUSPEND:      /*18*/
         case USB_HUB_FEATURE_C_PORT_OVER_CURRENT: /*19*/
         case USB_HUB_FEATURE_C_PORT_RESET:        /*20*/
@@ -401 +401 @@
                 /* Fall through, for per port power */
                 /* Fallthrough */
-        case USB_HUB_FEATURE_PORT_ENABLE:  /*1*/
-        case USB_HUB_FEATURE_PORT_SUSPEND: /*2*/
+        case USB2_HUB_FEATURE_PORT_ENABLE:  /*1*/
+        case USB2_HUB_FEATURE_PORT_SUSPEND: /*2*/
         case USB_HUB_FEATURE_PORT_RESET:   /*4*/
                 usb_log_debug2("Setting port POWER, ENABLE, SUSPEND or RESET "