Changeset 7b2a7ad in mainline for kernel

Timestamp:

2011-08-19T18:08:04Z (14 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.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/ipc.c (modified) (1 diff)
• src/ipc/sysipc.c (modified) (1 diff)

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,