Changeset 7813516 in mainline for uspace/drv/bus/usb/uhci/uhci.c

Timestamp:

2014-01-01T01:19:10Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7191992

Parents:

d1df381

Message:

uhci,ohci,ehci: Use all hw resources to initialize HC

File:

• uspace/drv/bus/usb/uhci/uhci.c (modified) (3 diffs)

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

@@ -89 +89 @@
         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.io_ranges.count != 1) {
+        if (ret != EOK) {
                 usb_log_error("Failed to get register memory addresses "
                     "for %" PRIun ": %s.\n", ddf_dev_get_handle(device),
@@ -96 +95 @@
                 return ret;
         }
-        addr_range_t regs = hw_res.io_ranges.ranges[0];
 
         ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
@@ -125 +123 @@
         }
 
-        ret = hc_init(hc, &regs, interrupts);
+        ret = hc_init(hc, &hw_res, interrupts);
         hw_res_list_parsed_clean(&hw_res);
         if (ret != EOK) {
                 usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(ret));
                 goto irq_unregister;
-                // TODO This is unfortunate, we have neither legacy nor real USB
         }