Changeset b61d47d in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2007-12-02T20:00:14Z (18 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

90c35436

Parents:

8df2eab

Message:

Function ipc_connect_me_to sends 3 user defined arguments now.
One argument added also to ipc_forward_fast.
Fixed devmap and improved its test.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (6 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -192 +192 @@
                 /* If the users accepted call, connect */
                 if (!IPC_GET_RETVAL(answer->data)) {
-                        ipc_phone_connect((phone_t *) IPC_GET_ARG3(*olddata),
+                        ipc_phone_connect((phone_t *) IPC_GET_ARG5(*olddata),
                             &TASK->answerbox);
                 }
@@ -271 +271 @@
                         return ELIMIT;
                 /* Set arg3 for server */
-                IPC_SET_ARG3(call->data, (unative_t) &TASK->phones[newphid]);
+                IPC_SET_ARG5(call->data, (unative_t) &TASK->phones[newphid]);
                 call->flags |= IPC_CALL_CONN_ME_TO;
                 call->priv = newphid;
@@ -319 +319 @@
                         phone_dealloc(call->priv);
                 else
-                        IPC_SET_ARG3(call->data, call->priv);
+                        IPC_SET_ARG5(call->data, call->priv);
         }
 }
@@ -553 +553 @@
  */
 unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
-    unative_t method, unative_t arg1, int mode)
+    unative_t method, unative_t arg1, unative_t arg2, int mode)
 {
         call_t *call;
@@ -578 +578 @@
         /*
          * Userspace is not allowed to change method of system methods on
-         * forward, allow changing ARG1 and ARG2 by means of method and arg1.
+         * forward, allow changing ARG1, ARG2 and ARG3 by means of method,
+         * arg1 and arg2.
          * If the method is immutable, don't change anything.
          */
@@ -584 +585 @@
                 if (method_is_system(IPC_GET_METHOD(call->data))) {
                         if (IPC_GET_METHOD(call->data) == IPC_M_CONNECT_TO_ME)
-                                phone_dealloc(IPC_GET_ARG3(call->data));
+                                phone_dealloc(IPC_GET_ARG5(call->data));
 
                         IPC_SET_ARG1(call->data, method);
                         IPC_SET_ARG2(call->data, arg1);
+                        IPC_SET_ARG3(call->data, arg2);
                 } else {
                         IPC_SET_METHOD(call->data, method);
                         IPC_SET_ARG1(call->data, arg1);
+                        IPC_SET_ARG2(call->data, arg2);
                 }
         }