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

File:

• uspace/drv/nic/ne2k/ne2k.c (modified) (6 diffs)

uspace/drv/nic/ne2k/ne2k.c

@@ -43 +43 @@
 #include <str_error.h>
 #include <async.h>
-#include <ddf/log.h>
 #include "dp8390.h"
 
@@ -122 +121 @@
 };
 
-static void ne2k_interrupt_handler(ipc_call_t *, ddf_dev_t *);
+static void ne2k_interrupt_handler(ipc_call_t *, void *);
 
 static errno_t ne2k_register_interrupt(nic_t *nic_data,
@@ -162 +161 @@
 
         return register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            ne2k->irq, ne2k_interrupt_handler, &ne2k->code, handle);
+            ne2k->irq, ne2k_interrupt_handler, (void *)nic_data, &ne2k->code,
+            handle);
 }
 
@@ -238 +238 @@
 }
 
-void ne2k_interrupt_handler(ipc_call_t *call, ddf_dev_t *dev)
-{
-        nic_t *nic_data = DRIVER_DATA(dev);
+/** NE2K interrupt handler
+ *
+ * @param call IRQ event notification
+ * @param arg Argument (nic_t *)
+ */
+void ne2k_interrupt_handler(ipc_call_t *call, void *arg)
+{
+        nic_t *nic_data = (nic_t *)arg;
         ne2k_interrupt(nic_data, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call));
 }
@@ -444 +449 @@
         }
 
-        rc = nic_fun_add_to_cats(fun);
+        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to categories");
                 ddf_fun_unbind(fun);
+                ddf_fun_destroy(fun);
                 return rc;
         }
@@ -477 +482 @@
         nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface);
 
-        ddf_log_init(NAME);
         return ddf_driver_main(&ne2k_driver);
 }