Changeset 3bb6b35 in mainline

Timestamp:

2011-04-03T21:50:40Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

040ab02

Parents:

195890b

Message:

ohci root hub set power switching mode

File:

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

uspace/drv/ohci/root_hub.c

@@ -108 +108 @@
 
 static const uint32_t hub_clear_feature_valid_mask =
-        (1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER) +
+        (1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER) |
 (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT);
 
@@ -122 +122 @@
 
 static const uint32_t port_set_feature_valid_mask =
-        (1 << USB_HUB_FEATURE_PORT_ENABLE) +
-(1 << USB_HUB_FEATURE_PORT_SUSPEND) +
-(1 << USB_HUB_FEATURE_PORT_RESET) +
+        (1 << USB_HUB_FEATURE_PORT_ENABLE) |
+(1 << USB_HUB_FEATURE_PORT_SUSPEND) |
+(1 << USB_HUB_FEATURE_PORT_RESET) |
 (1 << USB_HUB_FEATURE_PORT_POWER);
 
 static const uint32_t port_clear_feature_valid_mask =
-        (1 << USB_HUB_FEATURE_PORT_CONNECTION) +
-(1 << USB_HUB_FEATURE_PORT_SUSPEND) +
-(1 << USB_HUB_FEATURE_PORT_OVER_CURRENT) +
-(1 << USB_HUB_FEATURE_PORT_POWER) +
-(1 << USB_HUB_FEATURE_C_PORT_CONNECTION) +
-(1 << USB_HUB_FEATURE_C_PORT_ENABLE) +
-(1 << USB_HUB_FEATURE_C_PORT_SUSPEND) +
-(1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) +
+        (1 << USB_HUB_FEATURE_PORT_CONNECTION) |
+(1 << USB_HUB_FEATURE_PORT_SUSPEND) |
+(1 << USB_HUB_FEATURE_PORT_OVER_CURRENT) |
+(1 << USB_HUB_FEATURE_PORT_POWER) |
+(1 << USB_HUB_FEATURE_C_PORT_CONNECTION) |
+(1 << USB_HUB_FEATURE_C_PORT_ENABLE) |
+(1 << USB_HUB_FEATURE_C_PORT_SUSPEND) |
+(1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) |
 (1 << USB_HUB_FEATURE_C_PORT_RESET);
 //note that USB_HUB_FEATURE_PORT_POWER bit is translated into
@@ -165 +165 @@
 
 static int process_hub_feature_set_request(rh_t *instance, uint16_t feature);
-
 
 static int process_hub_feature_clear_request(rh_t *instance,
@@ -204 +203 @@
         instance->port_count = instance->registers->rh_desc_a & 0xff;
         rh_init_descriptors(instance);
-        /// \TODO set port power mode
-
+        // set port power mode to no-power-switching
+        instance->registers->rh_desc_a =
+                instance->registers->rh_desc_a | (1<<9);
 
         usb_log_info("OHCI root hub with %d ports.\n", instance->port_count);