Changeset cd50486 in mainline for uspace/lib/c/generic/net/modules.c

Timestamp:

2011-02-06T22:03:55Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

25971d2

Parents:

1110ebd (diff), 960ff451 (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/ changes

File:

• uspace/lib/c/generic/net/modules.c (modified) (4 diffs)

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);
         }