Changeset 38c706cc in mainline for kernel/generic

Timestamp:

2007-12-04T19:54:53Z (18 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

6364d3c

Parents:

90c35436

Message:

Extended IPC_M_CONNECT_TO_ME to use 3 user defined parameters.
Phone identifier is passed in ARG5.

Location:

kernel/generic

Files:

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

kernel/generic/include/ipc/ipc.h

@@ -126 +126 @@
  *                       the call is accepted and the response is sent back.
  *                     - the allocated phoneid is passed to userspace 
- *                       (on the receiving side) as ARG3 of the call.
+ *                       (on the receiving side) as ARG5 of the call.
  *                     - the caller obtains taskid of the called thread
  */

kernel/generic/src/ipc/ipc.c

@@ -569 +569 @@
                 call = list_get_instance(tmp, call_t, link);
                 printf("Callid: %p Srctask:%llu M:%d A1:%d A2:%d A3:%d "
-                    "Flags:%x\n", call, call->sender->taskid,
+                    "A4:%d A5:%d Flags:%x\n", call, call->sender->taskid,
                     IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
+                    IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
                     call->flags);
         }
@@ -581 +582 @@
                 call = list_get_instance(tmp, call_t, link);
                 printf("Callid: %p Srctask:%llu M:%d A1:%d A2:%d A3:%d "
-                    "Flags:%x\n", call, call->sender->taskid,
+                    "A4:%d A5:%d Flags:%x\n", call, call->sender->taskid,
                     IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
+                    IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
                     call->flags);
         }
@@ -591 +593 @@
             tmp = tmp->next) {
                 call = list_get_instance(tmp, call_t, link);
-                printf("Callid:%p M:%d A1:%d A2:%d A3:%d Flags:%x\n", call,
-                    IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
+                printf("Callid:%p M:%d A1:%d A2:%d A3:%d A4:%d A5:%d Flags:%x\n", 
+                    call, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
+                    IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
                     call->flags);
         }

kernel/generic/src/ipc/ipcrsc.c

@@ -73 +73 @@
  * *** Connect_me_to ***
  * The caller sends IPC_M_CONNECT_ME_TO to an answerbox. The server receives
- * 'phoneid' of the connecting phone as an ARG3. If it answers with RETVAL=0,
+ * 'phoneid' of the connecting phone as an ARG5. If it answers with RETVAL=0,
  * the phonecall is accepted, otherwise it is refused.
  *

kernel/generic/src/ipc/sysipc.c

@@ -178 +178 @@
 
         if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_TO_ME) {
-                phoneid = IPC_GET_ARG3(*olddata);
+                phoneid = IPC_GET_ARG5(*olddata);
                 if (IPC_GET_RETVAL(answer->data)) {
                         /* The connection was not accepted */
@@ -186 +186 @@
                         phone_connect(phoneid, &answer->sender->answerbox);
                         /* Set 'phone hash' as arg3 of response */
-                        IPC_SET_ARG3(answer->data,
+                        IPC_SET_ARG5(answer->data,
                             (unative_t) &TASK->phones[phoneid]);
                 }
@@ -342 +342 @@
                         return -1;
                 }
-                IPC_SET_ARG3(call->data, phoneid);
+                IPC_SET_ARG5(call->data, phoneid);
         } 
         return 0;