Changeset d73942c in mainline

Timestamp:

2006-03-15T11:45:03Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

55cff86

Parents:

936351c1

Message:

Added support for taskid source identification.

Location:

libipc

Files:

• generic/ipc.c (modified) (5 diffs)
• include/ipc.h (modified) (2 diffs)

libipc/generic/ipc.c

@@ -83 +83 @@
         IPC_SET_ARG3(data, arg3);
 
-        callres = __SYSCALL2(SYS_IPC_CALL_SYNC, phoneid, (sysarg_t)&data);
+        callres = __SYSCALL3(SYS_IPC_CALL_SYNC, phoneid, (sysarg_t)&data,
+                             (sysarg_t)&data);
         if (callres)
                 return callres;
@@ -122 +123 @@
         if (callid == IPC_CALLRET_FATAL) {
                 /* Call asynchronous handler with error code */
-                IPC_SET_RETVAL(call->u.msg.data, ENOENT);
                 callback(private, ENOENT, NULL);
                 free(call);
@@ -151 +151 @@
                 ipcarg_t arg2)
 {
-        __SYSCALL4(SYS_IPC_ANSWER, callid, retval, arg1, arg2);
+        __SYSCALL4(SYS_IPC_ANSWER_FAST, callid, retval, arg1, arg2);
 }
 
 
 /** Call syscall function sys_ipc_wait_for_call */
-static inline ipc_callid_t _ipc_wait_for_call(ipc_data_t *data, int flags)
-{
-        return __SYSCALL2(SYS_IPC_WAIT, (sysarg_t)data, flags);
+static inline ipc_callid_t _ipc_wait_for_call(ipc_call_t *call, int flags)
+{
+        return __SYSCALL3(SYS_IPC_WAIT, (sysarg_t)&call->data, 
+                          (sysarg_t)&call->taskid, flags);
 }
 
@@ -221 +222 @@
  *         IPC_WAIT_NONBLOCKING
  */
-int ipc_wait_for_call(ipc_data_t *data, int flags)
+int ipc_wait_for_call(ipc_call_t *call, int flags)
 {
         ipc_callid_t callid;
@@ -228 +229 @@
                 try_dispatch_queued_calls();
 
-                callid = _ipc_wait_for_call(data, flags);
+                callid = _ipc_wait_for_call(call, flags);
                 /* Handle received answers */
                 if (callid & IPC_CALLID_ANSWERED)
-                        handle_answer(callid, data);
+                        handle_answer(callid, &call->data);
         } while (callid & IPC_CALLID_ANSWERED);
 

libipc/include/ipc.h

@@ -32 +32 @@
 #include <kernel/ipc/ipc.h>
 #include <libc.h>
+#include <types.h>
 
 typedef sysarg_t ipcarg_t;
-typedef ipcarg_t ipc_data_t[IPC_CALL_LEN];
+typedef sysarg_t ipc_data_t[IPC_CALL_LEN];
+typedef struct {
+        unsigned long long taskid;
+        ipc_data_t data;
+}ipc_call_t;
 typedef sysarg_t ipc_callid_t;
 
@@ -50 +55 @@
 extern int ipc_call_sync(int phoneid, ipcarg_t method, ipcarg_t arg1, 
                          ipcarg_t *result);
-extern int ipc_wait_for_call(ipc_data_t *data, int flags);
+extern int ipc_wait_for_call(ipc_call_t *data, int flags);
 extern void ipc_answer(ipc_callid_t callid, ipcarg_t retval, ipcarg_t arg1,
                        ipcarg_t arg2);