Changeset 01bbbb2 in mainline

Timestamp:

2011-07-11T12:21:31Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

dbb9663

Parents:

062b25f

Message:

OHCI: Root hub: create descriptors after device setup.

Fix some comments and fixes.

Location:

uspace/drv/bus/usb/ohci

Files:

• ohci_regs.h (modified) (1 diff)
• root_hub.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/ohci_regs.h

@@ -46 +46 @@
 
         volatile uint32_t control;
-#define C_CSBR_MASK (0x3) /* Control-bulk service ratio */
-#define C_CSBR_1_1  (0x0)
-#define C_CSBR_1_2  (0x1)
-#define C_CSBR_1_3  (0x2)
-#define C_CSBR_1_4  (0x3)
-#define C_CSBR_SHIFT (0)
+#define C_CBSR_MASK (0x3) /* Control-bulk service ratio */
+#define C_CBSR_1_1  (0x0)
+#define C_CBSR_1_2  (0x1)
+#define C_CBSR_1_3  (0x2)
+#define C_CBSR_1_4  (0x3)
+#define C_CBSR_SHIFT (0)
 
 #define C_PLE (1 << 2)   /* Periodic list enable */

uspace/drv/bus/usb/ohci/root_hub.c

@@ -74 +74 @@
         .interface_count = 1,
         .length = sizeof (usb_standard_configuration_descriptor_t),
-        .max_power = 100,
+        .max_power = 0, /* root hubs don't need no power */
         .str_configuration = 0,
 };
@@ -238 +238 @@
         }
 
-        int ret = rh_init_descriptors(instance);
-        if (ret != EOK) {
-                return ret;
-        }
         /* Don't forget the hub status bit and round up */
         instance->interrupt_mask_size = (instance->port_count + 1 + 8) / 8;
@@ -248 +244 @@
         instance->unfinished_interrupt_transfer = NULL;
 
-        /* Set port power mode to no-power-switching. */
+        /* Set port power mode to no power-switching. (always on) */
         instance->registers->rh_desc_a |= RHDA_NPS_FLAG;
+
+        int ret = rh_init_descriptors(instance);
+        if (ret != EOK) {
+                return ret;
+        }
 
         usb_log_info("Root hub (%zu ports) initialized.\n",