Changeset 13dbaa8c in mainline

Timestamp:

2012-08-21T21:37:54Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b1e6269

Parents:

1b186ed

Message:

Factor out dealing with call→buffer from process_answer() to
respective IPC_M_CONNECT_ME_TO and IPC_M_DEBUG ops routines.

Location:

kernel/generic/src/ipc

Files:

• ops/dataread.c (modified) (1 diff)
• ops/debug.c (modified) (2 diffs)
• sysipc.c (modified) (1 diff)

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

@@ -91 +91 @@
 }
 
+static int answer_process(call_t *answer)
+{
+        if (answer->buffer) {
+                uintptr_t dst = IPC_GET_ARG1(answer->data);
+                size_t size = IPC_GET_ARG2(answer->data);
+                int rc;
+
+                rc = copy_to_uspace((void *) dst, answer->buffer, size);
+                if (rc)
+                        IPC_SET_RETVAL(answer->data, rc);
+        }
+
+        return EOK;
+}
+
 sysipc_ops_t ipc_m_data_read_ops = {
         .request_preprocess = request_preprocess,
         .request_process = null_request_process,
         .answer_preprocess = answer_preprocess,
-        .answer_process = null_answer_process,
+        .answer_process = answer_process,
 };
 

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

@@ -36 +36 @@
 #include <ipc/ipc.h>
 #include <udebug/udebug_ipc.h>
+#include <syscall/copy.h>
+#include <abi/errno.h>
 
 static int request_process(call_t *call, answerbox_t *box)
 {
         return -1;
+}
+
+static int answer_process(call_t *answer)
+{
+        if (answer->buffer) {
+                uintptr_t dst = IPC_GET_ARG1(answer->data);
+                size_t size = IPC_GET_ARG2(answer->data);
+                int rc;
+
+                rc = copy_to_uspace((void *) dst, answer->buffer, size);
+                if (rc)
+                        IPC_SET_RETVAL(answer->data, rc);
+        }
+
+        return EOK;
 }
 
@@ -50 +67 @@
         .request_process = request_process,
         .answer_preprocess = null_answer_preprocess,
-        .answer_process = null_answer_process,
+        .answer_process = answer_process,
 };
 

kernel/generic/src/ipc/sysipc.c

@@ -243 +243 @@
                 IPC_SET_RETVAL(call->data, EFORWARD);
         
-        if (call->buffer) {
-                /*
-                 * This must be an affirmative answer to IPC_M_DATA_READ
-                 * or IPC_M_DEBUG/UDEBUG_M_MEM_READ...
-                 *
-                 */
-                uintptr_t dst = IPC_GET_ARG1(call->data);
-                size_t size = IPC_GET_ARG2(call->data);
-                int rc = copy_to_uspace((void *) dst, call->buffer, size);
-                if (rc)
-                        IPC_SET_RETVAL(call->data, rc);
-                free(call->buffer);
-                call->buffer = NULL;
-        }
-
         sysipc_ops_t *ops = sysipc_ops_get(call->request_method);
         if (ops->answer_process)