Changeset 7b2a7ad in mainline for uspace/lib/c/generic/ipc.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/ipc.c (modified) (4 diffs)

uspace/lib/c/generic/ipc.c

@@ -47 +47 @@
 #include <futex.h>
 #include <fibril.h>
+#include <macros.h>
 
 /**
@@ -611 +612 @@
 /** Request callback connection.
  *
- * The @a taskhash and @a phonehash identifiers returned
+ * The @a task_id and @a phonehash identifiers returned
  * by the kernel can be used for connection tracking.
  *
@@ -618 +619 @@
  * @param arg2      User defined argument.
  * @param arg3      User defined argument.
- * @param taskhash  Opaque identifier of the client task.
+ * @param task_id   Identifier of the client task.
  * @param phonehash Opaque identifier of the phone that will
  *                  be used for incoming calls.
@@ -626 +627 @@
  */
 int ipc_connect_to_me(int phoneid, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
-    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);
+    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;
 }