Changes in uspace/lib/c/include/ipc/ipc.h [10477601:63f8966] in mainline

File:

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

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

@@ -33 +33 @@
  */
 
-#if ((defined(LIBC_ASYNC_H_)) && (!defined(LIBC_ASYNC_C_)))
-        #error Do not intermix low-level IPC interface and async framework
-#endif
-
-#ifndef LIBC_IPC_H_
-#define LIBC_IPC_H_
-
+#ifndef LIBIPC_IPC_H_
+#define LIBIPC_IPC_H_
+
+#include <task.h>
+#include <kernel/ipc/ipc.h>
+#include <kernel/ddi/irq.h>
 #include <sys/types.h>
-#include <ipc/common.h>
 #include <kernel/synch/synch.h>
-#include <task.h>
-
-typedef void (*ipc_async_callback_t)(void *, int, ipc_call_t *);
+
+#define IPC_FLAG_BLOCKING  0x01
+
+typedef sysarg_t ipcarg_t;
+
+typedef struct {
+        ipcarg_t args[IPC_CALL_LEN];
+        ipcarg_t in_phone_hash;
+} ipc_call_t;
+
+typedef sysarg_t ipc_callid_t;
+
+typedef void (* ipc_async_callback_t)(void *, int, ipc_call_t *);
 
 /*
@@ -53 +61 @@
  * 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)
@@ -176 +183 @@
             (arg4), (arg5), (res1), (res2), (res3), (res4), (res5))
 
-extern int ipc_call_sync_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *);
-
-extern int ipc_call_sync_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *,
-    sysarg_t *);
-
-extern ipc_callid_t ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int);
+extern int ipc_call_sync_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *);
+
+extern int ipc_call_sync_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t, ipcarg_t *, ipcarg_t *, ipcarg_t *, ipcarg_t *,
+    ipcarg_t *);
+
+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 +207 @@
  * to m.
  */
-
 #define ipc_answer_0(callid, retval) \
         ipc_answer_fast((callid), (retval), 0, 0, 0, 0)
@@ -212 +220 @@
         ipc_answer_slow((callid), (retval), (arg1), (arg2), (arg3), (arg4), (arg5))
 
-extern sysarg_t ipc_answer_fast(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t);
-extern sysarg_t ipc_answer_slow(ipc_callid_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, sysarg_t);
+extern ipcarg_t ipc_answer_fast(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t);
+extern ipcarg_t ipc_answer_slow(ipc_callid_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t, ipcarg_t);
 
 /*
@@ -223 +231 @@
  * to m.
  */
-
 #define ipc_call_async_0(phoneid, method, private, callback, can_preempt) \
         ipc_call_async_fast((phoneid), (method), 0, 0, 0, 0, (private), \
@@ -248 +255 @@
             (arg4), (arg5), (private), (callback), (can_preempt))
 
-extern void ipc_call_async_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, void *, ipc_async_callback_t, bool);
-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);
-
+extern void ipc_call_async_fast(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, void *, ipc_async_callback_t, int);
+extern void ipc_call_async_slow(int, ipcarg_t, ipcarg_t, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t, void *, ipc_async_callback_t, int);
+
+extern int ipc_connect_to_me(int, int, int, int, ipcarg_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_register_irq(int, int, int, irq_code_t *);
+extern int ipc_unregister_irq(int, int);
+extern int ipc_forward_fast(ipc_callid_t, int, int, ipcarg_t, ipcarg_t, int);
+extern int ipc_forward_slow(ipc_callid_t, int, int, ipcarg_t, ipcarg_t,
+    ipcarg_t, ipcarg_t, ipcarg_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 +282 @@
         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, ipcarg_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);