Changeset 7a51d75 in mainline for uspace/lib/c/generic/ipc.c

Timestamp:

2011-01-28T15:30:42Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial

Children:

ea991e84

Parents:

c5c003c (diff), 2b96463 (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/ipc.c (modified) (2 diffs)

uspace/lib/c/generic/ipc.c

@@ -578 +578 @@
  * @param arg2          Service-defined argument.
  * @param arg3          Service-defined argument.
- * @param phonehash     Storage where the library will store an opaque
+ * @param taskhash      Storage where the kernel will store an opaque
+ *                      identifier of the client task.
+ * @param phonehash     Storage where the kernel will store an opaque
  *                      identifier of the phone that will be used for incoming
  *                      calls. This identifier can be used for connection
@@ -586 +588 @@
  */
 int ipc_connect_to_me(int phoneid, int arg1, int arg2, int arg3, 
-    sysarg_t *phonehash)
+    sysarg_t *taskhash, sysarg_t *phonehash)
 {
         return ipc_call_sync_3_5(phoneid, IPC_M_CONNECT_TO_ME, arg1, arg2,
-            arg3, NULL, NULL, NULL, NULL, phonehash);
+            arg3, NULL, NULL, NULL, taskhash, phonehash);
 }