Changeset 32e4643 in mainline

Timestamp:

2012-08-21T20:56:15Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b186ed

Parents:

0343a1b

Message:

Always remember the original request method so that it is actually
possible to call ops→answer_process().

Location:

kernel/generic

Files:

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

kernel/generic/include/ipc/ipc.h

@@ -143 +143 @@
         /** Data passed from/to userspace. */
         ipc_data_t data;
-        
+
+        /** Method as it was sent in the request. */
+        sysarg_t request_method;
+
         /** Buffer for IPC_M_DATA_WRITE and IPC_M_DATA_READ. */
         uint8_t *buffer;

kernel/generic/src/ipc/sysipc.c

@@ -198 +198 @@
         
 
-        sysipc_ops_t *ops = sysipc_ops_get(IPC_GET_IMETHOD(*olddata));
+        sysipc_ops_t *ops = sysipc_ops_get(answer->request_method);
         if (ops->answer_preprocess)
                 rc = ops->answer_preprocess(answer, olddata);
@@ -219 +219 @@
         int rc = EOK;
 
-        sysipc_ops_t *ops = sysipc_ops_get(IPC_GET_IMETHOD(call->data));
+        call->request_method = IPC_GET_IMETHOD(call->data);
+
+        sysipc_ops_t *ops = sysipc_ops_get(call->request_method);
         if (ops->request_preprocess)
                 rc = ops->request_preprocess(call, phone);
@@ -262 +264 @@
                 call->buffer = NULL;
         }
+
+        sysipc_ops_t *ops = sysipc_ops_get(call->request_method);
+        if (ops->answer_process)
+                (void) ops->answer_process(call);
 }
 
@@ -278 +284 @@
         int rc = EOK;
 
-        sysipc_ops_t *ops = sysipc_ops_get(IPC_GET_IMETHOD(call->data));
+        sysipc_ops_t *ops = sysipc_ops_get(call->request_method);
         if (ops->request_process)
                 rc = ops->request_process(call, box);