Changeset cd3fa47 in mainline for uspace/drv/bus/usb/vhc

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/vhc/hub/virthubops.c (modified) (4 diffs)

uspace/drv/bus/usb/vhc/hub/virthubops.c

@@ -137 +137 @@
 
         switch (feature) {
-                case USB_HUB_FEATURE_PORT_ENABLE:
+                case USB2_HUB_FEATURE_PORT_ENABLE:
                         if ((port_state != HUB_PORT_STATE_NOT_CONFIGURED)
                             && (port_state != HUB_PORT_STATE_POWERED_OFF)) {
@@ -145 +145 @@
                         break;
 
-                case USB_HUB_FEATURE_PORT_SUSPEND:
+                case USB2_HUB_FEATURE_PORT_SUSPEND:
                         if (port_state != HUB_PORT_STATE_SUSPENDED) {
                                 rc = EOK;
@@ -166 +166 @@
                         break;
 
-                case USB_HUB_FEATURE_C_PORT_ENABLE:
+                case USB2_HUB_FEATURE_C_PORT_ENABLE:
                         hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_ENABLE);
                         rc = EOK;
                         break;
 
-                case USB_HUB_FEATURE_C_PORT_SUSPEND:
+                case USB2_HUB_FEATURE_C_PORT_SUSPEND:
                         hub_clear_port_status_change(hub, port, HUB_STATUS_C_PORT_SUSPEND);
                         rc = EOK;
@@ -317 +317 @@
                         break;
 
-                case USB_HUB_FEATURE_PORT_SUSPEND:
+                case USB2_HUB_FEATURE_PORT_SUSPEND:
                         if (port_state == HUB_PORT_STATE_ENABLED) {
                                 hub_set_port_state(hub, port, HUB_PORT_STATE_SUSPENDED);