Changeset ba4a03a5 in mainline for uspace/drv/bus/usb/ohci/ohci.c

Timestamp:

2013-12-31T23:11:00Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d1df381

Parents:

e3a07bba

Message:

usb host: Use all hw resources when generating irq code.

File:

• uspace/drv/bus/usb/ohci/ohci.c (modified) (5 diffs)

uspace/drv/bus/usb/ohci/ohci.c

@@ -96 +96 @@
         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_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
-            RNGABSPTR(regs), RNGSZ(regs), irq);
 
         /* Initialize generic HCD driver */
@@ -105 +101 @@
             BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
         if (ret != EOK) {
+                hw_res_list_parsed_clean(&hw_res);
                 usb_log_error("Failed to setup generic hcd structures: %s.",
                     str_error(ret));
@@ -113 +110 @@
         if (!hc) {
                 usb_log_error("Failed to allocate driver structure.\n");
+                hw_res_list_parsed_clean(&hw_res);
                 ret = ENOMEM;
                 goto ddf_hc_clean;
@@ -119 +117 @@
         /* Try to enable interrupts */
         bool interrupts = false;
-        ret = hcd_ddf_setup_interrupts(device, &regs, irq, irq_handler,
+        ret = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
             hc_gen_irq_code);
         if (ret != EOK) {
@@ -131 +129 @@
         /* Initialize OHCI HC */
         ret = hc_init(hc, &regs, interrupts);
+        hw_res_list_parsed_clean(&hw_res);
         if (ret != EOK) {
                 usb_log_error("Failed to init hc: %s.\n", str_error(ret));