Changeset d1df381 in mainline

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.

Location:

uspace

Files:

• drv/bus/usb/ehci/ehci.c (modified) (2 diffs)
• drv/bus/usb/ohci/ohci.c (modified) (2 diffs)
• drv/bus/usb/uhci/uhci.c (modified) (2 diffs)
• lib/usbhost/src/ddf_helpers.c (modified) (2 diffs)

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

@@ -95 +95 @@
         }
         addr_range_t regs = hw_res.mem_ranges.ranges[0];
-        const int irq = hw_res.irqs.irqs[0];
 
         /* Initialize generic HCD driver */
@@ -117 +116 @@
         /* Try to enable interrupts */
         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");

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

@@ -95 +95 @@
         }
         addr_range_t regs = hw_res.mem_ranges.ranges[0];
-        const int irq = hw_res.irqs.irqs[0];
 
         /* Initialize generic HCD driver */
@@ -117 +116 @@
         /* Try to enable interrupts */
         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");

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");

uspace/lib/usbhost/src/ddf_helpers.c

@@ -725 +725 @@
         irq_code_t irq_code = {0};
 
-        int irq = gen_irq_code(&irq_code, hw_res);
+        const int irq = gen_irq_code(&irq_code, hw_res);
         if (irq < 0) {
                 usb_log_error("Failed to generate IRQ code: %s.\n",
@@ -749 +749 @@
                 return ret;
         }
-
-        return EOK;
+        assert(irq > 0);
+        return irq;
 }
 /**