Changeset 0748854 in mainline for uspace/drv/ohci/root_hub.c

Timestamp:

2011-04-09T23:30:55Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

46e078a

Parents:

77223f8 (diff), f11c288 (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:

Merge development/ changes

File:

• uspace/drv/ohci/root_hub.c (modified) (3 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);
 
 
@@ -209 +210 @@
         instance->registers = regs;
         instance->device = dev;
-        instance->port_count = instance->registers->rh_desc_a & 0xff;
+        instance->port_count =
+            (instance->registers->rh_desc_a >> RHDA_NDS_SHIFT) & RHDA_NDS_MASK;
         rh_init_descriptors(instance);
         // set port power mode to no-power-switching
@@ -586 +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))