Changeset cbfece7 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2014-07-21T22:10:18Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

1f1fa64

Parents:

96e368a (diff), 54a1ca7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

• Merged mainline changes
• Refactored rtl8169 driver to work with recent driver framework changes
• Fixed speed selection in rtl8169 (disables autonegotiation first)
• Added support for restarting autonegotiation
• Added new switch to 'nic' utility which restarts autonegotiation

File:

• uspace/drv/nic/e1k/e1k.c (modified) (7 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -33 +33 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <assert.h>
 #include <stdio.h>
@@ -42 +39 @@
 #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 +1753 @@
         e1000_enable_interrupts(e1000);
         
-        nic_enable_interrupt(nic, e1000->irq);
+        int rc = irc_enable_interrupt(e1000->irq);
+        if (rc != EOK) {
+                e1000_disable_interrupts(e1000);
+                fibril_mutex_unlock(&e1000->ctrl_lock);
+                fibril_mutex_unlock(&e1000->tx_lock);
+                fibril_mutex_unlock(&e1000->rx_lock);
+                return rc;
+        }
         
         e1000_clear_rx_ring(e1000);
@@ -1796 +1798 @@
         e1000_disable_rx(e1000);
         
-        nic_disable_interrupt(nic, e1000->irq);
+        irc_disable_interrupt(e1000->irq);
         e1000_disable_interrupts(e1000);
         
@@ -2148 +2150 @@
         nic_set_ddf_fun(nic, fun);
         ddf_fun_set_ops(fun, &e1000_dev_ops);
-        ddf_fun_data_implant(fun, nic);
         
         rc = e1000_register_int_handler(nic);
         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 +2376 @@
 int main(void)
 {
-        int rc = nic_driver_init(NAME);
-        if (rc != EOK)
-                return rc;
+        printf("%s: HelenOS E1000 network adapter driver\n", NAME);
+        
+        if (nic_driver_init(NAME) != EOK)
+                return 1;
         
         nic_driver_implement(&e1000_driver_ops, &e1000_dev_ops,
@@ -2387 +2385 @@
         
         ddf_log_init(NAME);
-        ddf_msg(LVL_NOTE, "HelenOS E1000 driver started");
         return ddf_driver_main(&e1000_driver);
 }