Changeset ebb1489 in mainline for uspace/drv/nic/e1k/e1k.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/e1k/e1k.c (modified) (2 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -1247 +1247 @@
  *
  * @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);
 
@@ -1286 +1285 @@
 
         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);