Changeset b74959bd in mainline for kernel

Timestamp:

2007-11-20T21:33:32Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8498915

Parents:

3209923

Message:

Modify ipc_answer_*() to make use of all six syscall arguments. The recommended
means of answering calls is via the ipc_answer_m() macros (where m denotes the
number of return arguments) that automatically decide between the fast register
version or the slow universal version of ipc_answer().

Location:

kernel/generic

Files:

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

kernel/generic/include/ipc/sysipc.h

@@ -48 +48 @@
 unative_t sys_ipc_call_async_slow(unative_t phoneid, ipc_data_t *data);
 unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval, 
-    unative_t arg1, unative_t arg2);
-unative_t sys_ipc_answer(unative_t callid, ipc_data_t *data);
+    unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4);
+unative_t sys_ipc_answer_slow(unative_t callid, ipc_data_t *data);
 unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
     int nonblocking);

kernel/generic/include/syscall/syscall.h

@@ -53 +53 @@
         SYS_IPC_CALL_ASYNC_SLOW,
         SYS_IPC_ANSWER_FAST,
-        SYS_IPC_ANSWER,
+        SYS_IPC_ANSWER_SLOW,
         SYS_IPC_FORWARD_FAST,
         SYS_IPC_WAIT,

kernel/generic/src/ipc/sysipc.c

@@ -593 +593 @@
  * @param arg1          Service-defined return value.
  * @param arg2          Service-defined return value.
+ * @param arg3          Service-defined return value.
+ * @param arg4          Service-defined return value.
  *
  * @return              Return 0 on success, otherwise return an error code.    
  */
 unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval,
-    unative_t arg1, unative_t arg2)
+    unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4)
 {
         call_t *call;
@@ -620 +622 @@
         IPC_SET_ARG1(call->data, arg1);
         IPC_SET_ARG2(call->data, arg2);
+        IPC_SET_ARG3(call->data, arg3);
+        IPC_SET_ARG4(call->data, arg4);
         rc = answer_preprocess(call, saveddata ? &saved_data : NULL);
 
@@ -633 +637 @@
  * @return              Return 0 on success, otherwise return an error code.
  */
-unative_t sys_ipc_answer(unative_t callid, ipc_data_t *data)
+unative_t sys_ipc_answer_slow(unative_t callid, ipc_data_t *data)
 {
         call_t *call;

kernel/generic/src/syscall/syscall.c

@@ -138 +138 @@
         (syshandler_t) sys_ipc_call_async_slow,
         (syshandler_t) sys_ipc_answer_fast,
-        (syshandler_t) sys_ipc_answer,
+        (syshandler_t) sys_ipc_answer_slow,
         (syshandler_t) sys_ipc_forward_fast,
         (syshandler_t) sys_ipc_wait_for_call,