Changeset 124c061 in mainline for uspace/lib/c

Timestamp:

2011-01-23T23:47:58Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

11bb813

Parents:

fdb9982c

Message:

ipc_connect_to_me() now takes one extra argument to store the client task hash.

Location:

uspace/lib/c

Files:

• generic/devman.c (modified) (1 diff)
• generic/devmap.c (modified) (1 diff)
• generic/ipc.c (modified) (2 diffs)
• generic/net/modules.c (modified) (1 diff)
• include/ipc/ipc.h (modified) (1 diff)

uspace/lib/c/generic/devman.c

@@ -116 +116 @@
         async_set_client_connection(conn);
         
-        sysarg_t callback_phonehash;
-        ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
+        ipc_connect_to_me(phone, 0, 0, 0, NULL, NULL);
         async_wait_for(req, &retval);
         

uspace/lib/c/generic/devmap.c

@@ -116 +116 @@
         async_set_client_connection(conn);
         
-        sysarg_t callback_phonehash;
-        ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash);
+        ipc_connect_to_me(phone, 0, 0, 0, NULL, NULL);
         async_wait_for(req, &retval);
         

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);
 }
 

uspace/lib/c/generic/net/modules.c

@@ -145 +145 @@
                 sysarg_t phonehash;
                 
-                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash);
+                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, NULL,
+                    &phonehash);
                 if (rc != EOK) {
                         ipc_hangup(phone);

uspace/lib/c/include/ipc/ipc.h

@@ -259 +259 @@
     sysarg_t, sysarg_t, void *, ipc_async_callback_t, int);
 
-extern int ipc_connect_to_me(int, int, int, int, sysarg_t *);
+extern int ipc_connect_to_me(int, int, int, int, sysarg_t *, sysarg_t *);
 extern int ipc_connect_me_to(int, int, int, int);
 extern int ipc_connect_me_to_blocking(int, int, int, int);