Changes in uspace/lib/c/include/ipc/ipc.h [10477601:64d2b10] in mainline

File:

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

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

@@ -53 +53 @@
  * possible, the fast version is used.
  */
-
 #define ipc_call_sync_0_0(phoneid, method) \
         ipc_call_sync_fast((phoneid), (method), 0, 0, 0, 0, 0, 0, 0, 0)
@@ -183 +182 @@
     sysarg_t *);
 
-extern ipc_callid_t ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int);
+extern ipc_callid_t ipc_wait_cycle(ipc_call_t *, uint32_t, int);
+extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *, uint32_t);
 extern void ipc_poke(void);
 
-#define ipc_wait_for_call(data) \
-        ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT);
-
-extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *, sysarg_t);
+static inline ipc_callid_t ipc_wait_for_call(ipc_call_t *data)
+{
+        return ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT);
+}
+
 extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *);
 
@@ -198 +199 @@
  * to m.
  */
-
 #define ipc_answer_0(callid, retval) \
         ipc_answer_fast((callid), (retval), 0, 0, 0, 0)
@@ -223 +223 @@
  * to m.
  */
-
 #define ipc_call_async_0(phoneid, method, private, callback, can_preempt) \
         ipc_call_async_fast((phoneid), (method), 0, 0, 0, 0, (private), \
@@ -249 +248 @@
 
 extern void ipc_call_async_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, void *, ipc_async_callback_t, bool);
+    sysarg_t, void *, ipc_async_callback_t, int);
 extern void ipc_call_async_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, void *, ipc_async_callback_t, bool);
-
-extern int ipc_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t *,
-    sysarg_t *);
-extern int ipc_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t);
-extern int ipc_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t);
-
+    sysarg_t, sysarg_t, void *, ipc_async_callback_t, int);
+
+extern int ipc_connect_to_me(int, int, int, int, sysarg_t *, sysarg_t *);
+extern int ipc_connect_me_to(int, int, int, int);
+extern int ipc_connect_me_to_blocking(int, int, int, int);
 extern int ipc_hangup(int);
-
-extern int ipc_forward_fast(ipc_callid_t, int, sysarg_t, sysarg_t, sysarg_t,
-    unsigned int);
-extern int ipc_forward_slow(ipc_callid_t, int, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, sysarg_t, unsigned int);
+extern int ipc_forward_fast(ipc_callid_t, int, int, sysarg_t, sysarg_t, int);
+extern int ipc_forward_slow(ipc_callid_t, int, int, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t, int);
 
 /*
  * User-friendly wrappers for ipc_share_in_start().
  */
-
 #define ipc_share_in_start_0_0(phoneid, dst, size) \
         ipc_share_in_start((phoneid), (dst), (size), 0, NULL)
@@ -278 +272 @@
         ipc_share_in_start((phoneid), (dst), (size), (arg), (flags))
 
-extern int ipc_share_in_start(int, void *, size_t, sysarg_t, unsigned int *);
-extern int ipc_share_in_finalize(ipc_callid_t, void *, unsigned int);
-extern int ipc_share_out_start(int, void *, unsigned int);
+extern int ipc_share_in_start(int, void *, size_t, sysarg_t, int *);
+extern int ipc_share_in_finalize(ipc_callid_t, void *, int );
+extern int ipc_share_out_start(int, void *, int);
 extern int ipc_share_out_finalize(ipc_callid_t, void *);
 extern int ipc_data_read_start(int, void *, size_t);