Changeset eb522e8 in mainline for uspace/srv/net/net/net_standalone.c

Timestamp:

2011-06-01T08:43:42Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/srv/net/net/net_standalone.c (modified) (3 diffs)

uspace/srv/net/net/net_standalone.c

@@ -40 +40 @@
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-#include <ipc/ipc.h>
 #include <ipc/net.h>
 #include <errno.h>
@@ -63 +62 @@
         int rc;
         
-        task_id_t task_id = spawn("/srv/ip");
+        task_id_t task_id = net_spawn((uint8_t *) "/srv/ip");
         if (!task_id)
                 return EINVAL;
         
-        rc = add_module(NULL, &net_globals.modules, IP_NAME,
-            IP_FILENAME, SERVICE_IP, task_id, ip_connect_module);
+        rc = add_module(NULL, &net_globals.modules, (uint8_t *) IP_NAME,
+            (uint8_t *) IP_FILENAME, SERVICE_IP, task_id, ip_connect_module);
         if (rc != EOK)
                 return rc;
         
-        if (!spawn("/srv/icmp"))
+        if (!net_spawn((uint8_t *) "/srv/icmp"))
                 return EINVAL;
         
-        if (!spawn("/srv/udp"))
+        if (!net_spawn((uint8_t *) "/srv/udp"))
                 return EINVAL;
         
-        if (!spawn("/srv/tcp"))
+        if (!net_spawn((uint8_t *) "/srv/tcp"))
                 return EINVAL;
         
@@ -100 +99 @@
  */
 int net_module_message(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+    ipc_call_t *answer, size_t *count)
 {
-        if (IS_NET_PACKET_MESSAGE(call))
-                return packet_server_message(callid, call, answer, answer_count);
+        if (IS_NET_PACKET_MESSAGE(*call))
+                return packet_server_message(callid, call, answer, count);
         
-        return net_message(callid, call, answer, answer_count);
+        return net_message(callid, call, answer, count);
 }