Changeset 60744cb in mainline for uspace/drv/block/ahci/ahci.c

Timestamp:

2024-05-17T17:51:56Z (13 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/ahci/ahci.c (modified) (3 diffs)

uspace/drv/block/ahci/ahci.c

@@ -162 +162 @@
 }
 
-/** Get AHCI structure from DDF device. */
-static ahci_dev_t *dev_ahci_dev(ddf_dev_t *dev)
-{
-        return ddf_dev_data_get(dev);
-}
-
 /** Get SATA device name.
  *
@@ -891 +885 @@
  *
  * @param icall The IPC call structure.
- * @param dev   DDF device structure.
- *
- */
-static void ahci_interrupt(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        ahci_dev_t *ahci = dev_ahci_dev(dev);
+ * @param arg   Argument (ahci_dev_t *)
+ */
+static void ahci_interrupt(ipc_call_t *icall, void *arg)
+{
+        ahci_dev_t *ahci = (ahci_dev_t *)arg;
         unsigned int port = ipc_get_arg1(icall);
         ahci_port_is_t pxis = ipc_get_arg2(icall);
@@ -1186 +1179 @@
         cap_irq_handle_t irq_cap;
         errno_t rc = register_interrupt_handler(dev,
-            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct, &irq_cap);
+            hw_res_parsed.irqs.irqs[0], ahci_interrupt, (void *)ahci, &ct,
+            &irq_cap);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler.");