Changeset 0a9ea4a in mainline for uspace/srv/net/net/net.c

Timestamp:

2011-01-14T14:28:57Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1d7a74e, 6336b6e

Parents:

45019865 (diff), 2f60e57d (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:

Merge development into lelian/hidd

File:

• uspace/srv/net/net/net.c (modified) (7 diffs)

uspace/srv/net/net/net.c

@@ -45 +45 @@
 #include <stdio.h>
 #include <str.h>
+#include <str_error.h>
 
 #include <ipc/ipc.h>
@@ -51 +52 @@
 #include <ipc/net_net.h>
 #include <ipc/il.h>
+#include <ipc/nil.h>
 
 #include <net/modules.h>
@@ -62 +64 @@
 
 #include <netif_remote.h>
-#include <nil_interface.h>
+#include <nil_remote.h>
 #include <net_interface.h>
 #include <ip_interface.h>
@@ -288 +290 @@
         if (rc != EOK)
                 return rc;
-        rc = add_module(NULL, &net_globals.modules, (uint8_t *) DP8390_NAME,
-            (uint8_t *) DP8390_FILENAME, SERVICE_DP8390, 0, connect_to_service);
+        rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME,
+            (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service);
         if (rc != EOK)
                 return rc;
@@ -331 +333 @@
         if (rc != EOK)
                 return rc;
-        
         
         rc = net_initialize(client_connection);
@@ -591 +592 @@
                 rc = start_device(netif);
                 if (rc != EOK) {
+                        printf("%s: Error starting interface %s (%s)\n", NAME,
+                            netif->name, str_error(rc));
                         measured_strings_destroy(&netif->configuration);
                         netifs_exclude_index(&net_globals.netifs, index);
+                        
                         return rc;
                 }
@@ -709 +713 @@
 int main(int argc, char *argv[])
 {
-        int rc;
-        
-        rc = net_module_start(net_client_connection);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: net_module_start error %i\n", NAME, rc);
-                return rc;
-        }
-        
-        return EOK;
+        return net_module_start(net_client_connection);
 }