Changeset 631ca4d in mainline for generic/src

Timestamp:

2006-03-13T20:51:35Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

5c089c3a

Parents:

25d7709

Message:

New synchronous ipc.
Widened syscall to support up to 5 parameters.

Location:

generic/src

Files:

• ipc/ipc.c (modified) (2 diffs)
• syscall/syscall.c (modified) (2 diffs)

generic/src/ipc/ipc.c

@@ -106 +106 @@
 }
 
-
-/** Send a request using phone to answerbox
+/** Helper function to facilitate synchronous calls */
+void ipc_call_sync(phone_t *phone, call_t *request)
+{
+        answerbox_t sync_box; 
+
+        ipc_answerbox_init(&sync_box);
+
+        /* We will receive data on special box */
+        request->callerbox = &sync_box;
+
+        ipc_call(phone, request);
+        ipc_wait_for_call(&sync_box, 0);
+}
+
+/** Send a asynchronous request using phone to answerbox
  *
  * @param phone Phone connected to answerbox
@@ -200 +213 @@
                 printf("Received phone call - %P %P\n",
                        call->data[0], call->data[1]);
+                call->data[0] = 0xbabaaaee;;
+                call->data[1] = 0xaaaaeeee;
                 ipc_answer(&TASK->answerbox, call);
                 printf("Call answered.\n");

generic/src/syscall/syscall.c

@@ -56 +56 @@
 }
 
-/** Send a call over syscall
+/** Send a call over IPC, wait for reply, return to user
  *
  * @return Call identification, returns -1 on fatal error, 
            -2 on 'Too many async request, handle answers first
  */
-static __native sys_ipc_call(__native phoneid, __native arg1, __native arg2)
+static __native sys_ipc_call_sync(__native phoneid, __native arg1, 
+                                   __native arg2, __native *respdata)
+{
+        call_t *call;
+        phone_t *phone;
+        /* Special answerbox for synchronous messages */
+
+        if (phoneid >= IPC_MAX_PHONES)
+                return -ENOENT;
+
+        phone = &TASK->phones[phoneid];
+        if (!phone->callee)
+                return -ENOENT;
+
+        call = ipc_call_alloc();
+        call->data[0] = arg1;
+        call->data[1] = arg2;
+        
+        ipc_call_sync(phone, call);
+
+        copy_to_uspace(respdata, &call->data, sizeof(__native) * IPC_CALL_LEN);
+
+        return 0;
+}
+
+/** Send an asynchronous call over ipc
+ *
+ * @return Call identification, returns -1 on fatal error, 
+           -2 on 'Too many async request, handle answers first
+ */
+static __native sys_ipc_call_async(__native phoneid, __native arg1, 
+                                   __native arg2)
 {
         call_t *call;
@@ -125 +156 @@
         sys_ctl,
         sys_io,
-        sys_ipc_call,
+        sys_ipc_call_sync,
+        sys_ipc_call_async,
         sys_ipc_answer,
         sys_ipc_wait_for_call