Changeset ebb1489 in mainline for uspace/drv/block/virtio-blk/virtio-blk.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks 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/virtio-blk/virtio-blk.c (modified) (2 diffs)

uspace/drv/block/virtio-blk/virtio-blk.c

@@ -73 +73 @@
 };
 
-static void virtio_blk_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        virtio_blk_t *virtio_blk = (virtio_blk_t *) ddf_dev_data_get(dev);
+/** VirtIO block IRQ handler.
+ *
+ * @param icall IRQ event notification
+ * @param arg Argument (virtio_blk_t *)
+ */
+static void virtio_blk_irq_handler(ipc_call_t *icall, void *arg)
+{
+        virtio_blk_t *virtio_blk = (virtio_blk_t *)arg;
         virtio_dev_t *vdev = &virtio_blk->virtio_dev;
 
@@ -145 +150 @@
 
         return register_interrupt_handler(dev, virtio_blk->irq,
-            virtio_blk_irq_handler, &irq_code, &virtio_blk->irq_handle);
+            virtio_blk_irq_handler, (void *)virtio_blk, &irq_code,
+            &virtio_blk->irq_handle);
 }