Changes in uspace/drv/ohci/root_hub.c [f35b294:112d159] in mainline

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_LOCAL_POWER);
+        (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT);
 
 
@@ -210 +209 @@
         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
@@ -587 +587 @@
         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))