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

Timestamp:

2013-12-31T23:20:40Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7813516

Parents:

ba4a03a5

Message:

libusbhost: Make ddf interrupt helper return the used irq.

File:

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

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

@@ -97 +97 @@
         }
         addr_range_t regs = hw_res.io_ranges.ranges[0];
-        const int irq = hw_res.irqs.irqs[0];
 
         ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
@@ -116 +115 @@
 
         bool interrupts = false;
-        ret = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
+        const int irq = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
             hc_gen_irq_code);
-        if (ret != EOK) {
+        if (irq < 0) {
                 usb_log_warning("Failed to enable interrupts: %s."
-                    " Falling back to polling.\n", str_error(ret));
+                    " Falling back to polling.\n", str_error(irq));
         } else {
                 usb_log_debug("Hw interrupts enabled.\n");