Changes in uspace/drv/block/ddisk/ddisk.c [cde999a:2fd26bb] in mainline

File:

• uspace/drv/block/ddisk/ddisk.c (modified) (4 diffs)

uspace/drv/block/ddisk/ddisk.c

@@ -64 +64 @@
 static void ddisk_bd_connection(ipc_callid_t, ipc_call_t *, void *);
 
-static void ddisk_irq_handler(ipc_call_t *, ddf_dev_t *);
+static void ddisk_irq_handler(ipc_callid_t, ipc_call_t *, ddf_dev_t *);
 
 static driver_ops_t driver_ops = {
@@ -176 +176 @@
 };
 
-void ddisk_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
+void ddisk_irq_handler(ipc_callid_t iid, ipc_call_t *icall, ddf_dev_t *dev)
 {
         ddf_msg(LVL_DEBUG, "ddisk_irq_handler(), status=%" PRIx32,
@@ -408 +408 @@
  *
  * @param  dev New device
- * @return     EOK on success or an error code.
+ * @return     EOK on success or negative error code.
  */
 static int ddisk_dev_add(ddf_dev_t *dev)
@@ -503 +503 @@
         ddisk_irq_commands[0].addr = (void *) &res_phys->status;
         ddisk_irq_commands[3].addr = (void *) &res_phys->command;
-        rc = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
-            ddisk_irq_handler, &ddisk_irq_code, &ddisk->irq_cap);
-        if (rc != EOK) {
+        ddisk->irq_cap = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
+            ddisk_irq_handler, &ddisk_irq_code);
+        if (ddisk->irq_cap < 0) {
+                rc = ddisk->irq_cap;
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 goto error;