Changes in uspace/drv/block/ddisk/ddisk.c [60744cb:fafb8e5] in mainline

File:

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

uspace/drv/block/ddisk/ddisk.c

@@ -64 +64 @@
 static void ddisk_bd_connection(ipc_call_t *, void *);
 
-static void ddisk_irq_handler(ipc_call_t *, void *);
+static void ddisk_irq_handler(ipc_call_t *, ddf_dev_t *);
 
 static driver_ops_t driver_ops = {
@@ -176 +176 @@
 };
 
-/** Ddisk IRQ handler.
- *
- * @param icall IRQ event notification
- * @param arg Argument (ddisk_t *)
- */
-void ddisk_irq_handler(ipc_call_t *icall, void *arg)
+void ddisk_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
 {
         ddf_msg(LVL_DEBUG, "ddisk_irq_handler(), status=%" PRIx32,
             (uint32_t) ipc_get_arg1(icall));
 
-        ddisk_t *ddisk = (ddisk_t *)arg;
+        ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev);
 
         fibril_mutex_lock(&ddisk->lock);
@@ -517 +512 @@
         ddisk_irq_commands[3].addr = (void *) &res_phys->command;
         rc = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
-            ddisk_irq_handler, (void *)ddisk, &ddisk_irq_code, &ddisk->irq_cap);
+            ddisk_irq_handler, &ddisk_irq_code, &ddisk->irq_cap);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");