Changes in uspace/drv/nic/rtl8169/driver.c [870841cf:fafb8e5] in mainline

File:

• uspace/drv/nic/rtl8169/driver.c (modified) (12 diffs)

uspace/drv/nic/rtl8169/driver.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2014 Agnieszka Tabaka
  * All rights reserved.
@@ -75 +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, void *);
+static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev);
 static inline errno_t rtl8169_register_int_handler(nic_t *nic_data,
     cap_irq_handle_t *handle);
@@ -165 +164 @@
 
 static errno_t rtl8169_dev_add(ddf_dev_t *dev);
-static errno_t rtl8169_dev_quiesce(ddf_dev_t *dev);
 
 /** Basic driver operations for RTL8169 driver */
 static driver_ops_t rtl8169_driver_ops = {
         .dev_add = &rtl8169_dev_add,
-        .dev_quiesce = &rtl8169_dev_quiesce
 };
 
@@ -365 +362 @@
 }
 
-static errno_t rtl8169_register_int_handler(nic_t *nic_data,
+inline static errno_t rtl8169_register_int_handler(nic_t *nic_data,
     cap_irq_handle_t *handle)
 {
@@ -375 +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, (void *)rtl8169,
-            &rtl8169_irq_code, handle);
+            rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code, handle);
 
         return rc;
@@ -487 +483 @@
 }
 
-static errno_t rtl8169_dev_quiesce(ddf_dev_t *dev)
-{
-        nic_t *nic;
-        rtl8169_t *rtl8169;
-
-        ddf_msg(LVL_NOTE, "RTL8169_dev_quiesce %s (handle = %zu)",
-            ddf_dev_get_name(dev), ddf_dev_get_handle(dev));
-
-        nic = nic_get_from_ddf_dev(dev);
-        rtl8169 = nic_get_specific(nic);
-
-        /* Reset card */
-        pio_write_8(rtl8169->regs + CONFIG0, 0);
-        rtl8169_reset(rtl8169);
-
-        return EOK;
-}
-
 static errno_t rtl8169_set_addr(ddf_fun_t *fun, const nic_address_t *addr)
 {
@@ -783 +761 @@
 }
 
-static void rtl8169_reset(rtl8169_t *rtl8169)
+inline static void rtl8169_reset(rtl8169_t *rtl8169)
 {
         pio_write_8(rtl8169->regs + CR, CR_RST);
@@ -828 +806 @@
  *  @param was_promisc  Sign if the promiscuous mode was active before disabling
  */
-static void rtl8169_rcx_promics_rem(nic_t *nic_data,
+inline static void rtl8169_rcx_promics_rem(nic_t *nic_data,
     nic_multicast_mode_t mcast_mode, uint8_t was_promisc)
 {
@@ -1055 +1033 @@
 }
 
-/** RTL8169 IRQ handler.
- *
- * @param icall IRQ event notification
- * @param arg Argument (rtl8169_t *)
- */
-static void rtl8169_irq_handler(ipc_call_t *icall, void *arg)
-{
+static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
+{
+        assert(dev);
+        assert(icall);
+
         uint16_t isr = (uint16_t) ipc_get_arg2(icall) & INT_KNOWN;
-        rtl8169_t *rtl8169 = (rtl8169_t *)arg;
+        nic_t *nic_data = nic_get_from_ddf_dev(dev);
+        rtl8169_t *rtl8169 = nic_get_specific(nic_data);
 
         ddf_msg(LVL_DEBUG, "rtl8169_irq_handler(): isr=0x%04x", isr);
@@ -1073 +1050 @@
                 /* Packet underrun or link change */
                 if (isr & INT_PUN) {
-                        rtl8169_link_change(rtl8169->dev);
+                        rtl8169_link_change(dev);
                         pio_write_16(rtl8169->regs + ISR, INT_PUN);
                 }
@@ -1079 +1056 @@
                 /* Transmit notification */
                 if (isr & (INT_TER | INT_TOK | INT_TDU)) {
-                        rtl8169_transmit_done(rtl8169->dev);
+                        rtl8169_transmit_done(dev);
                         pio_write_16(rtl8169->regs + ISR, (INT_TER | INT_TOK | INT_TDU));
                 }
@@ -1095 +1072 @@
 
                 if (isr & (INT_RER | INT_ROK)) {
-                        rtl8169_receive_done(rtl8169->dev);
+                        rtl8169_receive_done(dev);
                         pio_write_16(rtl8169->regs + ISR, (INT_RER | INT_ROK));
                 }