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

uspace/drv/nic/rtl8139/driver.c

@@ -819 +819 @@
  *
  * @param icall  The IPC call structure
- * @param dev    The rtl8139 device
- *
- */
-static void rtl8139_interrupt_handler(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        assert(dev);
-        assert(icall);
-
+ * @param arg    Argument (nic_t *)
+ *
+ */
+static void rtl8139_interrupt_handler(ipc_call_t *icall, void *arg)
+{
         uint16_t isr = (uint16_t) ipc_get_arg2(icall);
-        nic_t *nic_data = nic_get_from_ddf_dev(dev);
+        nic_t *nic_data = (nic_t *)arg;
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);
 
@@ -861 +858 @@
         rtl8139_irq_code.cmds[3].addr = rtl8139->io_addr + IMR;
         errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code, handle);
+            rtl8139->irq, rtl8139_interrupt_handler, (void *)nic_data,
+            &rtl8139_irq_code, handle);
 
         RTL8139_IRQ_STRUCT_UNLOCK();