Changes in uspace/drv/nic/rtl8169/driver.c [60744cb:e55d2c1] in mainline

File:

• uspace/drv/nic/rtl8169/driver.c (modified) (8 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, 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);
@@ -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, (void *)rtl8169,
-            &rtl8169_irq_code, handle);
+            rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code, handle);
 
         return rc;
@@ -458 +457 @@
         }
 
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        rc = nic_fun_add_to_cats(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category");
-                goto err_fun_bind;
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
+                return rc;
         }
 
@@ -468 +468 @@
         return EOK;
 
-err_fun_bind:
-        ddf_fun_unbind(fun);
+        // err_fun_bind:
+        // ddf_fun_unbind(fun);
 err_fun_create:
         ddf_fun_destroy(fun);
@@ -1034 +1034 @@
 }
 
-/** 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);
@@ -1052 +1051 @@
                 /* 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);
                 }
@@ -1058 +1057 @@
                 /* 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));
                 }
@@ -1074 +1073 @@
 
                 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));
                 }