Changeset ebb1489 in mainline for uspace/drv/nic/ne2k/ne2k.c

Timestamp:

2024-10-13T08:23:40Z (2 months 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/ne2k/ne2k.c (modified) (3 diffs)

uspace/drv/nic/ne2k/ne2k.c

@@ -122 +122 @@
 };
 
-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,
@@ -162 +162 @@
 
         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);
 }
 
@@ -238 +239 @@
 }
 
-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));
 }