Changeset ebb1489 in mainline for uspace/drv/nic/rtl8139/driver.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (2 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -820 +820 @@
  *
  * @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);
 
@@ -862 +859 @@
         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();