Changes in uspace/drv/bus/usb/ehci/res.c [e4d7363:53a309e] in mainline

File:

• uspace/drv/bus/usb/ehci/res.c (modified) (4 diffs)

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

@@ -39 +39 @@
 #include <str_error.h>
 #include <assert.h>
-#include <devman.h>
+#include <ddf/driver.h>
 #include <ddi.h>
 #include <usb/debug.h>
@@ -172 +172 @@
 }
 
-int disable_legacy(hc_t *hc, ddf_dev_t *device)
+int disable_legacy(ddf_dev_t *device)
 {
         assert(device);
 
-        async_sess_t *parent_sess = devman_parent_device_connect(
-            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        if (parent_sess == NULL)
                 return ENOMEM;
 
         usb_log_debug("Disabling EHCI legacy support.\n");
 
-
-        const uint32_t hcc_params = EHCI_RD(hc->caps->hccparams);
+        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);
         usb_log_debug2("Value of hcc params register: %x.\n", hcc_params);
 
@@ -193 +220 @@
         usb_log_debug2("Value of EECP: %x.\n", eecp);
 
-        int ret = disable_extended_caps(parent_sess, eecp);
+        ret = disable_extended_caps(parent_sess, eecp);
         if (ret != EOK) {
                 usb_log_error("Failed to disable extended capabilities: %s.\n",
@@ -200 +227 @@
         }
 clean:
-        async_hangup(parent_sess);
+        //TODO unmap registers
+        hw_res_list_parsed_clean(&res);
         return ret;
 }