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

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

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

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

@@ -46 +46 @@
 #include <abi/cap.h>
 
-typedef void (*ipc_async_callback_t)(void *, int, ipc_call_t *);
+typedef void (*ipc_async_callback_t)(void *, errno_t, ipc_call_t *);
 
-extern int ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int);
+extern errno_t ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int);
 extern void ipc_poke(void);
 
@@ -54 +54 @@
         ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT);
 
-extern int ipc_wait_for_call_timeout(ipc_call_t *, sysarg_t);
-extern int ipc_trywait_for_call(ipc_call_t *);
+extern errno_t ipc_wait_for_call_timeout(ipc_call_t *, sysarg_t);
+extern errno_t ipc_trywait_for_call(ipc_call_t *);
 
 /*
@@ -78 +78 @@
             (arg5))
 
-extern int ipc_answer_fast(cap_handle_t, int, sysarg_t, sysarg_t,
+extern errno_t ipc_answer_fast(cap_handle_t, errno_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t);
-extern int ipc_answer_slow(cap_handle_t, int, sysarg_t, sysarg_t,
+extern errno_t ipc_answer_slow(cap_handle_t, errno_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t);
 
@@ -115 +115 @@
     sysarg_t, sysarg_t, sysarg_t, void *, ipc_async_callback_t);
 
-extern int ipc_hangup(cap_handle_t);
+extern errno_t ipc_hangup(cap_handle_t);
 
-extern int ipc_forward_fast(cap_handle_t, cap_handle_t, sysarg_t, sysarg_t,
+extern errno_t ipc_forward_fast(cap_handle_t, cap_handle_t, sysarg_t, sysarg_t,
     sysarg_t, unsigned int);
-extern int ipc_forward_slow(cap_handle_t, cap_handle_t, sysarg_t, sysarg_t,
+extern errno_t ipc_forward_slow(cap_handle_t, cap_handle_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t, sysarg_t, unsigned int);
 
-extern int ipc_connect_kbox(task_id_t, cap_handle_t *);
+extern errno_t ipc_connect_kbox(task_id_t, cap_handle_t *);
 
 #endif