Changeset 1b186ed in mainline

Timestamp:

2012-08-21T21:14:04Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

13dbaa8c

Parents:

32e4643

Message:

Move handling of IPC_M_CONNECT_ME_TO in process_answer() to its private
ops method.

Files:

• abi/include/ipc/ipc.h (modified) (1 diff)
• kernel/generic/src/ipc/ops/conctmeto.c (modified) (3 diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (1 diff)

abi/include/ipc/ipc.h

@@ -57 +57 @@
 #define IPC_CALL_FORWARDED  (1 << 2)
 
-/** Identify connect_me_to answer */
-#define IPC_CALL_CONN_ME_TO  (1 << 3)
-
 /** Interrupt notification */
-#define IPC_CALL_NOTIF  (1 << 4)
+#define IPC_CALL_NOTIF  (1 << 3)
 
 

kernel/generic/src/ipc/ops/conctmeto.c

@@ -49 +49 @@
         /* Set arg5 for server */
         IPC_SET_ARG5(call->data, (sysarg_t) &TASK->phones[newphid]);
-        call->flags |= IPC_CALL_CONN_ME_TO;
         call->priv = newphid;
 
@@ -66 +65 @@
 }
 
+static int answer_process(call_t *answer)
+{
+        if (IPC_GET_RETVAL(answer->data))
+                phone_dealloc(answer->priv);
+        else
+                IPC_SET_ARG5(answer->data, answer->priv);
+        
+        return EOK;
+}
 
 sysipc_ops_t ipc_m_connect_me_to_ops = {
@@ -71 +79 @@
         .request_process = null_request_process,
         .answer_preprocess = answer_preprocess,
-        .answer_process = null_answer_process,
+        .answer_process = answer_process,
 };
 

kernel/generic/src/ipc/sysipc.c

@@ -242 +242 @@
             (call->flags & IPC_CALL_FORWARDED))
                 IPC_SET_RETVAL(call->data, EFORWARD);
-        
-        if (call->flags & IPC_CALL_CONN_ME_TO) {
-                if (IPC_GET_RETVAL(call->data))
-                        phone_dealloc(call->priv);
-                else
-                        IPC_SET_ARG5(call->data, call->priv);
-        }
         
         if (call->buffer) {