Changeset 6364d3c in mainline for kernel/generic

Timestamp:

2007-12-04T20:29:55Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9119d25

Parents:

38c706cc

Message:

Sync IPC comments with IPC code.

Location:

kernel/generic

Files:

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

kernel/generic/include/ipc/ipc.h

@@ -119 +119 @@
  * The protocol for negotiating is:
  * - sys_connect_to_me - sends a message IPC_M_CONNECT_TO_ME
- * - sys_wait_for_call - upon receipt tries to allocate new phone
+ * - recipient         - upon receipt tries to allocate new phone
  *                       - if it fails, responds with ELIMIT
  *                     - passes call to userspace. If userspace
@@ -127 +127 @@
  *                     - the allocated phoneid is passed to userspace 
  *                       (on the receiving side) as ARG5 of the call.
- *                     - the caller obtains taskid of the called thread
  */
 #define IPC_M_CONNECT_TO_ME     1
@@ -142 +141 @@
  *                       address of the phone that should be connected
  *                       (TODO: it leaks to userspace)
- *   recipient         -  if ipc_answer == 0, then accept connection
+ *  - recipient        -  if ipc_answer == 0, then accept connection
  *                     -  otherwise connection refused
- *                     -  recepient may forward message. Forwarding
- *                        system message 
+ *                     -  recepient may forward message.
  *
  */

kernel/generic/src/ipc/sysipc.c

@@ -185 +185 @@
                         /* The connection was accepted */
                         phone_connect(phoneid, &answer->sender->answerbox);
-                        /* Set 'phone hash' as arg3 of response */
+                        /* Set 'phone hash' as arg5 of response */
                         IPC_SET_ARG5(answer->data,
                             (unative_t) &TASK->phones[phoneid]);
@@ -270 +270 @@
                 if (newphid < 0)
                         return ELIMIT;
-                /* Set arg3 for server */
+                /* Set arg5 for server */
                 IPC_SET_ARG5(call->data, (unative_t) &TASK->phones[newphid]);
                 call->flags |= IPC_CALL_CONN_ME_TO;