Changeset 869d936 in mainline for uspace/drv/nic/rtl8139/driver.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/rtl8139/driver.c (modified) (6 diffs)

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