Changeset 8d40181 in mainline for uspace/drv/bus/usb/ehci/main.c

Timestamp:

2013-09-21T03:25:31Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ea69749f

Parents:

c898236

Message:

ohci,uhci,ehci: Use library provided 'get_registers' function

File:

• uspace/drv/bus/usb/ehci/main.c (modified) (1 diff)

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

@@ -67 +67 @@
 {
         assert(device);
-
-        addr_range_t reg_range;
-        int irq = 0;
-
-        int ret = get_my_registers(device, &reg_range, &irq);
-        if (ret != EOK) {
-                usb_log_error("Failed to get memory addresses for %" PRIun
-                    ": %s.\n", ddf_dev_get_handle(device), str_error(ret));
+        hw_res_list_parsed_t hw_res;
+        int ret = hcd_ddf_get_registers(device, &hw_res);
+        if (ret != EOK ||
+            hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) {
+                usb_log_error("Failed to get register memory addresses "
+                    "for %" PRIun ": %s.\n", ddf_dev_get_handle(device),
+                    str_error(ret));
                 return ret;
         }
+        addr_range_t regs = hw_res.mem_ranges.ranges[0];
+        const int irq = hw_res.irqs.irqs[0];
+        hw_res_list_parsed_clean(&hw_res);
 
         usb_log_info("Memory mapped regs at %p (size %zu), IRQ %d.\n",
-            RNGABSPTR(reg_range), RNGSZ(reg_range), irq);
+            RNGABSPTR(regs), RNGSZ(regs), irq);
 
-        ret = disable_legacy(device, &reg_range);
+        ret = disable_legacy(device, &regs);
         if (ret != EOK) {
                 usb_log_error("Failed to disable legacy USB: %s.\n",