Changeset cbfece7 in mainline for uspace/drv/nic/ne2k/ne2k.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/ne2k/ne2k.c (modified) (6 diffs)

uspace/drv/nic/ne2k/ne2k.c

@@ -38 +38 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <stdio.h>
 #include <errno.h>
+#include <irc.h>
 #include <stdlib.h>
 #include <str_error.h>
@@ -256 +254 @@
         if (!ne2k->up) {
                 int rc = ne2k_up(ne2k);
+                if (rc != EOK)
+                        return rc;
+
+                rc = irc_enable_interrupt(ne2k->irq);
                 if (rc != EOK) {
+                        ne2k_down(ne2k);
                         return rc;
                 }
-
-                nic_enable_interrupt(nic_data, ne2k->irq);
         }
         return EOK;
@@ -269 +270 @@
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
 
-        nic_disable_interrupt(nic_data, ne2k->irq);
+        (void) 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) {
@@ -407 +402 @@
                 return ENOMEM;
         }
+        
         nic_set_ddf_fun(nic_data, fun);
         ddf_fun_set_ops(fun, &ne2k_dev_ops);
-        ddf_fun_data_implant(fun, nic_data);
         
         rc = ddf_fun_bind(fun);
@@ -443 +438 @@
 int main(int argc, char *argv[])
 {
+        printf("%s: HelenOS NE 2000 network adapter driver\n", NAME);
+        
         nic_driver_init(NAME);
         nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface);