Changeset d054ad3 in mainline for uspace/lib/c/include/ipc/ipc.h

Timestamp:

2018-07-09T18:36:33Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

2d56e2e

Parents:

87337dc5

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-05 16:39:15)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-09 18:36:33)

Message:

Remove the obsolete callback abstraction from low level IPC.

File:

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

uspace/lib/c/include/ipc/ipc.h

@@ -46 +46 @@
 #include <abi/cap.h>
 
-typedef void (*ipc_async_callback_t)(void *, errno_t, ipc_call_t *);
-
-extern errno_t ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int);
+extern errno_t ipc_wait(ipc_call_t *, sysarg_t, unsigned int);
 extern void ipc_poke(void);
-
-#define ipc_wait_for_call(data) \
-        ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT);
-
-extern errno_t ipc_wait_for_call_timeout(ipc_call_t *, sysarg_t);
-extern errno_t ipc_trywait_for_call(ipc_call_t *);
 
 /*
@@ -90 +82 @@
  */
 
-#define ipc_call_async_0(phandle, method, private, callback) \
-        ipc_call_async_fast((phandle), (method), 0, 0, 0, (private), (callback))
-#define ipc_call_async_1(phandle, method, arg1, private, callback) \
-        ipc_call_async_fast((phandle), (method), (arg1), 0, 0, (private), \
-            (callback))
-#define ipc_call_async_2(phandle, method, arg1, arg2, private, callback) \
-        ipc_call_async_fast((phandle), (method), (arg1), (arg2), 0, \
-            (private), (callback))
-#define ipc_call_async_3(phandle, method, arg1, arg2, arg3, private, callback) \
+#define ipc_call_async_0(phandle, method, label) \
+        ipc_call_async_fast((phandle), (method), 0, 0, 0, (label))
+#define ipc_call_async_1(phandle, method, arg1, label) \
+        ipc_call_async_fast((phandle), (method), (arg1), 0, 0, (label))
+#define ipc_call_async_2(phandle, method, arg1, arg2, label) \
+        ipc_call_async_fast((phandle), (method), (arg1), (arg2), 0, (label))
+#define ipc_call_async_3(phandle, method, arg1, arg2, arg3, label) \
         ipc_call_async_fast((phandle), (method), (arg1), (arg2), (arg3), \
-            (private), (callback))
-#define ipc_call_async_4(phandle, method, arg1, arg2, arg3, arg4, private, \
-    callback) \
+            (label))
+#define ipc_call_async_4(phandle, method, arg1, arg2, arg3, arg4, label) \
         ipc_call_async_slow((phandle), (method), (arg1), (arg2), (arg3), \
-            (arg4), 0, (private), (callback))
+            (arg4), 0, (label))
 #define ipc_call_async_5(phandle, method, arg1, arg2, arg3, arg4, arg5, \
-    private, callback) \
+    label) \
         ipc_call_async_slow((phandle), (method), (arg1), (arg2), (arg3), \
-            (arg4), (arg5), (private), (callback))
+            (arg4), (arg5), (label))
 
-extern void ipc_call_async_fast(cap_phone_handle_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, void *, ipc_async_callback_t);
-extern void ipc_call_async_slow(cap_phone_handle_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, sysarg_t, sysarg_t, void *, ipc_async_callback_t);
+extern errno_t ipc_call_async_fast(cap_phone_handle_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, void *);
+extern errno_t ipc_call_async_slow(cap_phone_handle_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t, sysarg_t, void *);
 
 extern errno_t ipc_hangup(cap_phone_handle_t);