Changeset d40a8ff in mainline for kernel

Timestamp:

2007-11-24T14:19:10Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9201f47

Parents:

0cc4313

Message:

Add mode argument to IPC forward.
This argument can be used to modify the way forward behaves.

Location:

kernel/generic

Files:

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

kernel/generic/include/ipc/ipc.h

@@ -98 +98 @@
 #define PHONE_NS        0
 
+/* Forwarding flags. */
+#define IPC_FF_NONE             0
+
 /* System-specific methods - only through special syscalls
  * These methods have special behaviour
@@ -276 +279 @@
 extern void ipc_call_static_init(call_t *call);
 extern void task_print_list(void);
-extern int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox);
+extern int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox,
+    int mode);
 extern void ipc_cleanup(void);
 extern int ipc_phone_hangup(phone_t *phone);

kernel/generic/include/ipc/sysipc.h

@@ -53 +53 @@
     int nonblocking);
 unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
-    unative_t method, unative_t arg1);
+    unative_t method, unative_t arg1, int mode);
 unative_t sys_ipc_hangup(int phoneid);
 unative_t sys_ipc_register_irq(inr_t inr, devno_t devno, unative_t method,

kernel/generic/src/ipc/ipc.c

@@ -330 +330 @@
  * @param newphone      Phone structure to target answerbox.
  * @param oldbox        Old answerbox structure.
+ * @param mode          Flags that specify mode of the forward operation.
  *
  * @return              Return 0 if forwarding succeeded or an error code if
@@ -337 +338 @@
  * the original caller is notified automatically with EFORWARD.
  */
-int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox)
+int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox, int mode)
 {
         spinlock_lock(&oldbox->lock);

kernel/generic/src/ipc/sysipc.c

@@ -538 +538 @@
  * @param method        New method to use for the forwarded call.
  * @param arg1          New value of the first argument for the forwarded call.
+ * @param mode          Flags that specify mode of the forward operation.
  *
  * @return              Return 0 on succes, otherwise return an error code.
@@ -547 +548 @@
  * new method and argument is not set and these values are ignored.
  *
- * Warning: If implementing non-fast version, make sure that
- *          ARG3 is not rewritten for certain system IPC
+ * Warning:     When implementing support for changing additional payload
+ *              arguments, make sure that ARG3 is not rewritten for certain
+ *              system IPC
  */
 unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
-    unative_t method, unative_t arg1)
+    unative_t method, unative_t arg1, int mode)
 {
         call_t *call;
@@ -592 +594 @@
         }
 
-        return ipc_forward(call, phone, &TASK->answerbox);
+        return ipc_forward(call, phone, &TASK->answerbox, mode);
 }