Changeset 8b655705 in mainline for kernel/generic/include/ipc/ipc.h

Timestamp:

2011-04-15T19:38:07Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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 mainline changes.

File:

• kernel/generic/include/ipc/ipc.h (modified) (5 diffs)

kernel/generic/include/ipc/ipc.h

@@ -116 +116 @@
 #define IPC_FF_ROUTE_FROM_ME  (1 << 0)
 
+/* Data transfer flags. */
+#define IPC_XF_NONE             0
+
+/** Restrict the transfer size if necessary. */
+#define IPC_XF_RESTRICT         (1 << 0)
+
 /** Kernel IPC interfaces
  *
@@ -165 +171 @@
  *                       error is sent back to caller. Otherwise 
  *                       the call is accepted and the response is sent back.
- *                     - the allocated phoneid is passed to userspace 
+ *                     - the hash of the client task is passed to userspace
+ *                       (on the receiving side) as ARG4 of the call.
+ *                     - the hash of the allocated phone is passed to userspace
  *                       (on the receiving side) as ARG5 of the call.
  *
@@ -319 +327 @@
 typedef struct {
         sysarg_t args[IPC_CALL_LEN];
+        /** Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME. */
+        struct task *task;
+        /** Phone which made or last masqueraded this call. */
         phone_t *phone;
 } ipc_data_t;
@@ -333 +344 @@
          * The caller box is different from sender->answerbox
          * for synchronous calls.
-         *
          */
         answerbox_t *callerbox;
@@ -350 +360 @@
          * cases, we must keep it aside so that the answer is processed
          * correctly.
-         *
          */
         phone_t *caller_phone;