Changeset e4d7363 in mainline for uspace/drv/bus/usb/ohci/hc.c

Timestamp:

2017-06-22T21:34:39Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

91ca111

Parents:

cb89430

Message:

usbhost: refactor the initialization

Before that, drivers had to setup MMIO range multiple times, or even parse hw
resources themselves again. The former init method was split in half - init and
start. Init shall allocate and initialize inner structures, start shall start
the HC.

In the XHCI it is demonstrated how to isolate inner HC implementation from the
fact this driver is using libusbhost. It adds some boilerplate code, but
I think it leads to cleaner design.

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (6 diffs)

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

@@ -89 +89 @@
 };
 
-static void hc_gain_control(hc_t *instance);
-static void hc_start(hc_t *instance);
 static int hc_init_transfer_lists(hc_t *instance);
 static int hc_init_memory(hc_t *instance);
@@ -103 +101 @@
  * @return Error code.
  */
-int ohci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
+int ohci_hc_gen_irq_code(irq_code_t *code, hcd_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         assert(code);
@@ -151 +149 @@
  * @return Error code
  */
-int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res, bool interrupts)
+int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res)
 {
         assert(instance);
@@ -172 +170 @@
         list_initialize(&instance->pending_batches);
         fibril_mutex_initialize(&instance->guard);
-        instance->hw_interrupts = interrupts;
 
         ret = hc_init_memory(instance);
@@ -181 +178 @@
                 return ret;
         }
-
-        hc_gain_control(instance);
-
-        ohci_rh_init(&instance->rh, instance->registers, "ohci rh");
-        hc_start(instance);
 
         return EOK;
@@ -443 +435 @@
 void hc_start(hc_t *instance)
 {
+        ohci_rh_init(&instance->rh, instance->registers, "ohci rh");
+
         /* OHCI guide page 42 */
         assert(instance);