Changes in uspace/drv/nic/ne2k/ne2k.c [56fd7cf:8820544] in mainline

File:

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

uspace/drv/nic/ne2k/ne2k.c

@@ -38 +38 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <stdio.h>
 #include <errno.h>
+#include <irc.h>
 #include <stdlib.h>
 #include <str_error.h>
@@ -124 +122 @@
 };
 
-static void ne2k_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid,
-        ipc_call_t *call);
+static void ne2k_interrupt_handler(ipc_callid_t, ipc_call_t *, ddf_dev_t *);
 
 static int ne2k_register_interrupt(nic_t *nic_data)
@@ -211 +208 @@
         ne2k->irq = hw_res_parsed.irqs.irqs[0];
         
-        ne2k->base_port = (void *) (uintptr_t)
-            hw_res_parsed.io_ranges.ranges[0].address;
+        addr_range_t regs = hw_res_parsed.io_ranges.ranges[0];
+        ne2k->base_port = RNGABSPTR(regs);
         
         hw_res_list_parsed_clean(&hw_res_parsed);
         
-        /* Enable port I/O */
-        if (pio_enable(ne2k->base_port, NE2K_IO_SIZE, &ne2k->port) != EOK)
+        /* Enable programmed I/O */
+        if (pio_enable_range(&regs, &ne2k->port) != EOK)
                 return EADDRNOTAVAIL;
-        
         
         ne2k->data_port = ne2k->port + NE2K_DATA;
@@ -243 +239 @@
 }
 
-void ne2k_interrupt_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
+void ne2k_interrupt_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev)
 {
         nic_t *nic_data = DRIVER_DATA(dev);
         ne2k_interrupt(nic_data, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call));
-
+        
         async_answer_0(iid, EOK);
 }
@@ -257 +253 @@
         if (!ne2k->up) {
                 int rc = ne2k_up(ne2k);
+                if (rc != EOK)
+                        return rc;
+
+                rc = irc_enable_interrupt(ne2k->irq);
                 if (rc != EOK) {
+                        ne2k_down(ne2k);
                         return rc;
                 }
-
-                nic_enable_interrupt(nic_data, ne2k->irq);
         }
         return EOK;
@@ -270 +269 @@
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
 
-        nic_disable_interrupt(nic_data, ne2k->irq);
+        (void) irc_disable_interrupt(ne2k->irq);
         ne2k->receive_configuration = RCR_AB | RCR_AM;
         ne2k_down(ne2k);
@@ -397 +396 @@
         }
         
-        rc = nic_connect_to_services(nic_data);
-        if (rc != EOK) {
-                ne2k_dev_cleanup(dev);
-                return rc;
-        }
-        
         fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
         if (fun == NULL) {
@@ -408 +401 @@
                 return ENOMEM;
         }
+        
         nic_set_ddf_fun(nic_data, fun);
         ddf_fun_set_ops(fun, &ne2k_dev_ops);
-        ddf_fun_data_implant(fun, nic_data);
         
         rc = ddf_fun_bind(fun);
@@ -444 +437 @@
 int main(int argc, char *argv[])
 {
+        printf("%s: HelenOS NE 2000 network adapter driver\n", NAME);
+        
         nic_driver_init(NAME);
         nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface);