Changeset 501e5df in mainline for uspace/drv/ohci/root_hub.c

Timestamp:

2011-04-09T20:56:50Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ba038f4

Parents:

8790650 (diff), 709e868 (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.

Message:

Development changes

File:

• uspace/drv/ohci/root_hub.c (modified) (2 diffs)

uspace/drv/ohci/root_hub.c

@@ -115 +115 @@
 
 static const uint32_t hub_set_feature_valid_mask =
-        (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT);
+        (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT) |
+(1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
 
 
@@ -587 +588 @@
         if (!((1 << feature) & hub_set_feature_valid_mask))
                 return EINVAL;
+        if(feature == USB_HUB_FEATURE_C_HUB_LOCAL_POWER)
+                feature = USB_HUB_FEATURE_C_HUB_LOCAL_POWER << 16;
         instance->registers->rh_status =
                 (instance->registers->rh_status | (1 << feature))