Changeset e4d7363 in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2017-06-22T21:34:39Z (8 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.

Location:

uspace/drv/bus/usb/uhci

Files:

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

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

@@ -106 +106 @@
  * @return Error code.
  */
-int uhci_hc_gen_irq_code(irq_code_t *code, const hw_res_list_parsed_t *hw_res)
+int uhci_hc_gen_irq_code(irq_code_t *code, hcd_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         assert(code);
@@ -214 +214 @@
  * interrupt fibrils.
  */
-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);
@@ -222 +222 @@
             return EINVAL;
 
-        instance->hw_interrupts = interrupts;
         instance->hw_failures = 0;
 
@@ -246 +245 @@
         }
 
+        return EOK;
+}
+
+void hc_start(hc_t *instance)
+{
         hc_init_hw(instance);
         (void)hc_debug_checker;
 
         uhci_rh_init(&instance->rh, instance->registers->ports, "uhci");
-
-        return EOK;
 }
 

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

@@ -124 +124 @@
 } hc_t;
 
-extern int hc_init(hc_t *, const hw_res_list_parsed_t *, bool);
+extern int hc_init(hc_t *, const hw_res_list_parsed_t *);
+extern void hc_start(hc_t *);
 extern void hc_fini(hc_t *);
 
-extern int uhci_hc_gen_irq_code(irq_code_t *, const hw_res_list_parsed_t *);
+extern int uhci_hc_gen_irq_code(irq_code_t *, hcd_t *,const hw_res_list_parsed_t *);
 
 extern void uhci_hc_interrupt(hcd_t *, uint32_t);

uspace/drv/bus/usb/uhci/main.c

@@ -50 +50 @@
 #define NAME "uhci"
 
-static int uhci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static int uhci_driver_init(hcd_t *, const hw_res_list_parsed_t *);
+static int uhci_driver_start(hcd_t *, bool);
 static void uhci_driver_fini(hcd_t *);
-static int disable_legacy(ddf_dev_t *);
+static int disable_legacy(hcd_t *, ddf_dev_t *);
 
 static const ddf_hc_driver_t uhci_hc_driver = {
@@ -59 +60 @@
         .irq_code_gen = uhci_hc_gen_irq_code,
         .init = uhci_driver_init,
+        .start = uhci_driver_start,
         .fini = uhci_driver_fini,
         .name = "UHCI",
@@ -68 +70 @@
 };
 
-static int uhci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
+static int uhci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res)
 {
         assert(hcd);
@@ -77 +79 @@
                 return ENOMEM;
 
-        const int ret = hc_init(instance, res, irq);
+        const int ret = hc_init(instance, res);
         if (ret == EOK) {
                 hcd_set_implementation(hcd, instance, &uhci_hc_driver.ops);
@@ -84 +86 @@
         }
         return ret;
+}
+
+static int uhci_driver_start(hcd_t *hcd, bool interrupts)
+{
+        assert(hcd);
+        hc_t *hc = hcd_get_driver_data(hcd);
+
+        hc->hw_interrupts = interrupts;
+        hc_start(hc);
+        return EOK;
 }
 
@@ -102 +114 @@
  * @return Error code.
  */
-static int disable_legacy(ddf_dev_t *device)
+static int disable_legacy(hcd_t *hcd, ddf_dev_t *device)
 {
         assert(device);