Changeset 869d936 in mainline for uspace/drv

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.

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (6 diffs)
• ne2k/ne2k.c (modified) (5 diffs)
• rtl8139/driver.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);
 }

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);

uspace/drv/nic/rtl8139/driver.c

@@ -35 +35 @@
 #include <byteorder.h>
 #include <libarch/barrier.h>
-
 #include <as.h>
 #include <ddf/log.h>
@@ -42 +41 @@
 #include <nic.h>
 #include <pci_dev_iface.h>
-
-#include <ipc/irc.h>
-#include <sysinfo.h>
-#include <ipc/ns.h>
-
+#include <irc.h>
+#include <stdio.h>
 #include <str.h>
 
@@ -960 +956 @@
         rtl8139->int_mask = RTL_DEFAULT_INTERRUPTS;
         rtl8139_hw_int_enable(rtl8139);
-        nic_enable_interrupt(nic_data, rtl8139->irq);
+        irc_enable_interrupt(rtl8139->irq);
 
         ddf_msg(LVL_DEBUG, "Device activated, interrupt %d registered", rtl8139->irq);
@@ -1325 +1321 @@
                 goto err_pio;
 
-        rc = nic_connect_to_services(nic_data);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed to connect to services (%d)", rc);
-                goto err_irq;
-        }
-
         fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
         if (fun == NULL) {
@@ -1361 +1351 @@
         ddf_fun_destroy(fun);
 err_srv:
-        /* XXX Disconnect from services */
-err_irq:
         unregister_interrupt_handler(dev, rtl8139->irq);
 err_pio:
@@ -2180 +2168 @@
 int main(void)
 {
+        printf("%s: HelenOS RTL8139 network adapter driver\n", NAME);
+
+        if (irc_init() != EOK) {
+                printf("%s: Failed connecting IRC service\n", NAME);
+                return 1;
+        }
+
         int rc = nic_driver_init(NAME);
         if (rc != EOK)
                 return rc;
-        nic_driver_implement(
-                &rtl8139_driver_ops, &rtl8139_dev_ops, &rtl8139_nic_iface);
+
+        nic_driver_implement(&rtl8139_driver_ops, &rtl8139_dev_ops,
+            &rtl8139_nic_iface);
 
         ddf_log_init(NAME);
-        ddf_msg(LVL_NOTE, "HelenOS RTL8139 driver started");
         return ddf_driver_main(&rtl8139_driver);
 }