Changeset bd5a663 in mainline for generic/include/ipc

Timestamp:

2006-05-17T14:03:44Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

59477e3

Parents:

bdb9ea8

Message:

Modify ipc_wait_for_call() to support all of blocking, non-blocking and timeout operation.

Location:

generic/include/ipc

Files:

• ipc.h (modified) (3 diffs)
• sysipc.h (modified) (2 diffs)

generic/include/ipc/ipc.h

@@ -45 +45 @@
 #define IPC_CALL_CONN_ME_TO     (1<<4) /* Identify connect_me_to */
 #define IPC_CALL_NOTIF          (1<<5) /* Interrupt notification */
-
-/* Flags for ipc_wait_for_call */
-#define IPC_WAIT_NONBLOCKING   1
 
 /* Flags of callid (the addresses are aligned at least to 4, 
@@ -201 +198 @@
 
 extern void ipc_init(void);
-extern call_t * ipc_wait_for_call(answerbox_t *box, int flags);
+extern call_t * ipc_wait_for_call(answerbox_t *box, __u32 usec, int nonblocking);
 extern void ipc_answer(answerbox_t *box, call_t *request);
 extern int ipc_call(phone_t *phone, call_t *call);
@@ -217 +214 @@
 extern void ipc_backsend_err(phone_t *phone, call_t *call, __native err);
 
-
 extern answerbox_t *ipc_phone_0;
 

generic/include/ipc/sysipc.h

@@ -32 +32 @@
 #include <ipc/ipc.h>
 #include <ipc/irq.h>
+#include <arch/types.h>
 
 __native sys_ipc_call_sync_fast(__native phoneid, __native method, 
@@ -43 +44 @@
                              __native arg1, __native arg2);
 __native sys_ipc_answer(__native callid, ipc_data_t *data);
-__native sys_ipc_wait_for_call(ipc_data_t *calldata, __native flags);
+__native sys_ipc_wait_for_call(ipc_data_t *calldata, __u32 usec, int nonblocking);
 __native sys_ipc_forward_fast(__native callid, __native phoneid,
                               __native method, __native arg1);