Changeset 36b16bc in mainline

Timestamp:

2011-08-19T16:04:37Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

633bcc6, 7a2f7ecd

Parents:

e2ab36f1

Message:

Fix leftover use of task hash in async_connect_to_me().

Files:

• kernel/generic/src/ipc/sysipc.c (modified) (1 diff)
• uspace/lib/c/generic/async.c (modified) (1 diff)

kernel/generic/src/ipc/sysipc.c

@@ -253 +253 @@
                         /* The connection was accepted */
                         phone_connect(phoneid, &answer->sender->answerbox);
-                        /* Set 'task hash' as arg4 of response */
-                        IPC_SET_ARG4(answer->data, (sysarg_t) TASK);
+                        /* 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;
         
-        sysarg_t task_hash;
+        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, NULL, &task_hash, &phone_hash);
+            NULL, NULL, &task_id_lo, &task_id_hi, &phone_hash);
         if (rc != EOK)
                 return rc;
+
+        task_id = (task_id_t) MERGE_LOUP32(task_id_lo, task_id_hi);
         
         if (client_receiver != NULL)
-                async_new_connection(task_hash, phone_hash, 0, NULL,
+                async_new_connection(task_id, phone_hash, 0, NULL,
                     client_receiver, carg);