Changeset 64d2b10 in mainline for uspace/lib/c/include/async.h

Timestamp:

2011-01-29T11:35:03Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ffa2c8ef

Parents:

2c577e0b

Message:

libc: do not intermix low-level IPC methods with async framework methods

File:

• uspace/lib/c/include/async.h (modified) (8 diffs)

uspace/lib/c/include/async.h

@@ -33 +33 @@
  */
 
+#if ((defined(LIBC_IPC_H_)) && (!defined(LIBC_ASYNC_C_)))
+        #error Do not intermix low-level IPC interface and async framework
+#endif
+
 #ifndef LIBC_ASYNC_H_
 #define LIBC_ASYNC_H_
 
-#include <ipc/ipc.h>
+#include <ipc/common.h>
 #include <async_sess.h>
 #include <fibril.h>
@@ -42 +46 @@
 #include <atomic.h>
 #include <bool.h>
+#include <task.h>
 
 typedef ipc_callid_t aid_t;
@@ -49 +54 @@
 
 typedef void (*async_client_conn_t)(ipc_callid_t, ipc_call_t *);
-
-extern atomic_t async_futex;
 
 extern atomic_t threads_in_ipc_wait;
@@ -110 +113 @@
 extern void async_set_interrupt_received(async_client_conn_t);
 
-/* Wrappers for simple communication */
-#define async_msg_0(phone, method) \
-        ipc_call_async_0((phone), (method), NULL, NULL, true)
-#define async_msg_1(phone, method, arg1) \
-        ipc_call_async_1((phone), (method), (arg1), NULL, NULL, \
-            true)
-#define async_msg_2(phone, method, arg1, arg2) \
-        ipc_call_async_2((phone), (method), (arg1), (arg2), NULL, NULL, \
-            true)
-#define async_msg_3(phone, method, arg1, arg2, arg3) \
-        ipc_call_async_3((phone), (method), (arg1), (arg2), (arg3), NULL, NULL, \
-            true)
-#define async_msg_4(phone, method, arg1, arg2, arg3, arg4) \
-        ipc_call_async_4((phone), (method), (arg1), (arg2), (arg3), (arg4), NULL, \
-            NULL, true)
-#define async_msg_5(phone, method, arg1, arg2, arg3, arg4, arg5) \
-        ipc_call_async_5((phone), (method), (arg1), (arg2), (arg3), (arg4), \
-            (arg5), NULL, NULL, true)
+/*
+ * Wrappers for simple communication.
+ */
+
+extern void async_msg_0(int, sysarg_t);
+extern void async_msg_1(int, sysarg_t, sysarg_t);
+extern void async_msg_2(int, sysarg_t, sysarg_t, sysarg_t);
+extern void async_msg_3(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t);
+extern void async_msg_4(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t);
+extern void async_msg_5(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t);
+
+/*
+ * Wrappers for answer routines.
+ */
+
+extern sysarg_t async_answer_0(ipc_callid_t, sysarg_t);
+extern sysarg_t async_answer_1(ipc_callid_t, sysarg_t, sysarg_t);
+extern sysarg_t async_answer_2(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t);
+extern sysarg_t async_answer_3(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t);
+extern sysarg_t async_answer_4(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t);
+extern sysarg_t async_answer_5(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t);
+
+/*
+ * Wrappers for forwarding routines.
+ */
+
+extern int async_forward_fast(ipc_callid_t, int, int, sysarg_t, sysarg_t, int);
+extern int async_forward_slow(ipc_callid_t, int, int, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t, int);
 
 /*
@@ -135 +153 @@
  * and slow verion based on m.
  */
+
 #define async_req_0_0(phoneid, method) \
         async_req_fast((phoneid), (method), 0, 0, 0, 0, NULL, NULL, NULL, NULL, \
@@ -270 +289 @@
 extern int async_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t);
 extern int async_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t);
+extern int async_connect_kbox(task_id_t);
+extern int async_hangup(int);
+extern void async_poke(void);
 
 /*
  * User-friendly wrappers for async_share_in_start().
  */
+
 #define async_share_in_start_0_0(phoneid, dst, size) \
         async_share_in_start((phoneid), (dst), (size), 0, NULL)
@@ -293 +316 @@
  * User-friendly wrappers for async_data_read_forward_fast().
  */
+
 #define async_data_read_forward_0_0(phoneid, method, answer) \
         async_data_read_forward_fast((phoneid), (method), 0, 0, 0, 0, NULL)
@@ -329 +353 @@
  * User-friendly wrappers for async_data_write_forward_fast().
  */
+
 #define async_data_write_forward_0_0(phoneid, method, answer) \
         async_data_write_forward_fast((phoneid), (method), 0, 0, 0, 0, NULL)