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

Timestamp:

2011-01-29T11:35:03Z (14 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/ipc/ipc.h (modified) (2 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_
 
+#include <sys/types.h>
+#include <ipc/common.h>
+#include <kernel/synch/synch.h>
 #include <task.h>
-#include <kernel/ipc/ipc.h>
-#include <kernel/ddi/irq.h>
-#include <sys/types.h>
-#include <kernel/synch/synch.h>
-
-#define IPC_FLAG_BLOCKING  0x01
-
-typedef struct {
-        sysarg_t args[IPC_CALL_LEN];
-        sysarg_t in_task_hash;
-        sysarg_t in_phone_hash;
-} ipc_call_t;
-
-typedef sysarg_t ipc_callid_t;
-
-typedef void (* ipc_async_callback_t)(void *, int, ipc_call_t *);
+
+typedef void (*ipc_async_callback_t)(void *, int, ipc_call_t *);
 
 /*
@@ -263 +256 @@
 extern int ipc_connect_me_to_blocking(int, int, int, int);
 extern int ipc_hangup(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, sysarg_t, sysarg_t, int);
 extern int ipc_forward_slow(ipc_callid_t, int, int, sysarg_t, sysarg_t,