Changes in / [b76a7329:7b2a7ad] in mainline

Files:

• abi/include/ipc/methods.h (modified) (1 diff)
• kernel/generic/include/ipc/ipc.h (modified) (1 diff)
• kernel/generic/src/ipc/ipc.c (modified) (1 diff)
• kernel/generic/src/ipc/sysipc.c (modified) (1 diff)
• uspace/lib/c/generic/async.c (modified) (1 diff)
• uspace/lib/c/generic/ipc.c (modified) (4 diffs)
• uspace/lib/c/include/ipc/ipc.h (modified) (1 diff)

abi/include/ipc/methods.h

@@ -96 +96 @@
  *                       error is sent back to caller. Otherwise 
  *                       the call is accepted and the response is sent back.
- *                     - the hash of the client task is passed to userspace
- *                       (on the receiving side) as ARG4 of the call.
  *                     - the hash of the allocated phone is passed to userspace
  *                       (on the receiving side) as ARG5 of the call.

kernel/generic/include/ipc/ipc.h

@@ -98 +98 @@
 typedef struct {
         sysarg_t args[IPC_CALL_LEN];
-        /** Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME. */
+        /**
+         * Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME,
+         * or the task which answered the call.
+         */
         task_id_t task_id;
         /** Phone which made or last masqueraded this call. */

kernel/generic/src/ipc/ipc.c

@@ -230 +230 @@
                 }
         }
+
+        call->data.task_id = TASK->taskid;
         
         if (do_lock)

kernel/generic/src/ipc/sysipc.c

@@ -253 +253 @@
                         /* The connection was accepted */
                         phone_connect(phoneid, &answer->sender->answerbox);
-                        /* Set 'task ID' as arg3 and arg4 of response */
-                        IPC_SET_ARG3(answer->data, LOWER32(TASK->taskid));
-                        IPC_SET_ARG4(answer->data, UPPER32(TASK->taskid));
                         /* Set 'phone hash' as arg5 of response */
                         IPC_SET_ARG5(answer->data,

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

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

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

@@ -254 +254 @@
     sysarg_t, sysarg_t, void *, ipc_async_callback_t, bool);
 
-extern int ipc_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t *,
+extern int ipc_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, task_id_t *,
     sysarg_t *);
 extern int ipc_connect_me(int);