Changeset e4d7363 in mainline for uspace/drv/bus/usb/ehci/main.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/ehci/main.c (modified) (4 diffs)

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

@@ -52 +52 @@
 #define NAME "ehci"
 
-static int ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static int ehci_driver_init(hcd_t *, const hw_res_list_parsed_t *);
+static int ehci_driver_claim(hcd_t *, ddf_dev_t *);
+static int ehci_driver_start(hcd_t *, bool);
 static void ehci_driver_fini(hcd_t *);
 
 static const ddf_hc_driver_t ehci_hc_driver = {
-        .claim = disable_legacy,
         .hc_speed = USB_SPEED_HIGH,
+        .name = "EHCI-PCI",
+        .init = ehci_driver_init,
         .irq_code_gen = ehci_hc_gen_irq_code,
-        .init = ehci_driver_init,
+        .claim = ehci_driver_claim,
+        .start = ehci_driver_start,
         .fini = ehci_driver_fini,
-        .name = "EHCI-PCI",
         .ops = {
                 .schedule       = ehci_hc_schedule,
@@ -72 +75 @@
 
 
-static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res,
-    bool irq)
+static int ehci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res)
 {
         assert(hcd);
@@ -82 +84 @@
                 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, &ehci_hc_driver.ops);
@@ -89 +91 @@
         }
         return ret;
+}
+
+static int ehci_driver_claim(hcd_t *hcd, ddf_dev_t *dev)
+{
+        hc_t *instance = hcd_get_driver_data(hcd);
+        assert(instance);
+
+        return disable_legacy(instance, dev);
+}
+
+static int ehci_driver_start(hcd_t *hcd, bool irq) {
+        hc_t *instance = hcd_get_driver_data(hcd);
+        assert(instance);
+
+        return hc_start(instance, irq);
 }