Changeset 869d936 in mainline for uspace/drv/nic/ne2k/ne2k.c

Timestamp:

2014-07-18T08:11:34Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e5424e9

Parents:

fc6abbe

Message:

libnic slices, dices, cooks cofee and enables interrupts.

File:

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

uspace/drv/nic/ne2k/ne2k.c

@@ -43 +43 @@
 #include <stdio.h>
 #include <errno.h>
+#include <irc.h>
 #include <stdlib.h>
 #include <str_error.h>
@@ -260 +261 @@
                 }
 
-                nic_enable_interrupt(nic_data, ne2k->irq);
+                irc_enable_interrupt(ne2k->irq);
         }
         return EOK;
@@ -269 +270 @@
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
 
-        nic_disable_interrupt(nic_data, ne2k->irq);
+        irc_disable_interrupt(ne2k->irq);
         ne2k->receive_configuration = RCR_AB | RCR_AM;
         ne2k_down(ne2k);
@@ -396 +397 @@
         }
         
-        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) {
@@ -443 +438 @@
 int main(int argc, char *argv[])
 {
+        printf("%s: HelenOS NE 2000 network adapter driver\n", NAME);
+        
+        if (irc_init() != EOK) {
+                printf("%s: Failed connecting IRC service\n", NAME);
+                return 1;
+        }
+        
         nic_driver_init(NAME);
         nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface);