Changeset 2c2d54a in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2016-09-02T17:58:05Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c3602c4

Parents:

4bf0926e (diff), 3233adb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/pager

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.
+ *
+ * @return EOK on success.
+ * @return ENOENT if there is no such phone handle.
+ *
+ */
+int ipc_req_internal(int phoneid, ipc_data_t *data)
+{
+        phone_t *phone;
+        if (phone_get(phoneid, &phone) != EOK)
+                return ENOENT;
+        
+        call_t *call = ipc_call_alloc(0);
+        memcpy(call->data.args, data->args, sizeof(data->args));
+        
+        int rc = request_preprocess(call, phone);
+        if (!rc) {
+#ifdef CONFIG_UDEBUG
+                udebug_stoppable_begin();
+#endif
+
+                rc = ipc_call_sync(phone, call); 
+
+#ifdef CONFIG_UDEBUG
+                udebug_stoppable_end();
+#endif
+
+                if (rc != EOK)
+                        return EINTR;
+
+                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;
 }