Changeset 60744cb in mainline for uspace/drv/nic/ne2k/ne2k.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/ne2k/ne2k.c (modified) (3 diffs)

uspace/drv/nic/ne2k/ne2k.c

@@ -121 +121 @@
 };
 
-static void ne2k_interrupt_handler(ipc_call_t *, ddf_dev_t *);
+static void ne2k_interrupt_handler(ipc_call_t *, void *);
 
 static errno_t ne2k_register_interrupt(nic_t *nic_data,
@@ -161 +161 @@
 
         return register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            ne2k->irq, ne2k_interrupt_handler, &ne2k->code, handle);
+            ne2k->irq, ne2k_interrupt_handler, (void *)nic_data, &ne2k->code,
+            handle);
 }
 
@@ -237 +238 @@
 }
 
-void ne2k_interrupt_handler(ipc_call_t *call, ddf_dev_t *dev)
-{
-        nic_t *nic_data = DRIVER_DATA(dev);
+/** NE2K interrupt handler
+ *
+ * @param call IRQ event notification
+ * @param arg Argument (nic_t *)
+ */
+void ne2k_interrupt_handler(ipc_call_t *call, void *arg)
+{
+        nic_t *nic_data = (nic_t *)arg;
         ne2k_interrupt(nic_data, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call));
 }