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

Timestamp:

2014-07-18T08:11:34Z (11 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/e1k/e1k.c (modified) (6 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -42 +42 @@
 #include <align.h>
 #include <byteorder.h>
-#include <sysinfo.h>
-#include <ipc/irc.h>
-#include <ipc/ns.h>
+#include <irc.h>
+#include <as.h>
 #include <ddi.h>
-#include <as.h>
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
@@ -1758 +1756 @@
         e1000_enable_interrupts(e1000);
         
-        nic_enable_interrupt(nic, e1000->irq);
+        irc_enable_interrupt(e1000->irq);
         
         e1000_clear_rx_ring(e1000);
@@ -1796 +1794 @@
         e1000_disable_rx(e1000);
         
-        nic_disable_interrupt(nic, e1000->irq);
+        irc_disable_interrupt(e1000->irq);
         e1000_disable_interrupts(e1000);
         
@@ -2153 +2151 @@
         if (rc != EOK)
                 goto err_fun_create;
-        
-        rc = nic_connect_to_services(nic);
-        if (rc != EOK)
-                goto err_irq;
         
         rc = e1000_initialize_rx_structure(nic);
@@ -2379 +2373 @@
 int main(void)
 {
-        int rc = nic_driver_init(NAME);
-        if (rc != EOK)
-                return rc;
+        printf("%s: HelenOS E1000 network adapter driver\n", NAME);
+        
+        if (irc_init() != EOK) {
+                printf("%s: Failed connecting IRC service\n", NAME);
+                return 1;
+        }
+        
+        if (nic_driver_init(NAME) != EOK)
+                return 1;
         
         nic_driver_implement(&e1000_driver_ops, &e1000_dev_ops,
@@ -2387 +2387 @@
         
         ddf_log_init(NAME);
-        ddf_msg(LVL_NOTE, "HelenOS E1000 driver started");
         return ddf_driver_main(&e1000_driver);
 }