Changeset 1ef93fa in mainline

Timestamp:

2011-07-10T23:06:20Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a00768c

Parents:

4d62aa0

Message:

OHCI: Start hw during driver initialization. Do not expose start function.

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (4 diffs)
• hc.h (modified) (1 diff)
• ohci.c (modified) (1 diff)

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

@@ -56 +56 @@
 };
 
+static void hc_start(hc_t *instance);
 static int interrupt_emulator(hc_t *instance);
 static void hc_gain_control(hc_t *instance);
@@ -157 +158 @@
 
         rh_init(&instance->rh, instance->registers);
+        hc_start(instance);
 
         return EOK;
@@ -433 +435 @@
 
         if (status & I_UE) {
-                hc_start_hw(instance);
+                hc_start(instance);
         }
 
@@ -524 +526 @@
  * @param[in] instance OHCI hc driver structure.
  */
-void hc_start_hw(hc_t *instance)
+void hc_start(hc_t *instance)
 {
         /* OHCI guide page 42 */

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

@@ -82 +82 @@
     irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size);
 int hc_init(hc_t *instance, uintptr_t regs, size_t reg_size, bool interrupts);
-void hc_start_hw(hc_t *instance);
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun);
 

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

@@ -247 +247 @@
             "Failed to add OHCI to HC class: %s.\n", str_error(ret));
 
-        hc_start_hw(&instance->hc);
         hc_register_hub(&instance->hc, instance->rh_fun);
         return EOK;