Changes in kernel/generic/src/ipc/sysipc.c [09024119:ae66564] in mainline

File:

• kernel/generic/src/ipc/sysipc.c (modified) (3 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -106 +106 @@
 {
         switch (imethod) {
+        case IPC_M_PAGE_IN:
         case IPC_M_SHARE_OUT:
         case IPC_M_SHARE_IN:
@@ -137 +138 @@
         case IPC_M_CONNECT_TO_ME:
         case IPC_M_CONNECT_ME_TO:
+        case IPC_M_PAGE_IN:
         case IPC_M_SHARE_OUT:
         case IPC_M_SHARE_IN:
@@ -257 +259 @@
 {
         return SYSIPC_OP(request_process, call, box);
+}
+
+/** Make a call over IPC and wait for reply.
+ *
+ * @param phoneid     Phone handle for the call.
+ * @param data[inout] Structure with request/reply data.
+ * @param priv        Value to be stored in call->priv.
+ *
+ * @return EOK on success.
+ * @return ENOENT if there is no such phone handle.
+ *
+ */
+int ipc_req_internal(int phoneid, ipc_data_t *data, sysarg_t priv)
+{
+        phone_t *phone;
+        if (phone_get(phoneid, &phone) != EOK)
+                return ENOENT;
+        
+        call_t *call = ipc_call_alloc(0);
+        call->priv = priv;
+        memcpy(call->data.args, data->args, sizeof(data->args));
+        
+        int rc = request_preprocess(call, phone);
+        if (!rc) {
+#ifdef CONFIG_UDEBUG
+                udebug_stoppable_begin();
+#endif
+
+                ipc_call_hold(call);
+                rc = ipc_call_sync(phone, call);
+                spinlock_lock(&call->forget_lock);
+                bool forgotten = call->forget;
+                spinlock_unlock(&call->forget_lock);
+                ipc_call_release(call);
+
+#ifdef CONFIG_UDEBUG
+                udebug_stoppable_end();
+#endif
+
+                if (rc != EOK) {
+                        if (!forgotten) {
+                                /*
+                                 * There was an error, but it did not result
+                                 * in the call being forgotten. In fact, the
+                                 * call was not even sent. We are still
+                                 * its owners and are responsible for its
+                                 * deallocation.
+                                 */
+                                ipc_call_free(call);
+                        } else {
+                                /*
+                                 * The call was forgotten and it changed hands.
+                                 * We are no longer expected to free it.
+                                 */
+                                ASSERT(rc == EINTR);
+                        }
+                        return rc;      
+                }
+
+                process_answer(call);
+        } else
+                IPC_SET_RETVAL(call->data, rc);
+        
+        memcpy(data->args, call->data.args, sizeof(data->args));
+        ipc_call_free(call);
+        
+        return EOK;
 }