Changes in uspace/lib/c/generic/async.c [ab34cc9:b76a7329] in mainline

File:

• uspace/lib/c/generic/async.c (modified) (3 diffs)

uspace/lib/c/generic/async.c

@@ -98 +98 @@
 #include <ipc/ipc.h>
 #include <async.h>
+#include "private/async.h"
 #undef LIBC_ASYNC_C_
 
@@ -113 +114 @@
 #include <stdlib.h>
 #include <macros.h>
-#include "private/async.h"
 
 #define CLIENT_HASH_TABLE_BUCKETS  32
@@ -1472 +1472 @@
                 return ENOENT;
         
+        task_id_t task_id;
+        sysarg_t task_id_lo;
+        sysarg_t task_id_hi;
         sysarg_t phone_hash;
-        sysarg_t rc;
-
-        aid_t req;
-        ipc_call_t answer;
-        req = async_send_3(exch, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3,
-            &answer);
-        async_wait_for(req, &rc);
+        int rc = async_req_3_5(exch, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3,
+            NULL, NULL, &task_id_lo, &task_id_hi, &phone_hash);
         if (rc != EOK)
-                return (int) rc;
-
-        phone_hash = IPC_GET_ARG5(answer);
-
+                return rc;
+
+        task_id = (task_id_t) MERGE_LOUP32(task_id_lo, task_id_hi);
+        
         if (client_receiver != NULL)
-                async_new_connection(answer.in_task_id, phone_hash, 0, NULL,
+                async_new_connection(task_id, phone_hash, 0, NULL,
                     client_receiver, carg);