Changes in uspace/lib/usbhost/src/ddf_helpers.c [3f74275:e657635] in mainline

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (7 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -748 +748 @@
  * @param[in] gen_irq_code IRQ code generator.
  *
- * @return IRQ capability handle on success.
- * @return Negative error code.
+ * @return EOK on success or negative error code
  */
 int hcd_ddf_setup_interrupts(ddf_dev_t *device,
@@ -771 +770 @@
 
         /* Register handler to avoid interrupt lockup */
-        const int irq_cap = register_interrupt_handler(device, irq, handler,
-            &irq_code);
+        int ret = register_interrupt_handler(device, irq, handler, &irq_code);
         irq_code_clean(&irq_code);
-        if (irq_cap < 0) {
-                usb_log_error("Failed to register interrupt handler: %s.\n",
-                    str_error(irq_cap));
-                return irq_cap;
-        }
-
-        /* Enable interrupts */
-        int ret = hcd_ddf_enable_interrupts(device);
         if (ret != EOK) {
                 usb_log_error("Failed to register interrupt handler: %s.\n",
                     str_error(ret));
-                unregister_interrupt_handler(device, irq_cap);
-                return ret;
-        }
-        return irq_cap;
+                return ret;
+        }
+
+        /* Enable interrupts */
+        ret = hcd_ddf_enable_interrupts(device);
+        if (ret != EOK) {
+                usb_log_error("Failed to register interrupt handler: %s.\n",
+                    str_error(ret));
+                unregister_interrupt_handler(device, irq);
+                return ret;
+        }
+        assert(irq > 0);
+        return irq;
 }
 
@@ -883 +882 @@
         interrupt_handler_t *irq_handler =
             driver->irq_handler ? driver->irq_handler : ddf_hcd_gen_irq_handler;
-        const int irq_cap = hcd_ddf_setup_interrupts(device, &hw_res,
-            irq_handler, driver->irq_code_gen);
-        bool irqs_enabled = !(irq_cap < 0);
-        if (irqs_enabled) {
+        const int irq = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
+            driver->irq_code_gen);
+        if (!(irq < 0)) {
                 usb_log_debug("Hw interrupts enabled.\n");
         }
@@ -901 +899 @@
         /* Init hw driver */
         hcd_t *hcd = dev_to_hcd(device);
-        ret = driver->init(hcd, &hw_res, irqs_enabled);
+        ret = driver->init(hcd, &hw_res, !(irq < 0));
         hw_res_list_parsed_clean(&hw_res);
         if (ret != EOK) {
@@ -909 +907 @@
 
         /* Need working irq replacement to setup root hub */
-        if (!irqs_enabled && hcd->ops.status_hook) {
+        if ((irq < 0) && hcd->ops.status_hook) {
                 hcd->polling_fibril = fibril_create(interrupt_polling, hcd);
                 if (hcd->polling_fibril == 0) {
@@ -918 +916 @@
                 fibril_add_ready(hcd->polling_fibril);
                 usb_log_warning("Failed to enable interrupts: %s."
-                    " Falling back to polling.\n", str_error(irq_cap));
+                    " Falling back to polling.\n", str_error(irq));
         }
 
@@ -932 +930 @@
 irq_unregister:
                 /* Unregistering non-existent should be ok */
-                unregister_interrupt_handler(device, irq_cap);
+                unregister_interrupt_handler(device, irq);
                 hcd_ddf_clean_hc(device);
                 return ret;