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

File:

• uspace/drv/nic/e1k/e1k.c (modified) (7 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -49 +49 @@
 #include <nic.h>
 #include <ops/nic.h>
+#include <pcapdump_iface.h>
 #include "e1k.h"
 
@@ -174 +175 @@
         /** Lock for EEPROM access */
         fibril_mutex_t eeprom_lock;
+
 } e1000_t;
 
@@ -1189 +1191 @@
                 if (frame != NULL) {
                         memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size);
+
                         nic_received_frame(nic, frame);
                 } else {
@@ -1244 +1247 @@
  *
  * @param icall IPC call structure
- * @param arg   Argument (nic_t *)
- *
- */
-static void e1000_interrupt_handler(ipc_call_t *icall, void *arg)
+ * @param dev   E1000 device
+ *
+ */
+static void e1000_interrupt_handler(ipc_call_t *icall,
+    ddf_dev_t *dev)
 {
         uint32_t icr = (uint32_t) ipc_get_arg2(icall);
-        nic_t *nic = (nic_t *)arg;
+        nic_t *nic = NIC_DATA_DEV(dev);
         e1000_t *e1000 = DRIVER_DATA_NIC(nic);
 
@@ -1282 +1286 @@
 
         errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq,
-            e1000_interrupt_handler, (void *)nic, &e1000_irq_code, handle);
+            e1000_interrupt_handler, &e1000_irq_code, handle);
 
         fibril_mutex_unlock(&irq_reg_mutex);
@@ -2198 +2202 @@
                 goto err_fun_bind;
 
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
-        if (rc != EOK)
-                goto err_add_to_cat;
-
+        rc = nic_fun_add_to_cats(fun);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
+                return rc;
+        }
         return EOK;
 
-err_add_to_cat:
-        ddf_fun_unbind(fun);
+        // err_add_to_cat:
+        // ddf_fun_unbind(fun);
 err_fun_bind:
 err_rx_structure:
@@ -2365 +2371 @@
 
         memcpy(e1000->tx_frame_virt[tdt], data, size);
-
         tx_descriptor_addr->phys_addr = PTR_TO_U64(e1000->tx_frame_phys[tdt]);
         tx_descriptor_addr->length = size;