Changeset ebb1489 in mainline for uspace/drv/block/ddisk/ddisk.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (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.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

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 *, ddf_dev_t *);
+static void ddisk_irq_handler(ipc_call_t *, void *);
 
 static driver_ops_t driver_ops = {
@@ -176 +176 @@
 };
 
-void ddisk_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
+/** Ddisk IRQ handler.
+ *
+ * @param icall IRQ event notification
+ * @param arg Argument (ddisk_t *)
+ */
+void ddisk_irq_handler(ipc_call_t *icall, void *arg)
 {
         ddf_msg(LVL_DEBUG, "ddisk_irq_handler(), status=%" PRIx32,
             (uint32_t) ipc_get_arg1(icall));
 
-        ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev);
+        ddisk_t *ddisk = (ddisk_t *)arg;
 
         fibril_mutex_lock(&ddisk->lock);
@@ -512 +517 @@
         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);
+            ddisk_irq_handler, (void *)ddisk, &ddisk_irq_code, &ddisk->irq_cap);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");