Changes in uspace/drv/audio/hdaudio/hdaudio.c [dd8ab1c:d51838f] in mainline

File:

• uspace/drv/audio/hdaudio/hdaudio.c (modified) (4 diffs)

uspace/drv/audio/hdaudio/hdaudio.c

@@ -58 +58 @@
 static int hda_fun_offline(ddf_fun_t *fun);
 
-static void hdaudio_interrupt(ipc_call_t *, ddf_dev_t *);
+static void hdaudio_interrupt(ipc_callid_t, ipc_call_t *, ddf_dev_t *);
 
 static driver_ops_t driver_ops = {
@@ -259 +259 @@
         rc = hw_res_enable_interrupt(hda->parent_sess, res.irqs.irqs[0]);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed enabling interrupt.: %s", str_error(rc));
-                goto error;
-        }
-
-        int irq_cap;
-        rc = register_interrupt_handler(dev, res.irqs.irqs[0],
-            hdaudio_interrupt, &irq_code, &irq_cap);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed registering interrupt handler: %s",
-                    str_error_name(rc));
+                ddf_msg(LVL_ERROR, "Failed enabling interrupt. (%d)", rc);
+                goto error;
+        }
+
+        int irq_cap = register_interrupt_handler(dev, res.irqs.irqs[0],
+            hdaudio_interrupt, &irq_code);
+        if (irq_cap < 0) {
+                rc = irq_cap;
+                ddf_msg(LVL_ERROR, "Failed registering interrupt handler. (%d)",
+                    rc);
                 goto error;
         }
@@ -314 +314 @@
         hw_res_list_parsed_clean(&res);
 
-        ddf_msg(LVL_NOTE, "Failing hda_dev_add() -> %s", str_error_name(rc));
+        ddf_msg(LVL_NOTE, "Failing hda_dev_add() -> %d", rc);
         return rc;
 }
@@ -368 +368 @@
 }
 
-static void hdaudio_interrupt(ipc_call_t *icall, ddf_dev_t *dev)
+static void hdaudio_interrupt(ipc_callid_t iid, ipc_call_t *icall,
+    ddf_dev_t *dev)
 {
         hda_t *hda = (hda_t *)ddf_dev_data_get(dev);