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

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

@@ -172 +172 @@
 }
 
-int disable_legacy(ddf_dev_t *device)
+int disable_legacy(hc_t *hc, ddf_dev_t *device)
 {
         assert(device);
@@ -183 +183 @@
         usb_log_debug("Disabling EHCI legacy support.\n");
 
-        hw_res_list_parsed_t res;
-        hw_res_list_parsed_init(&res);
-        int ret = hw_res_get_list_parsed(parent_sess, &res, 0);
-        if (ret != EOK) {
-                usb_log_error("Failed to get resource list: %s\n",
-                    str_error(ret));
-                goto clean;
-        }
-
-        if (res.mem_ranges.count < 1) {
-                usb_log_error("Incorrect mem range count: %zu",
-                    res.mem_ranges.count);
-                ret = EINVAL;
-                goto clean;
-        }
-
-        /* Map EHCI registers */
-        void *regs = NULL;
-        ret = pio_enable_range(&res.mem_ranges.ranges[0], &regs);
-        if (ret != EOK) {
-                usb_log_error("Failed to map registers %p: %s.\n",
-                    RNGABSPTR(res.mem_ranges.ranges[0]), str_error(ret));
-                goto clean;
-        }
-
-        usb_log_debug("Registers mapped at: %p.\n", regs);
-
-        ehci_caps_regs_t *ehci_caps = regs;
-
-        const uint32_t hcc_params = EHCI_RD(ehci_caps->hccparams);
+
+        const uint32_t hcc_params = EHCI_RD(hc->caps->hccparams);
         usb_log_debug2("Value of hcc params register: %x.\n", hcc_params);
 
@@ -221 +193 @@
         usb_log_debug2("Value of EECP: %x.\n", eecp);
 
-        ret = disable_extended_caps(parent_sess, eecp);
+        int ret = disable_extended_caps(parent_sess, eecp);
         if (ret != EOK) {
                 usb_log_error("Failed to disable extended capabilities: %s.\n",
@@ -228 +200 @@
         }
 clean:
-        //TODO unmap registers
-        hw_res_list_parsed_clean(&res);
         async_hangup(parent_sess);
         return ret;