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

uspace/drv/nic/rtl8169/driver.c

@@ -74 +74 @@
 static errno_t rtl8169_on_stopped(nic_t *nic_data);
 static void rtl8169_send_frame(nic_t *nic_data, void *data, size_t size);
-static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev);
+static void rtl8169_irq_handler(ipc_call_t *icall, void *);
 static inline errno_t rtl8169_register_int_handler(nic_t *nic_data,
     cap_irq_handle_t *handle);
@@ -372 +372 @@
         rtl8169_irq_code.cmds[3].addr = rtl8169->regs + IMR;
         errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code, handle);
+            rtl8169->irq, rtl8169_irq_handler, (void *)rtl8169,
+            &rtl8169_irq_code, handle);
 
         return rc;
@@ -1034 +1035 @@
 }
 
-static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        assert(dev);
-        assert(icall);
-
+/** RTL8169 IRQ handler.
+ *
+ * @param icall IRQ event notification
+ * @param arg Argument (rtl8169_t *)
+ */
+static void rtl8169_irq_handler(ipc_call_t *icall, void *arg)
+{
         uint16_t isr = (uint16_t) ipc_get_arg2(icall) & INT_KNOWN;
-        nic_t *nic_data = nic_get_from_ddf_dev(dev);
-        rtl8169_t *rtl8169 = nic_get_specific(nic_data);
+        rtl8169_t *rtl8169 = (rtl8169_t *)arg;
 
         ddf_msg(LVL_DEBUG, "rtl8169_irq_handler(): isr=0x%04x", isr);
@@ -1051 +1053 @@
                 /* Packet underrun or link change */
                 if (isr & INT_PUN) {
-                        rtl8169_link_change(dev);
+                        rtl8169_link_change(rtl8169->dev);
                         pio_write_16(rtl8169->regs + ISR, INT_PUN);
                 }
@@ -1057 +1059 @@
                 /* Transmit notification */
                 if (isr & (INT_TER | INT_TOK | INT_TDU)) {
-                        rtl8169_transmit_done(dev);
+                        rtl8169_transmit_done(rtl8169->dev);
                         pio_write_16(rtl8169->regs + ISR, (INT_TER | INT_TOK | INT_TDU));
                 }
@@ -1073 +1075 @@
 
                 if (isr & (INT_RER | INT_ROK)) {
-                        rtl8169_receive_done(dev);
+                        rtl8169_receive_done(rtl8169->dev);
                         pio_write_16(rtl8169->regs + ISR, (INT_RER | INT_ROK));
                 }