Changeset 06502f7d in mainline

Timestamp:

2006-03-14T09:31:06Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

df50cf6

Parents:

a19bdf8

Message:

Added extended syscalls to ipc to support more arguments.

Files:

• init/init.c (modified) (1 diff)
• libipc/Makefile (modified) (1 diff)
• libipc/generic/ipc.c (modified) (2 diffs)
• libipc/include/ipc.h (modified) (1 diff)
• libipc/include/ns.h (added)

init/init.c

@@ -29 +29 @@
 #include "version.h"
 #include <ipc.h>
+#include <ns.h>
 
 int main(int argc, char *argv[])
 {
-        ipc_data_t ipcdata;
-
         version_print();
 
-        ipc_call_sync(0, 1, 2, &ipcdata);
+        ipc_call_sync_2(PHONE_NS, NS_PING, 2, 0, 0, 0);
         
         return 0;

libipc/Makefile

@@ -55 +55 @@
 
 clean:
-        -rm -f libipcc.a Makefile.depend
+        -rm -f libipc.a Makefile.depend
         find generic/ -name '*.o' -follow -exec rm \{\} \;
 

libipc/generic/ipc.c

@@ -30 +30 @@
 #include <libc.h>
 
-int ipc_call_sync(int phoneid, int arg1, int arg2, ipc_data_t *resdata)
+int ipc_call_sync(int phoneid, sysarg_t method, sysarg_t arg1, 
+                  sysarg_t *result)
 {
-        return __SYSCALL4(SYS_IPC_CALL_SYNC, phoneid, arg1, arg2, 
-                          (sysarg_t)resdata);
+        ipc_data_t resdata;
+        int callres;
+        
+        callres = __SYSCALL4(SYS_IPC_CALL_SYNC, phoneid, method, arg1,
+                             (sysarg_t)&resdata);
+        if (callres)
+                return callres;
+        if (result)
+                *result = IPC_GET_ARG1(resdata);
+        return IPC_GET_RETVAL(resdata);
 }
 
-/*
-int ipc_call_async()
+int ipc_call_sync_3(int phoneid, sysarg_t method, sysarg_t arg1,
+                    sysarg_t arg2, sysarg_t arg3,
+                    sysarg_t *result1, sysarg_t *result2, sysarg_t *result3)
 {
+        ipc_data_t data;
+        int callres;
+
+        IPC_SET_METHOD(data, method);
+        IPC_SET_ARG1(data, arg1);
+        IPC_SET_ARG2(data, arg2);
+        IPC_SET_ARG3(data, arg3);
+
+        callres = __SYSCALL2(SYS_IPC_CALL_SYNC_MEDIUM, phoneid, (sysarg_t)&data);
+        if (callres)
+                return callres;
+
+        if (result1)
+                *result1 = IPC_GET_ARG1(data);
+        if (result2)
+                *result2 = IPC_GET_ARG2(data);
+        if (result3)
+                *result3 = IPC_GET_ARG3(data);
+        return IPC_GET_RETVAL(data);
+}
+
+/** Send asynchronous message
+ *
+ * - if fatal error, call callback handler with proper error code
+ * - if message cannot be temporarily sent, add to queue
+ */
+void ipc_call_async_2(int phoneid, sysarg_t method, sysarg_t arg1,
+                      sysarg_t arg2,
+                      ipc_async_callback_t callback)
+{
+        ipc_callid_t callid;
+        ipc_data_t data; /* Data storage for saving calls */
+
+        callid = __SYSCALL4(SYS_IPC_CALL_ASYNC, phoneid, method, arg1, arg2);
+        if (callid == IPC_CALLRET_FATAL) {
+                /* Call asynchronous handler with error code */
+                IPC_SET_RETVAL(data, IPC_CALLRET_FATAL);
+                callback(&data);
+                return;
+        }
+        if (callid == IPC_CALLRET_TEMPORARY) {
+                /* Add asynchronous call to queue of non-dispatched async calls */
+                IPC_SET_METHOD(data, method);
+                IPC_SET_ARG1(data, arg1);
+                IPC_SET_ARG2(data, arg2);
+                
+                return;
+        }
+        /* Add callid to list of dispatched calls */
         
 }
 
-int ipc_answer()
+
+/** Send answer to a received call */
+void ipc_answer(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1,
+                sysarg_t arg2)
 {
+        __SYSCALL4(SYS_IPC_ANSWER, callid, retval, arg1, arg2);
 }
-*/
+
 
 /** Call syscall function sys_ipc_wait_for_call */
@@ -61 +124 @@
         ipc_callid_t callid;
 
-        callid = _ipc_wait_for_call(data, flags);
-        /* TODO: Handle async replies etc.. */
+        do {
+                /* Try to dispatch non-dispatched async calls */
+                callid = _ipc_wait_for_call(data, flags);
+                if (callid & IPC_CALLID_ANSWERED) {
+                        /* TODO: Call async answer handler */
+                }
+        } while (callid & IPC_CALLID_ANSWERED);
         return callid;
 }

libipc/include/ipc.h

@@ -36 +36 @@
 typedef sysarg_t ipc_callid_t;
 
+typedef void (* ipc_async_callback_t)(ipc_data_t *data);
 
-extern int ipc_call_sync(int phoneid, int arg1, int arg2, ipc_data_t *resdata);
-extern int ipc_wait_for_call(ipc_data_t *data, int flags);
+#define ipc_call_sync_2(phoneid, method, arg1, arg2, res1, res2) ipc_call_sync_3((phoneid), (method), (arg1), (arg2), 0, (res1), (res2), 0)
+extern int ipc_call_sync_3(int phoneid, sysarg_t method, sysarg_t arg1,
+                           sysarg_t arg2, sysarg_t arg3,
+                           sysarg_t *result1, sysarg_t *result2, 
+                           sysarg_t *result3);
 
 
+extern int ipc_call_sync(int phoneid, sysarg_t method, sysarg_t arg1, 
+                         sysarg_t *result);
+extern int ipc_wait_for_call(ipc_data_t *data, int flags);
+extern void ipc_answer(ipc_callid_t callid, sysarg_t retval, sysarg_t arg1,
+                       sysarg_t arg2);
+
+#define ipc_call_async(phoneid,method,arg1,callback) (ipc_call_async_2(phoneid, method, arg1, 0, callback))
+void ipc_call_async_2(int phoneid, sysarg_t method, sysarg_t arg1,
+                      sysarg_t arg2,
+                      ipc_async_callback_t callback);
+
 #endif