Changeset df6ded8 in mainline for uspace/drv/bus/usb/vhc/hub/virthubops.c

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

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);