Changes in uspace/lib/c/generic/ipc.c [ab34cc9:10477601] in mainline

File:

• uspace/lib/c/generic/ipc.c (modified) (6 diffs)

uspace/lib/c/generic/ipc.c

@@ -47 +47 @@
 #include <futex.h>
 #include <fibril.h>
-#include <macros.h>
 
 /**
@@ -459 +458 @@
         while (!list_empty(&queued_calls)) {
                 async_call_t *call =
-                    list_get_instance(list_first(&queued_calls), async_call_t, list);
+                    list_get_instance(queued_calls.next, async_call_t, list);
                 ipc_callid_t callid =
                     ipc_call_async_internal(call->u.msg.phoneid, &call->u.msg.data);
@@ -512 +511 @@
         
         link_t *item;
-        for (item = dispatched_calls.head.next; item != &dispatched_calls.head;
+        for (item = dispatched_calls.next; item != &dispatched_calls;
             item = item->next) {
                 async_call_t *call =
@@ -612 +611 @@
 /** Request callback connection.
  *
- * The @a task_id and @a phonehash identifiers returned
+ * The @a taskhash and @a phonehash identifiers returned
  * by the kernel can be used for connection tracking.
  *
@@ -619 +618 @@
  * @param arg2      User defined argument.
  * @param arg3      User defined argument.
- * @param task_id   Identifier of the client task.
+ * @param taskhash  Opaque identifier of the client task.
  * @param phonehash Opaque identifier of the phone that will
  *                  be used for incoming calls.
@@ -627 +626 @@
  */
 int ipc_connect_to_me(int phoneid, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
-    task_id_t *task_id, sysarg_t *phonehash)
-{
-        ipc_call_t data;
-        int rc = __SYSCALL6(SYS_IPC_CALL_SYNC_FAST, phoneid,
-            IPC_M_CONNECT_TO_ME, arg1, arg2, arg3, (sysarg_t) &data);
-        if (rc == EOK) {
-                *task_id = data.in_task_id;
-                *phonehash = IPC_GET_ARG5(data);
-        }       
-        return rc;
-}
-
-/** Request cloned connection.
- *
- * @param phoneid Phone handle used for contacting the other side.
- *
- * @return Cloned phone handle on success or a negative error code.
- *
- */
-int ipc_connect_me(int phoneid)
-{
-        sysarg_t newphid;
-        int res = ipc_call_sync_0_5(phoneid, IPC_M_CONNECT_ME, NULL, NULL,
-            NULL, NULL, &newphid);
-        if (res)
-                return res;
-        
-        return newphid;
+    sysarg_t *taskhash, sysarg_t *phonehash)
+{
+        return ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_TO_ME, arg1, arg2,
+            arg3, NULL, NULL, NULL, taskhash, phonehash);
 }