Changeset 60744cb in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2024-05-17T17:51:56Z (7 weeks 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/nic/e1k/e1k.c (modified) (2 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -1244 +1244 @@
  *
  * @param icall IPC call structure
- * @param dev   E1000 device
- *
- */
-static void e1000_interrupt_handler(ipc_call_t *icall,
-    ddf_dev_t *dev)
+ * @param arg   Argument (nic_t *)
+ *
+ */
+static void e1000_interrupt_handler(ipc_call_t *icall, void *arg)
 {
         uint32_t icr = (uint32_t) ipc_get_arg2(icall);
-        nic_t *nic = NIC_DATA_DEV(dev);
+        nic_t *nic = (nic_t *)arg;
         e1000_t *e1000 = DRIVER_DATA_NIC(nic);
 
@@ -1283 +1282 @@
 
         errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq,
-            e1000_interrupt_handler, &e1000_irq_code, handle);
+            e1000_interrupt_handler, (void *)nic, &e1000_irq_code, handle);
 
         fibril_mutex_unlock(&irq_reg_mutex);