Changeset 8b5690f in mainline for uspace/srv/net/net/net.c

Timestamp:

2011-02-03T05:11:01Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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 mainline changes.

File:

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

uspace/srv/net/net/net.c

@@ -45 +45 @@
 #include <stdio.h>
 #include <str.h>
-
-#include <ipc/ipc.h>
+#include <str_error.h>
+
 #include <ipc/services.h>
 #include <ipc/net.h>
 #include <ipc/net_net.h>
 #include <ipc/il.h>
+#include <ipc/nil.h>
 
 #include <net/modules.h>
@@ -62 +63 @@
 
 #include <netif_remote.h>
-#include <nil_interface.h>
+#include <nil_remote.h>
 #include <net_interface.h>
 #include <ip_interface.h>
@@ -288 +289 @@
         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;
@@ -324 +325 @@
 static int net_module_start(async_client_conn_t client_connection)
 {
-        sysarg_t phonehash;
         int rc;
         
@@ -332 +332 @@
                 return rc;
         
-        
         rc = net_initialize(client_connection);
         if (rc != EOK)
                 goto out;
         
-        rc = ipc_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, &phonehash);
+        rc = async_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL);
         if (rc != EOK)
                 goto out;
@@ -474 +473 @@
         
         setting = measured_strings_find(&netif->configuration, (uint8_t *) CONF_IO, 0);
-        int io = setting ? strtol((char *) setting->value, NULL, 16) : 0;
-        
-        rc = netif_probe_req_remote(netif->driver->phone, netif->id, irq, io);
+        uintptr_t io = setting ? strtol((char *) setting->value, NULL, 16) : 0;
+        
+        rc = netif_probe_req(netif->driver->phone, netif->id, irq, (void *) io);
         if (rc != EOK)
                 return rc;
@@ -511 +510 @@
         }
         
-        return netif_start_req_remote(netif->driver->phone, netif->id);
+        return netif_start_req(netif->driver->phone, netif->id);
 }
 
@@ -591 +590 @@
                 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;
                 }
@@ -613 +615 @@
 /** Process the networking message.
  *
- * @param[in] callid        The message identifier.
- * @param[in] call          The message parameters.
+ * @param[in]  callid       The message identifier.
+ * @param[in]  call         The message parameters.
  * @param[out] answer       The message answer parameters.
  * @param[out] answer_count The last parameter for the actual answer
@@ -627 +629 @@
  */
 int net_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer,
-    int *answer_count)
+    size_t *answer_count)
 {
         measured_string_t *strings;
@@ -639 +641 @@
         case NET_NET_GET_DEVICE_CONF:
                 rc = measured_strings_receive(&strings, &data,
-                    IPC_GET_COUNT(call));
+                    IPC_GET_COUNT(*call));
                 if (rc != EOK)
                         return rc;
-                net_get_device_conf_req(0, IPC_GET_DEVICE(call), &strings,
-                    IPC_GET_COUNT(call), NULL);
+                net_get_device_conf_req(0, IPC_GET_DEVICE(*call), &strings,
+                    IPC_GET_COUNT(*call), NULL);
                 
                 /* Strings should not contain received data anymore */
                 free(data);
                 
-                rc = measured_strings_reply(strings, IPC_GET_COUNT(call));
+                rc = measured_strings_reply(strings, IPC_GET_COUNT(*call));
                 free(strings);
                 return rc;
         case NET_NET_GET_CONF:
                 rc = measured_strings_receive(&strings, &data,
-                    IPC_GET_COUNT(call));
+                    IPC_GET_COUNT(*call));
                 if (rc != EOK)
                         return rc;
-                net_get_conf_req(0, &strings, IPC_GET_COUNT(call), NULL);
+                net_get_conf_req(0, &strings, IPC_GET_COUNT(*call), NULL);
                 
                 /* Strings should not contain received data anymore */
                 free(data);
                 
-                rc = measured_strings_reply(strings, IPC_GET_COUNT(call));
+                rc = measured_strings_reply(strings, IPC_GET_COUNT(*call));
                 free(strings);
                 return rc;
@@ -683 +685 @@
          *  - Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {
                 /* Clear the answer structure */
                 ipc_call_t answer;
-                int answer_count;
+                size_t answer_count;
                 refresh_answer(&answer, &answer_count);
                 
@@ -709 +711 @@
 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);
 }