Changeset 9a1b20c in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2008-09-17T12:16:27Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

fb9b0b0

Parents:

06a195bc

Message:

Merge syscall tracer (trace) and relevant part of udebug interface from tracing to trunk.

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -43 +43 @@
 #include <ipc/irq.h>
 #include <ipc/ipcrsc.h>
+#include <ipc/ipc_kbox.h>
+#include <udebug/udebug_ipc.h>
 #include <arch/interrupt.h>
 #include <print.h>
@@ -296 +298 @@
  *
  * @param call          Call structure with the request.
+ * @param phone         Phone that the call will be sent through.
  *
  * @return              Return 0 on success, ELIMIT or EPERM on error.
  */
-static int request_preprocess(call_t *call)
+static int request_preprocess(call_t *call, phone_t *phone)
 {
         int newphid;
@@ -341 +344 @@
                 }
                 break;
+#ifdef CONFIG_UDEBUG
+        case IPC_M_DEBUG_ALL:
+                return udebug_request_preprocess(call, phone);
+#endif
         default:
                 break;
@@ -370 +377 @@
         if (call->buffer) {
                 /* This must be an affirmative answer to IPC_M_DATA_READ. */
+                /* or IPC_M_DEBUG_ALL/UDEBUG_M_MEM_READ... */
                 uintptr_t dst = IPC_GET_ARG1(call->data);
                 size_t size = IPC_GET_ARG2(call->data);
@@ -400 +408 @@
                 }
                 IPC_SET_ARG5(call->data, phoneid);
-        } 
+        }
+        switch (IPC_GET_METHOD(call->data)) {
+        case IPC_M_DEBUG_ALL:
+                return -1;
+        default:
+                break;
+        }
         return 0;
 }
@@ -442 +456 @@
         IPC_SET_ARG5(call.data, 0);
 
-        if (!(res = request_preprocess(&call))) {
+        if (!(res = request_preprocess(&call, phone))) {
                 rc = ipc_call_sync(phone, &call);
                 if (rc != EOK)
@@ -482 +496 @@
         GET_CHECK_PHONE(phone, phoneid, return ENOENT);
 
-        if (!(res = request_preprocess(&call))) {
+        if (!(res = request_preprocess(&call, phone))) {
                 rc = ipc_call_sync(phone, &call);
                 if (rc != EOK)
@@ -551 +565 @@
         IPC_SET_ARG5(call->data, 0);
 
-        if (!(res = request_preprocess(call)))
+        if (!(res = request_preprocess(call, phone)))
                 ipc_call(phone, call);
         else
@@ -585 +599 @@
                 return (unative_t) rc;
         }
-        if (!(res = request_preprocess(call)))
+        if (!(res = request_preprocess(call, phone)))
                 ipc_call(phone, call);
         else
@@ -869 +883 @@
 }
 
+#include <console/console.h>
+
+/**
+ * Syscall connect to a task by id.
+ *
+ * @return              Phone id on success, or negative error code.
+ */
+unative_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg)
+{
+#ifdef CONFIG_UDEBUG
+        sysarg64_t taskid_arg;
+        int rc;
+        
+        rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t));
+        if (rc != 0)
+                return (unative_t) rc;
+
+        printf("sys_ipc_connect_kbox(%lld, %d)\n", taskid_arg.value);
+
+        return ipc_connect_kbox(taskid_arg.value);
+#else
+        return (unative_t) ENOTSUP;
+#endif
+}
+
 /** @}
  */