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

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (5 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <str.h>
+#include <pcapdump_iface.h>
 
 #include "defs.h"
@@ -819 +820 @@
  *
  * @param icall  The IPC call structure
- * @param arg    Argument (nic_t *)
- *
- */
-static void rtl8139_interrupt_handler(ipc_call_t *icall, void *arg)
-{
+ * @param dev    The rtl8139 device
+ *
+ */
+static void rtl8139_interrupt_handler(ipc_call_t *icall, ddf_dev_t *dev)
+{
+        assert(dev);
+        assert(icall);
+
         uint16_t isr = (uint16_t) ipc_get_arg2(icall);
-        nic_t *nic_data = (nic_t *)arg;
+        nic_t *nic_data = nic_get_from_ddf_dev(dev);
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);
 
@@ -858 +862 @@
         rtl8139_irq_code.cmds[3].addr = rtl8139->io_addr + IMR;
         errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            rtl8139->irq, rtl8139_interrupt_handler, (void *)nic_data,
-            &rtl8139_irq_code, handle);
+            rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code, handle);
 
         RTL8139_IRQ_STRUCT_UNLOCK();
@@ -1305 +1308 @@
                 goto err_fun_create;
         }
-        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;
         }
 
@@ -1316 +1321 @@
         return EOK;
 
-err_fun_bind:
-        ddf_fun_unbind(fun);
+        // err_fun_bind:
+        // ddf_fun_unbind(fun);
 err_fun_create:
         ddf_fun_destroy(fun);