Changeset 132ab5d1 in mainline for uspace/lib/usbhost/src/hcd.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/usbhost/src/hcd.c (modified) (4 diffs)

uspace/lib/usbhost/src/hcd.c

@@ -95 +95 @@
  * lookup.
  */
-static void irq_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev)
+static void irq_handler(ipc_call_t *call, ddf_dev_t *dev)
 {
         assert(dev);
@@ -162 +162 @@
                 return ENOTSUP;
 
-        const int irq = hc_driver->irq_code_gen(&irq_code, hcd, hw_res);
-        if (irq < 0) {
+        int irq;
+        int ret;
+        ret = hc_driver->irq_code_gen(&irq_code, hcd, hw_res, &irq);
+        if (ret != EOK) {
                 usb_log_error("Failed to generate IRQ code: %s.",
                     str_error(irq));
@@ -170 +172 @@
 
         /* Register handler to avoid interrupt lockup */
-        const int irq_cap = register_interrupt_handler(hcd->ddf_dev, irq, irq_handler, &irq_code);
+        int irq_cap;
+        ret = register_interrupt_handler(hcd->ddf_dev, irq, irq_handler, &irq_code, &irq_cap);
         irq_code_clean(&irq_code);
-        if (irq_cap < 0) {
+        if (ret != EOK) {
                 usb_log_error("Failed to register interrupt handler: %s.",
                     str_error(irq_cap));
@@ -179 +182 @@
 
         /* Enable interrupts */
-        int ret = hcd_ddf_enable_interrupt(hcd, irq);
+        ret = hcd_ddf_enable_interrupt(hcd, irq);
         if (ret != EOK) {
                 usb_log_error("Failed to enable interrupts: %s.",