Changeset 7b2a7ad in mainline for uspace/lib/c/generic/async.c

Timestamp:

2011-08-19T18:08:04Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

58cbf8d5

Parents:

b76a7329 (diff), ab34cc9 (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 from lp:~jakub/helenos/camp2011.

File:

• uspace/lib/c/generic/async.c (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -1472 +1472 @@
                 return ENOENT;
         
-        task_id_t task_id;
-        sysarg_t task_id_lo;
-        sysarg_t task_id_hi;
         sysarg_t phone_hash;
-        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);
+        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);
         if (rc != EOK)
-                return rc;
-
-        task_id = (task_id_t) MERGE_LOUP32(task_id_lo, task_id_hi);
-        
+                return (int) rc;
+
+        phone_hash = IPC_GET_ARG5(answer);
+
         if (client_receiver != NULL)
-                async_new_connection(task_id, phone_hash, 0, NULL,
+                async_new_connection(answer.in_task_id, phone_hash, 0, NULL,
                     client_receiver, carg);