Changeset b74959bd in mainline for uspace/lib/libc/include/ipc/ipc.h

Timestamp:

2007-11-20T21:33:32Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8498915

Parents:

3209923

Message:

Modify ipc_answer_*() to make use of all six syscall arguments. The recommended
means of answering calls is via the ipc_answer_m() macros (where m denotes the
number of return arguments) that automatically decide between the fast register
version or the slow universal version of ipc_answer().

File:

• uspace/lib/libc/include/ipc/ipc.h (modified) (2 diffs)

uspace/lib/libc/include/ipc/ipc.h

@@ -191 +191 @@
 extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *data);
 
-#define ipc_answer_fast_0(callid, retval) \
-    ipc_answer_fast((callid), (retval), 0, 0)
-#define ipc_answer_fast_1(callid, retval, arg1) \
-    ipc_answer_fast((callid), (retval), (arg1), 0)
+/*
+ * User-friendly wrappers for ipc_answer_fast() and ipc_answer_slow().
+ * They are in the form of ipc_answer_m(), where m is the number of return
+ * arguments. The macros decide between the fast and the slow version according
+ * to m.
+ */
+#define ipc_answer_0(callid, retval) \
+    ipc_answer_fast((callid), (retval), 0, 0, 0, 0)
+#define ipc_answer_1(callid, retval, arg1) \
+    ipc_answer_fast((callid), (retval), (arg1), 0, 0, 0)
+#define ipc_answer_2(callid, retval, arg1, arg2) \
+    ipc_answer_fast((callid), (retval), (arg1), (arg2), 0, 0)
+#define ipc_answer_3(callid, retval, arg1, arg2, arg3) \
+    ipc_answer_fast((callid), (retval), (arg1), (arg2), (arg3), 0)
+#define ipc_answer_4(callid, retval, arg1, arg2, arg3, arg4) \
+    ipc_answer_fast((callid), (retval), (arg1), (arg2), (arg3), (arg4))
+#define ipc_answer_5(callid, retval, arg1, arg2, arg3, arg4, arg5) \
+    ipc_answer_slow((callid), (retval), (arg1), (arg2), (arg3), (arg4), (arg5))
+
 extern ipcarg_t ipc_answer_fast(ipc_callid_t callid, ipcarg_t retval,
-    ipcarg_t arg1, ipcarg_t arg2);
-extern ipcarg_t ipc_answer(ipc_callid_t callid, ipc_call_t *call);
+    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4);
+extern ipcarg_t ipc_answer_slow(ipc_callid_t callid, ipcarg_t retval,
+    ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t arg4, ipcarg_t arg5);
 
 /*
@@ -245 +261 @@
     ipcarg_t arg1);
 extern int ipc_data_send(int phoneid, void *src, size_t size);
-extern int ipc_data_receive(ipc_callid_t *callid, ipc_call_t *call, void **dst,
-    size_t *size);
-extern ipcarg_t ipc_data_deliver(ipc_callid_t callid, ipc_call_t *call,
-    void *dst, size_t size);
+extern int ipc_data_receive(ipc_callid_t *callid, void **dst, size_t *size);
+extern ipcarg_t ipc_data_deliver(ipc_callid_t callid, void *dst, size_t size);
 
 #endif