Changeset 60744cb in mainline for uspace/drv/block/isa-ide/isa-ide.c

Timestamp:

2024-05-17T17:51:56Z (7 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

1801005

Parents:

646849b3

Message:

Let driver specify any argument to IRQ handler

This allows the driver to register a single handler for multiple
interrupts and still distinguish between them. It also removes
the extra step of having to get softstate from ddf_dev_t.

File:

• uspace/drv/block/isa-ide/isa-ide.c (modified) (3 diffs)

uspace/drv/block/isa-ide/isa-ide.c

@@ -59 +59 @@
 static errno_t isa_ide_init_irq(isa_ide_channel_t *);
 static void isa_ide_fini_irq(isa_ide_channel_t *);
-static void isa_ide_irq_handler(ipc_call_t *, ddf_dev_t *);
+static void isa_ide_irq_handler(ipc_call_t *, void *);
 
 static void isa_ide_write_data_16(void *, uint16_t *, size_t);
@@ -256 +256 @@
 
         ddf_msg(LVL_NOTE, "IRQ %d", chan->irq);
-        rc = register_interrupt_handler_arg(chan->ctrl->dev, chan->irq,
+        rc = register_interrupt_handler(chan->ctrl->dev, chan->irq,
             isa_ide_irq_handler, (void *)chan, &irq_code, &chan->ihandle);
         if (rc != EOK) {
@@ -291 +291 @@
  *
  * @param call Call data
- * @param dev Device that caused the interrupt
- */
-static void isa_ide_irq_handler(ipc_call_t *call, ddf_dev_t *xdev)
-{
-        isa_ide_channel_t *chan = (isa_ide_channel_t *)(void *)xdev; // XXX
+ * @param arg Argument (isa_ide_channel_t *)
+ */
+static void isa_ide_irq_handler(ipc_call_t *call, void *arg)
+{
+        isa_ide_channel_t *chan = (isa_ide_channel_t *)arg;
         uint8_t status;
         async_sess_t *parent_sess;