Changeset 64d2b10 in mainline for uspace/lib/c/generic/net

Timestamp:

2011-01-29T11:35:03Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ffa2c8ef

Parents:

2c577e0b

Message:

libc: do not intermix low-level IPC methods with async framework methods

Location:

uspace/lib/c/generic/net

Files:

• icmp_api.c (modified) (1 diff)
• modules.c (modified) (4 diffs)
• socket_client.c (modified) (3 diffs)

uspace/lib/c/generic/net/icmp_api.c

@@ -41 +41 @@
 #include <net/modules.h>
 #include <net/ip_codes.h>
-
 #include <async.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <errno.h>
-
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/icmp.h>

uspace/lib/c/generic/net/modules.c

@@ -43 +43 @@
 #include <errno.h>
 #include <sys/time.h>
-
-#include <ipc/ipc.h>
 #include <ipc/services.h>
-
 #include <net/modules.h>
 
@@ -67 +64 @@
                 switch (count) {
                 case 0:
-                        ipc_answer_0(callid, (sysarg_t) result);
+                        async_answer_0(callid, (sysarg_t) result);
                         break;
                 case 1:
-                        ipc_answer_1(callid, (sysarg_t) result,
+                        async_answer_1(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer));
                         break;
                 case 2:
-                        ipc_answer_2(callid, (sysarg_t) result,
+                        async_answer_2(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer));
                         break;
                 case 3:
-                        ipc_answer_3(callid, (sysarg_t) result,
+                        async_answer_3(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer));
                         break;
                 case 4:
-                        ipc_answer_4(callid, (sysarg_t) result,
+                        async_answer_4(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer), IPC_GET_ARG4(*answer));
@@ -89 +86 @@
                 case 5:
                 default:
-                        ipc_answer_5(callid, (sysarg_t) result,
+                        async_answer_5(callid, (sysarg_t) result,
                             IPC_GET_ARG1(*answer), IPC_GET_ARG2(*answer),
                             IPC_GET_ARG3(*answer), IPC_GET_ARG4(*answer),
@@ -137 +134 @@
     sysarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout)
 {
-        int rc;
-        
         /* Connect to the needed service */
         int phone = connect_to_service_timeout(need, timeout);
         if (phone >= 0) {
                 /* Request the bidirectional connection */
-                sysarg_t taskhash;
-                sysarg_t phonehash;
-                
-                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &taskhash,
-                    &phonehash);
+                int rc = async_connect_to_me(phone, arg1, arg2, arg3, client_receiver);
                 if (rc != EOK) {
-                        ipc_hangup(phone);
+                        async_hangup(phone);
                         return rc;
                 }
-                async_new_connection(taskhash, phonehash, 0, NULL,
-                    client_receiver);
         }
         

uspace/lib/c/generic/net/socket_client.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <errno.h>
-
+#include <task.h>
 #include <ipc/services.h>
 #include <ipc/socket.h>
-
 #include <net/modules.h>
 #include <net/in.h>
@@ -278 +277 @@
         }
 
-        ipc_answer_0(callid, (sysarg_t) rc);
+        async_answer_0(callid, (sysarg_t) rc);
         goto loop;
 }
@@ -687 +686 @@
 
         /* Read address */
-        ipc_data_read_start(socket->phone, cliaddr, *addrlen);
+        async_data_read_start(socket->phone, cliaddr, *addrlen);
         fibril_rwlock_write_unlock(&socket_globals.lock);
         async_wait_for(message_id, &ipc_result);