Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/async.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -41,6 +41,6 @@ #include -#include #include +#include #include #include @@ -55,4 +55,76 @@ typedef void (*async_client_conn_t)(ipc_callid_t, ipc_call_t *); +/** Exchange management style + * + */ +typedef enum { + /** No explicit exchange management + * + * Suitable for protocols which use a single + * IPC message per exchange only. + * + */ + EXCHANGE_ATOMIC = 0, + + /** Exchange management via phone cloning + * + * Suitable for servers which support client + * data tracking by task hashes and do not + * mind cloned phones. + * + */ + EXCHANGE_PARALLEL, + + /** Exchange management via mutual exclusion + * + * Suitable for any kind of client/server communication, + * but can limit parallelism. + * + */ + EXCHANGE_SERIALIZE +} exch_mgmt_t; + +/** Session data */ +typedef struct { + /** List of inactive exchanges */ + link_t exch_list; + + /** Exchange management style */ + exch_mgmt_t mgmt; + + /** Session identification */ + int phone; + + /** First clone connection argument */ + sysarg_t arg1; + + /** Second clone connection argument */ + sysarg_t arg2; + + /** Third clone connection argument */ + sysarg_t arg3; + + /** Exchange mutex */ + fibril_mutex_t mutex; + + /** Number of opened exchanges */ + atomic_t refcnt; +} async_sess_t; + +/** Exchange data */ +typedef struct { + /** Link into list of inactive exchanges */ + link_t sess_link; + + /** Link into global list of inactive exchanges */ + link_t global_link; + + /** Session pointer */ + async_sess_t *sess; + + /** Exchange identification */ + int phone; +} async_exch_t; + extern atomic_t threads_in_ipc_wait; @@ -68,32 +140,32 @@ * User-friendly wrappers for async_send_fast() and async_send_slow(). The * macros are in the form async_send_m(), where m denotes the number of payload - * arguments. Each macros chooses between the fast and the slow version based + * arguments. Each macros chooses between the fast and the slow version based * on m. */ -#define async_send_0(phoneid, method, dataptr) \ - async_send_fast((phoneid), (method), 0, 0, 0, 0, (dataptr)) -#define async_send_1(phoneid, method, arg1, dataptr) \ - async_send_fast((phoneid), (method), (arg1), 0, 0, 0, (dataptr)) -#define async_send_2(phoneid, method, arg1, arg2, dataptr) \ - async_send_fast((phoneid), (method), (arg1), (arg2), 0, 0, (dataptr)) -#define async_send_3(phoneid, method, arg1, arg2, arg3, dataptr) \ - async_send_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (dataptr)) -#define async_send_4(phoneid, method, arg1, arg2, arg3, arg4, dataptr) \ - async_send_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (dataptr)) -#define async_send_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, dataptr) \ - async_send_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (dataptr)) - -extern aid_t async_send_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, - sysarg_t, ipc_call_t *); -extern aid_t async_send_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, +#define async_send_0(exch, method, dataptr) \ + async_send_fast(exch, method, 0, 0, 0, 0, dataptr) +#define async_send_1(exch, method, arg1, dataptr) \ + async_send_fast(exch, method, arg1, 0, 0, 0, dataptr) +#define async_send_2(exch, method, arg1, arg2, dataptr) \ + async_send_fast(exch, method, arg1, arg2, 0, 0, dataptr) +#define async_send_3(exch, method, arg1, arg2, arg3, dataptr) \ + async_send_fast(exch, method, arg1, arg2, arg3, 0, dataptr) +#define async_send_4(exch, method, arg1, arg2, arg3, arg4, dataptr) \ + async_send_fast(exch, method, arg1, arg2, arg3, arg4, dataptr) +#define async_send_5(exch, method, arg1, arg2, arg3, arg4, arg5, dataptr) \ + async_send_slow(exch, method, arg1, arg2, arg3, arg4, arg5, dataptr) + +extern aid_t async_send_fast(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, ipc_call_t *); +extern aid_t async_send_slow(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, ipc_call_t *); + extern void async_wait_for(aid_t, sysarg_t *); extern int async_wait_timeout(aid_t, sysarg_t *, suseconds_t); extern fid_t async_new_connection(sysarg_t, sysarg_t, ipc_callid_t, - ipc_call_t *, void (*)(ipc_callid_t, ipc_call_t *)); + ipc_call_t *, async_client_conn_t); + extern void async_usleep(suseconds_t); extern void async_create_manager(void); @@ -102,6 +174,5 @@ extern void async_set_client_data_constructor(async_client_data_ctor_t); extern void async_set_client_data_destructor(async_client_data_dtor_t); - -extern void *async_client_data_get(void); +extern void *async_get_client_data(void); extern void async_set_client_connection(async_client_conn_t); @@ -112,11 +183,12 @@ */ -extern void async_msg_0(int, sysarg_t); -extern void async_msg_1(int, sysarg_t, sysarg_t); -extern void async_msg_2(int, sysarg_t, sysarg_t, sysarg_t); -extern void async_msg_3(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t); -extern void async_msg_4(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t); -extern void async_msg_5(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, +extern void async_msg_0(async_exch_t *, sysarg_t); +extern void async_msg_1(async_exch_t *, sysarg_t, sysarg_t); +extern void async_msg_2(async_exch_t *, sysarg_t, sysarg_t, sysarg_t); +extern void async_msg_3(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t); +extern void async_msg_4(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t); +extern void async_msg_5(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t); /* @@ -138,8 +210,8 @@ */ -extern int async_forward_fast(ipc_callid_t, int, sysarg_t, sysarg_t, sysarg_t, - unsigned int); -extern int async_forward_slow(ipc_callid_t, int, sysarg_t, sysarg_t, sysarg_t, - sysarg_t, sysarg_t, sysarg_t, unsigned int); +extern int async_forward_fast(ipc_callid_t, async_exch_t *, sysarg_t, sysarg_t, + sysarg_t, unsigned int); +extern int async_forward_slow(ipc_callid_t, async_exch_t *, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, sysarg_t, unsigned int); /* @@ -150,161 +222,160 @@ */ -#define async_req_0_0(phoneid, method) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, NULL, NULL, NULL, NULL, \ - NULL) -#define async_req_0_1(phoneid, method, r1) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), NULL, NULL, NULL, \ - NULL) -#define async_req_0_2(phoneid, method, r1, r2) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), NULL, NULL, \ - NULL) -#define async_req_0_3(phoneid, method, r1, r2, r3) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), NULL, \ - NULL) -#define async_req_0_4(phoneid, method, r1, r2, r3, r4) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), (r4), \ - NULL) -#define async_req_0_5(phoneid, method, r1, r2, r3, r4, r5) \ - async_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), (r4), \ - (r5)) -#define async_req_1_0(phoneid, method, arg1) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, NULL, NULL, NULL, \ - NULL, NULL) -#define async_req_1_1(phoneid, method, arg1, rc1) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), NULL, NULL, \ - NULL, NULL) -#define async_req_1_2(phoneid, method, arg1, rc1, rc2) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), NULL, \ - NULL, NULL) -#define async_req_1_3(phoneid, method, arg1, rc1, rc2, rc3) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \ - NULL, NULL) -#define async_req_1_4(phoneid, method, arg1, rc1, rc2, rc3, rc4) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \ - (rc4), NULL) -#define async_req_1_5(phoneid, method, arg1, rc1, rc2, rc3, rc4, rc5) \ - async_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \ - (rc4), (rc5)) -#define async_req_2_0(phoneid, method, arg1, arg2) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, NULL, NULL, \ +#define async_req_0_0(exch, method) \ + async_req_fast(exch, method, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL) +#define async_req_0_1(exch, method, r1) \ + async_req_fast(exch, method, 0, 0, 0, 0, r1, NULL, NULL, NULL, NULL) +#define async_req_0_2(exch, method, r1, r2) \ + async_req_fast(exch, method, 0, 0, 0, 0, r1, r2, NULL, NULL, NULL) +#define async_req_0_3(exch, method, r1, r2, r3) \ + async_req_fast(exch, method, 0, 0, 0, 0, r1, r2, r3, NULL, NULL) +#define async_req_0_4(exch, method, r1, r2, r3, r4) \ + async_req_fast(exch, method, 0, 0, 0, 0, r1, r2, r3, r4, NULL) +#define async_req_0_5(exch, method, r1, r2, r3, r4, r5) \ + async_req_fast(exch, method, 0, 0, 0, 0, r1, r2, r3, r4, r5) + +#define async_req_1_0(exch, method, arg1) \ + async_req_fast(exch, method, arg1, 0, 0, 0, NULL, NULL, NULL, NULL, \ + NULL) +#define async_req_1_1(exch, method, arg1, rc1) \ + async_req_fast(exch, method, arg1, 0, 0, 0, rc1, NULL, NULL, NULL, \ + NULL) +#define async_req_1_2(exch, method, arg1, rc1, rc2) \ + async_req_fast(exch, method, arg1, 0, 0, 0, rc1, rc2, NULL, NULL, \ + NULL) +#define async_req_1_3(exch, method, arg1, rc1, rc2, rc3) \ + async_req_fast(exch, method, arg1, 0, 0, 0, rc1, rc2, rc3, NULL, \ + NULL) +#define async_req_1_4(exch, method, arg1, rc1, rc2, rc3, rc4) \ + async_req_fast(exch, method, arg1, 0, 0, 0, rc1, rc2, rc3, rc4, \ + NULL) +#define async_req_1_5(exch, method, arg1, rc1, rc2, rc3, rc4, rc5) \ + async_req_fast(exch, method, arg1, 0, 0, 0, rc1, rc2, rc3, rc4, \ + rc5) + +#define async_req_2_0(exch, method, arg1, arg2) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, NULL, NULL, NULL, \ + NULL, NULL) +#define async_req_2_1(exch, method, arg1, arg2, rc1) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, rc1, NULL, NULL, \ + NULL, NULL) +#define async_req_2_2(exch, method, arg1, arg2, rc1, rc2) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, rc1, rc2, NULL, NULL, \ + NULL) +#define async_req_2_3(exch, method, arg1, arg2, rc1, rc2, rc3) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, rc1, rc2, rc3, NULL, \ + NULL) +#define async_req_2_4(exch, method, arg1, arg2, rc1, rc2, rc3, rc4) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, rc1, rc2, rc3, rc4, \ + NULL) +#define async_req_2_5(exch, method, arg1, arg2, rc1, rc2, rc3, rc4, rc5) \ + async_req_fast(exch, method, arg1, arg2, 0, 0, rc1, rc2, rc3, rc4, \ + rc5) + +#define async_req_3_0(exch, method, arg1, arg2, arg3) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, NULL, NULL, NULL, \ + NULL, NULL) +#define async_req_3_1(exch, method, arg1, arg2, arg3, rc1) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, rc1, NULL, NULL, \ + NULL, NULL) +#define async_req_3_2(exch, method, arg1, arg2, arg3, rc1, rc2) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, rc1, rc2, NULL, \ + NULL, NULL) +#define async_req_3_3(exch, method, arg1, arg2, arg3, rc1, rc2, rc3) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, rc1, rc2, rc3, \ + NULL, NULL) +#define async_req_3_4(exch, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, rc1, rc2, rc3, \ + rc4, NULL) +#define async_req_3_5(exch, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4, \ + rc5) \ + async_req_fast(exch, method, arg1, arg2, arg3, 0, rc1, rc2, rc3, \ + rc4, rc5) + +#define async_req_4_0(exch, method, arg1, arg2, arg3, arg4) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, NULL, NULL, \ NULL, NULL, NULL) -#define async_req_2_1(phoneid, method, arg1, arg2, rc1) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), NULL, \ +#define async_req_4_1(exch, method, arg1, arg2, arg3, arg4, rc1) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, rc1, NULL, \ NULL, NULL, NULL) -#define async_req_2_2(phoneid, method, arg1, arg2, rc1, rc2) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ +#define async_req_4_2(exch, method, arg1, arg2, arg3, arg4, rc1, rc2) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, NULL, \ + NULL, NULL) +#define async_req_4_3(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + NULL, NULL) +#define async_req_4_4(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + rc4) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + rc4, NULL) +#define async_req_4_5(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + rc4, rc5) \ + async_req_fast(exch, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + rc4, rc5) + +#define async_req_5_0(exch, method, arg1, arg2, arg3, arg4, arg5) \ + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, NULL, \ + NULL, NULL, NULL, NULL) +#define async_req_5_1(exch, method, arg1, arg2, arg3, arg4, arg5, rc1) \ + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, \ + NULL, NULL, NULL, NULL) +#define async_req_5_2(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2) \ + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ NULL, NULL, NULL) -#define async_req_2_3(phoneid, method, arg1, arg2, rc1, rc2, rc3) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ - (rc3), NULL, NULL) -#define async_req_2_4(phoneid, method, arg1, arg2, rc1, rc2, rc3, rc4) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ - (rc3), (rc4), NULL) -#define async_req_2_5(phoneid, method, arg1, arg2, rc1, rc2, rc3, rc4, rc5) \ - async_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ - (rc3), (rc4), (rc5)) -#define async_req_3_0(phoneid, method, arg1, arg2, arg3) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, NULL, NULL, \ - NULL, NULL, NULL) -#define async_req_3_1(phoneid, method, arg1, arg2, arg3, rc1) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ - NULL, NULL, NULL, NULL) -#define async_req_3_2(phoneid, method, arg1, arg2, arg3, rc1, rc2) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ - (rc2), NULL, NULL, NULL) -#define async_req_3_3(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ - (rc2), (rc3), NULL, NULL) -#define async_req_3_4(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ - (rc2), (rc3), (rc4), NULL) -#define async_req_3_5(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4, \ - rc5) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ - (rc2), (rc3), (rc4), (rc5)) -#define async_req_4_0(phoneid, method, arg1, arg2, arg3, arg4) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), NULL, \ - NULL, NULL, NULL, NULL) -#define async_req_4_1(phoneid, method, arg1, arg2, arg3, arg4, rc1) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \ - NULL, NULL, NULL, NULL) -#define async_req_4_2(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \ - (rc2), NULL, NULL, NULL) -#define async_req_4_3(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \ - (rc2), (rc3), NULL, NULL) -#define async_req_4_4(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ - rc4) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (rc1), (rc2), (rc3), (rc4), NULL) -#define async_req_4_5(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ - rc4, rc5) \ - async_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (rc1), (rc2), (rc3), (rc4), (rc5)) -#define async_req_5_0(phoneid, method, arg1, arg2, arg3, arg4, arg5) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), NULL, NULL, NULL, NULL, NULL) -#define async_req_5_1(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (rc1), NULL, NULL, NULL, NULL) -#define async_req_5_2(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (rc1), (rc2), NULL, NULL, NULL) -#define async_req_5_3(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ +#define async_req_5_3(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ rc3) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (rc1), (rc2), (rc3), NULL, NULL) -#define async_req_5_4(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + rc3, NULL, NULL) +#define async_req_5_4(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ rc3, rc4) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (rc1), (rc2), (rc3), (rc4), NULL) -#define async_req_5_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + rc3, rc4, NULL) +#define async_req_5_5(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ rc3, rc4, rc5) \ - async_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ - (arg5), (rc1), (rc2), (rc3), (rc4), (rc5)) - -extern sysarg_t async_req_fast(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, - sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *); -extern sysarg_t async_req_slow(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, + async_req_slow(exch, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + rc3, rc4, rc5) + +extern sysarg_t async_req_fast(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *); - -static inline void async_serialize_start(void) -{ - fibril_inc_sercount(); -} - -static inline void async_serialize_end(void) -{ - fibril_dec_sercount(); -} - -extern int async_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, +extern sysarg_t async_req_slow(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, + sysarg_t *, sysarg_t *); + +extern async_sess_t *async_connect_me(exch_mgmt_t, async_exch_t *); +extern async_sess_t *async_connect_me_to(exch_mgmt_t, async_exch_t *, sysarg_t, + sysarg_t, sysarg_t); +extern async_sess_t *async_connect_me_to_blocking(exch_mgmt_t, async_exch_t *, + sysarg_t, sysarg_t, sysarg_t); +extern async_sess_t *async_connect_kbox(task_id_t); + +extern int async_connect_to_me(async_exch_t *, sysarg_t, sysarg_t, sysarg_t, async_client_conn_t); -extern int async_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t); -extern int async_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t); -extern int async_connect_kbox(task_id_t); -extern int async_hangup(int); + +extern int async_hangup(async_sess_t *); extern void async_poke(void); +extern async_exch_t *async_exchange_begin(async_sess_t *); +extern void async_exchange_end(async_exch_t *); + /* * User-friendly wrappers for async_share_in_start(). */ -#define async_share_in_start_0_0(phoneid, dst, size) \ - async_share_in_start((phoneid), (dst), (size), 0, NULL) -#define async_share_in_start_0_1(phoneid, dst, size, flags) \ - async_share_in_start((phoneid), (dst), (size), 0, (flags)) -#define async_share_in_start_1_0(phoneid, dst, size, arg) \ - async_share_in_start((phoneid), (dst), (size), (arg), NULL) -#define async_share_in_start_1_1(phoneid, dst, size, arg, flags) \ - async_share_in_start((phoneid), (dst), (size), (arg), (flags)) - -extern int async_share_in_start(int, void *, size_t, sysarg_t, unsigned int *); +#define async_share_in_start_0_0(exch, dst, size) \ + async_share_in_start(exch, dst, size, 0, NULL) +#define async_share_in_start_0_1(exch, dst, size, flags) \ + async_share_in_start(exch, dst, size, 0, flags) +#define async_share_in_start_1_0(exch, dst, size, arg) \ + async_share_in_start(exch, dst, size, arg, NULL) +#define async_share_in_start_1_1(exch, dst, size, arg, flags) \ + async_share_in_start(exch, dst, size, arg, flags) + +extern int async_share_in_start(async_exch_t *, void *, size_t, sysarg_t, + unsigned int *); extern bool async_share_in_receive(ipc_callid_t *, size_t *); extern int async_share_in_finalize(ipc_callid_t, void *, unsigned int); -extern int async_share_out_start(int, void *, unsigned int); +extern int async_share_out_start(async_exch_t *, void *, unsigned int); extern bool async_share_out_receive(ipc_callid_t *, size_t *, unsigned int *); extern int async_share_out_finalize(ipc_callid_t, void *); @@ -314,40 +385,37 @@ */ -#define async_data_read_forward_0_0(phoneid, method, answer) \ - async_data_read_forward_fast((phoneid), (method), 0, 0, 0, 0, NULL) -#define async_data_read_forward_0_1(phoneid, method, answer) \ - async_data_read_forward_fast((phoneid), (method), 0, 0, 0, 0, (answer)) -#define async_data_read_forward_1_0(phoneid, method, arg1, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), 0, 0, 0, NULL) -#define async_data_read_forward_1_1(phoneid, method, arg1, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), 0, 0, 0, (answer)) -#define async_data_read_forward_2_0(phoneid, method, arg1, arg2, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, NULL) -#define async_data_read_forward_2_1(phoneid, method, arg1, arg2, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \ - (answer)) -#define async_data_read_forward_3_0(phoneid, method, arg1, arg2, arg3, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, \ - NULL) -#define async_data_read_forward_3_1(phoneid, method, arg1, arg2, arg3, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, \ - (answer)) -#define async_data_read_forward_4_0(phoneid, method, arg1, arg2, arg3, arg4, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - (arg4), NULL) -#define async_data_read_forward_4_1(phoneid, method, arg1, arg2, arg3, arg4, answer) \ - async_data_read_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - (arg4), (answer)) - -extern aid_t async_data_read(int, void *, size_t, ipc_call_t *); -#define async_data_read_start(p, buf, len) \ - async_data_read_start_generic((p), (buf), (len), IPC_XF_NONE) - -extern int async_data_read_start_generic(int, void *, size_t, int); +#define async_data_read_forward_0_0(exch, method, answer) \ + async_data_read_forward_fast(exch, method, 0, 0, 0, 0, NULL) +#define async_data_read_forward_0_1(exch, method, answer) \ + async_data_read_forward_fast(exch, method, 0, 0, 0, 0, answer) +#define async_data_read_forward_1_0(exch, method, arg1, answer) \ + async_data_read_forward_fast(exch, method, arg1, 0, 0, 0, NULL) +#define async_data_read_forward_1_1(exch, method, arg1, answer) \ + async_data_read_forward_fast(exch, method, arg1, 0, 0, 0, answer) +#define async_data_read_forward_2_0(exch, method, arg1, arg2, answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, 0, 0, NULL) +#define async_data_read_forward_2_1(exch, method, arg1, arg2, answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, 0, 0, answer) +#define async_data_read_forward_3_0(exch, method, arg1, arg2, arg3, answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, arg3, 0, NULL) +#define async_data_read_forward_3_1(exch, method, arg1, arg2, arg3, answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, arg3, 0, \ + answer) +#define async_data_read_forward_4_0(exch, method, arg1, arg2, arg3, arg4, \ + answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, arg3, arg4, \ + NULL) +#define async_data_read_forward_4_1(exch, method, arg1, arg2, arg3, arg4, \ + answer) \ + async_data_read_forward_fast(exch, method, arg1, arg2, arg3, arg4, \ + answer) + +extern aid_t async_data_read(async_exch_t *, void *, size_t, ipc_call_t *); +extern int async_data_read_start(async_exch_t *, void *, size_t); extern bool async_data_read_receive(ipc_callid_t *, size_t *); extern int async_data_read_finalize(ipc_callid_t, const void *, size_t); -extern int async_data_read_forward_fast(int, sysarg_t, sysarg_t, sysarg_t, - sysarg_t, sysarg_t, ipc_call_t *); +extern int async_data_read_forward_fast(async_exch_t *, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, ipc_call_t *); /* @@ -355,36 +423,32 @@ */ -#define async_data_write_forward_0_0(phoneid, method, answer) \ - async_data_write_forward_fast((phoneid), (method), 0, 0, 0, 0, NULL) -#define async_data_write_forward_0_1(phoneid, method, answer) \ - async_data_write_forward_fast((phoneid), (method), 0, 0, 0, 0, (answer)) -#define async_data_write_forward_1_0(phoneid, method, arg1, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), 0, 0, 0, NULL) -#define async_data_write_forward_1_1(phoneid, method, arg1, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), 0, 0, 0, \ - (answer)) -#define async_data_write_forward_2_0(phoneid, method, arg1, arg2, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \ - NULL) -#define async_data_write_forward_2_1(phoneid, method, arg1, arg2, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \ - (answer)) -#define async_data_write_forward_3_0(phoneid, method, arg1, arg2, arg3, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - 0, NULL) -#define async_data_write_forward_3_1(phoneid, method, arg1, arg2, arg3, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - 0, (answer)) -#define async_data_write_forward_4_0(phoneid, method, arg1, arg2, arg3, arg4, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - (arg4), NULL) -#define async_data_write_forward_4_1(phoneid, method, arg1, arg2, arg3, arg4, answer) \ - async_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ - (arg4), (answer)) - -#define async_data_write_start(p, buf, len) \ - async_data_write_start_generic((p), (buf), (len), IPC_XF_NONE) - -extern int async_data_write_start_generic(int, const void *, size_t, int); +#define async_data_write_forward_0_0(exch, method, answer) \ + async_data_write_forward_fast(exch, method, 0, 0, 0, 0, NULL) +#define async_data_write_forward_0_1(exch, method, answer) \ + async_data_write_forward_fast(exch, method, 0, 0, 0, 0, answer) +#define async_data_write_forward_1_0(exch, method, arg1, answer) \ + async_data_write_forward_fast(exch, method, arg1, 0, 0, 0, NULL) +#define async_data_write_forward_1_1(exch, method, arg1, answer) \ + async_data_write_forward_fast(exch, method, arg1, 0, 0, 0, answer) +#define async_data_write_forward_2_0(exch, method, arg1, arg2, answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, 0, 0, NULL) +#define async_data_write_forward_2_1(exch, method, arg1, arg2, answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, 0, 0, answer) +#define async_data_write_forward_3_0(exch, method, arg1, arg2, arg3, answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, arg3, 0, \ + NULL) +#define async_data_write_forward_3_1(exch, method, arg1, arg2, arg3, answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, arg3, 0, \ + answer) +#define async_data_write_forward_4_0(exch, method, arg1, arg2, arg3, arg4, \ + answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, arg3, arg4, \ + NULL) +#define async_data_write_forward_4_1(exch, method, arg1, arg2, arg3, arg4, \ + answer) \ + async_data_write_forward_fast(exch, method, arg1, arg2, arg3, arg4, \ + answer) + +extern int async_data_write_start(async_exch_t *, const void *, size_t); extern bool async_data_write_receive(ipc_callid_t *, size_t *); extern int async_data_write_finalize(ipc_callid_t, void *, size_t); @@ -394,6 +458,10 @@ extern void async_data_write_void(sysarg_t); -extern int async_data_write_forward_fast(int, sysarg_t, sysarg_t, sysarg_t, - sysarg_t, sysarg_t, ipc_call_t *); +extern int async_data_write_forward_fast(async_exch_t *, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, ipc_call_t *); + +extern int async_exchange_clone(async_exch_t *, async_exch_t *); +extern async_sess_t *async_clone_receive(exch_mgmt_t); +extern async_sess_t *async_callback_receive(exch_mgmt_t); #endif Index: uspace/lib/c/include/async_obsolete.h =================================================================== --- uspace/lib/c/include/async_obsolete.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) +++ uspace/lib/c/include/async_obsolete.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -0,0 +1,267 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#if ((defined(LIBC_IPC_H_)) && (!defined(LIBC_ASYNC_OBSOLETE_C_))) + #error Do not intermix low-level IPC interface and async framework +#endif + +#ifndef LIBC_ASYNC_OBSOLETE_H_ +#define LIBC_ASYNC_OBSOLETE_H_ + +extern void async_obsolete_serialize_start(void); +extern void async_obsolete_serialize_end(void); + +#define async_obsolete_send_0(phoneid, method, dataptr) \ + async_obsolete_send_fast((phoneid), (method), 0, 0, 0, 0, (dataptr)) +#define async_obsolete_send_1(phoneid, method, arg1, dataptr) \ + async_obsolete_send_fast((phoneid), (method), (arg1), 0, 0, 0, (dataptr)) +#define async_obsolete_send_2(phoneid, method, arg1, arg2, dataptr) \ + async_obsolete_send_fast((phoneid), (method), (arg1), (arg2), 0, 0, (dataptr)) +#define async_obsolete_send_3(phoneid, method, arg1, arg2, arg3, dataptr) \ + async_obsolete_send_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (dataptr)) +#define async_obsolete_send_4(phoneid, method, arg1, arg2, arg3, arg4, dataptr) \ + async_obsolete_send_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (dataptr)) +#define async_obsolete_send_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, dataptr) \ + async_obsolete_send_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), (dataptr)) + +extern aid_t async_obsolete_send_fast(int phoneid, sysarg_t method, sysarg_t arg1, + sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr); +extern aid_t async_obsolete_send_slow(int phoneid, sysarg_t method, sysarg_t arg1, + sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, + ipc_call_t *dataptr); + +#define async_obsolete_req_0_0(phoneid, method) \ + async_obsolete_req_fast((phoneid), (method), 0, 0, 0, 0, NULL, NULL, NULL, NULL, \ + NULL) +#define async_obsolete_req_0_1(phoneid, method, r1) \ + async_obsolete_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), NULL, NULL, NULL, \ + NULL) +#define async_obsolete_req_0_2(phoneid, method, r1, r2) \ + async_obsolete_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), NULL, NULL, \ + NULL) +#define async_obsolete_req_0_3(phoneid, method, r1, r2, r3) \ + async_obsolete_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), NULL, \ + NULL) +#define async_obsolete_req_0_4(phoneid, method, r1, r2, r3, r4) \ + async_obsolete_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), (r4), \ + NULL) +#define async_obsolete_req_0_5(phoneid, method, r1, r2, r3, r4, r5) \ + async_obsolete_req_fast((phoneid), (method), 0, 0, 0, 0, (r1), (r2), (r3), (r4), \ + (r5)) +#define async_obsolete_req_1_0(phoneid, method, arg1) \ + async_obsolete_req_fast((phoneid), (method), (arg1), 0, 0, 0, NULL, NULL, NULL, \ + NULL, NULL) +#define async_obsolete_req_1_1(phoneid, method, arg1, rc1) \ + async_obsolete_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), NULL, NULL, \ + NULL, NULL) +#define async_obsolete_req_1_2(phoneid, method, arg1, rc1, rc2) \ + async_obsolete_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), NULL, \ + NULL, NULL) +#define async_obsolete_req_1_3(phoneid, method, arg1, rc1, rc2, rc3) \ + async_obsolete_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \ + NULL, NULL) +#define async_obsolete_req_1_4(phoneid, method, arg1, rc1, rc2, rc3, rc4) \ + async_obsolete_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \ + (rc4), NULL) +#define async_obsolete_req_1_5(phoneid, method, arg1, rc1, rc2, rc3, rc4, rc5) \ + async_obsolete_req_fast((phoneid), (method), (arg1), 0, 0, 0, (rc1), (rc2), (rc3), \ + (rc4), (rc5)) +#define async_obsolete_req_2_0(phoneid, method, arg1, arg2) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, NULL, NULL, \ + NULL, NULL, NULL) +#define async_obsolete_req_2_1(phoneid, method, arg1, arg2, rc1) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), NULL, \ + NULL, NULL, NULL) +#define async_obsolete_req_2_2(phoneid, method, arg1, arg2, rc1, rc2) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ + NULL, NULL, NULL) +#define async_obsolete_req_2_3(phoneid, method, arg1, arg2, rc1, rc2, rc3) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ + (rc3), NULL, NULL) +#define async_obsolete_req_2_4(phoneid, method, arg1, arg2, rc1, rc2, rc3, rc4) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ + (rc3), (rc4), NULL) +#define async_obsolete_req_2_5(phoneid, method, arg1, arg2, rc1, rc2, rc3, rc4, rc5) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), 0, 0, (rc1), (rc2), \ + (rc3), (rc4), (rc5)) +#define async_obsolete_req_3_0(phoneid, method, arg1, arg2, arg3) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, NULL, NULL, \ + NULL, NULL, NULL) +#define async_obsolete_req_3_1(phoneid, method, arg1, arg2, arg3, rc1) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ + NULL, NULL, NULL, NULL) +#define async_obsolete_req_3_2(phoneid, method, arg1, arg2, arg3, rc1, rc2) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ + (rc2), NULL, NULL, NULL) +#define async_obsolete_req_3_3(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ + (rc2), (rc3), NULL, NULL) +#define async_obsolete_req_3_4(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ + (rc2), (rc3), (rc4), NULL) +#define async_obsolete_req_3_5(phoneid, method, arg1, arg2, arg3, rc1, rc2, rc3, rc4, \ + rc5) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), 0, (rc1), \ + (rc2), (rc3), (rc4), (rc5)) +#define async_obsolete_req_4_0(phoneid, method, arg1, arg2, arg3, arg4) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), NULL, \ + NULL, NULL, NULL, NULL) +#define async_obsolete_req_4_1(phoneid, method, arg1, arg2, arg3, arg4, rc1) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \ + NULL, NULL, NULL, NULL) +#define async_obsolete_req_4_2(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \ + (rc2), NULL, NULL, NULL) +#define async_obsolete_req_4_3(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), (rc1), \ + (rc2), (rc3), NULL, NULL) +#define async_obsolete_req_4_4(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + rc4) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (rc1), (rc2), (rc3), (rc4), NULL) +#define async_obsolete_req_4_5(phoneid, method, arg1, arg2, arg3, arg4, rc1, rc2, rc3, \ + rc4, rc5) \ + async_obsolete_req_fast((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (rc1), (rc2), (rc3), (rc4), (rc5)) +#define async_obsolete_req_5_0(phoneid, method, arg1, arg2, arg3, arg4, arg5) \ + async_obsolete_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), NULL, NULL, NULL, NULL, NULL) +#define async_obsolete_req_5_1(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1) \ + async_obsolete_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), (rc1), NULL, NULL, NULL, NULL) +#define async_obsolete_req_5_2(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2) \ + async_obsolete_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), (rc1), (rc2), NULL, NULL, NULL) +#define async_obsolete_req_5_3(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + rc3) \ + async_obsolete_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), (rc1), (rc2), (rc3), NULL, NULL) +#define async_obsolete_req_5_4(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + rc3, rc4) \ + async_obsolete_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), (rc1), (rc2), (rc3), (rc4), NULL) +#define async_obsolete_req_5_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, rc1, rc2, \ + rc3, rc4, rc5) \ + async_obsolete_req_slow((phoneid), (method), (arg1), (arg2), (arg3), (arg4), \ + (arg5), (rc1), (rc2), (rc3), (rc4), (rc5)) + +extern sysarg_t async_obsolete_req_fast(int phoneid, sysarg_t method, sysarg_t arg1, + sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t *r1, sysarg_t *r2, + sysarg_t *r3, sysarg_t *r4, sysarg_t *r5); +extern sysarg_t async_obsolete_req_slow(int phoneid, sysarg_t method, sysarg_t arg1, + sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, sysarg_t *r1, + sysarg_t *r2, sysarg_t *r3, sysarg_t *r4, sysarg_t *r5); + +extern void async_obsolete_msg_0(int, sysarg_t); +extern void async_obsolete_msg_1(int, sysarg_t, sysarg_t); +extern void async_obsolete_msg_2(int, sysarg_t, sysarg_t, sysarg_t); +extern void async_obsolete_msg_3(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t); +extern void async_obsolete_msg_4(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t); +extern void async_obsolete_msg_5(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t, sysarg_t, + sysarg_t); + +extern int async_obsolete_forward_slow(ipc_callid_t, int, sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t, unsigned int); + +extern int async_obsolete_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, + async_client_conn_t); +extern int async_obsolete_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t); +extern int async_obsolete_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t); +extern int async_obsolete_hangup(int); + +#define async_obsolete_share_in_start_0_0(phoneid, dst, size) \ + async_obsolete_share_in_start((phoneid), (dst), (size), 0, NULL) +#define async_obsolete_share_in_start_0_1(phoneid, dst, size, flags) \ + async_obsolete_share_in_start((phoneid), (dst), (size), 0, (flags)) +#define async_obsolete_share_in_start_1_0(phoneid, dst, size, arg) \ + async_obsolete_share_in_start((phoneid), (dst), (size), (arg), NULL) +#define async_obsolete_share_in_start_1_1(phoneid, dst, size, arg, flags) \ + async_obsolete_share_in_start((phoneid), (dst), (size), (arg), (flags)) + +extern int async_obsolete_share_in_start(int, void *, size_t, sysarg_t, + unsigned int *); +extern int async_obsolete_share_out_start(int, void *, unsigned int); + +#define async_obsolete_data_write_start(p, buf, len) \ + async_obsolete_data_write_start_generic((p), (buf), (len), IPC_XF_NONE) + +#define async_obsolete_data_read_start(p, buf, len) \ + async_obsolete_data_read_start_generic((p), (buf), (len), IPC_XF_NONE) + +#define async_obsolete_data_write_forward_0_0(phoneid, method, answer) \ + async_obsolete_data_write_forward_fast((phoneid), (method), 0, 0, 0, 0, NULL) +#define async_obsolete_data_write_forward_0_1(phoneid, method, answer) \ + async_obsolete_data_write_forward_fast((phoneid), (method), 0, 0, 0, 0, (answer)) +#define async_obsolete_data_write_forward_1_0(phoneid, method, arg1, answer) \ + async_obsolete_data_write_forward_fast((phoneid), (method), (arg1), 0, 0, 0, NULL) +#define async_obsolete_data_write_forward_1_1(phoneid, method, arg1, answer) \ + async_obsolete_data_write_forward_fast((phoneid), (method), (arg1), 0, 0, 0, \ + (answer)) +#define async_obsolete_data_write_forward_2_0(phoneid, method, arg1, arg2, answer) \ + async_obsolete_data_write_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \ + NULL) +#define async_obsolete_data_write_forward_2_1(phoneid, method, arg1, arg2, answer) \ + async_obsolete_data_write_forward_fast((phoneid), (method), (arg1), (arg2), 0, 0, \ + (answer)) +#define async_obsolete_data_write_forward_3_0(phoneid, method, arg1, arg2, arg3, answer) \ + async_obsolete_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ + 0, NULL) +#define async_obsolete_data_write_forward_3_1(phoneid, method, arg1, arg2, arg3, answer) \ + async_obsolete_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ + 0, (answer)) +#define async_obsolete_data_write_forward_4_0(phoneid, method, arg1, arg2, arg3, arg4, answer) \ + async_obsolete_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ + (arg4), NULL) +#define async_obsolete_data_write_forward_4_1(phoneid, method, arg1, arg2, arg3, arg4, answer) \ + async_obsolete_data_write_forward_fast((phoneid), (method), (arg1), (arg2), (arg3), \ + (arg4), (answer)) + +extern aid_t async_obsolete_data_read(int, void *, size_t, ipc_call_t *); +extern int async_obsolete_data_read_start_generic(int, void *, size_t, int); + +extern int async_obsolete_data_write_start_generic(int, const void *, size_t, int); +extern void async_obsolete_data_write_void(const int); + +extern int async_obsolete_forward_fast(ipc_callid_t, int, sysarg_t, sysarg_t, + sysarg_t, unsigned int); + +extern int async_obsolete_data_write_forward_fast(int, sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, ipc_call_t *); + +#endif + +/** @} + */ Index: uspace/lib/c/include/async_sess.h =================================================================== --- uspace/lib/c/include/async_sess.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2010 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_ASYNC_SESS_H_ -#define LIBC_ASYNC_SESS_H_ - -#include - -typedef struct { - int sess_phone; /**< Phone for cloning off the connections. */ - sysarg_t connect_arg1; /**< Argument for CONNECT_ME_TO. */ - link_t conn_head; /**< List of open data connections. */ - link_t sess_link; /**< Link in global list of open sessions. */ -} async_sess_t; - -extern void async_session_create(async_sess_t *, int, sysarg_t); -extern void async_session_destroy(async_sess_t *); -extern int async_exchange_begin(async_sess_t *); -extern void async_exchange_end(async_sess_t *, int); - -#endif - -/** @} - */ Index: uspace/lib/c/include/device/char_dev.h =================================================================== --- uspace/lib/c/include/device/char_dev.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/device/char_dev.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -36,4 +36,6 @@ #define LIBC_DEVICE_CHAR_DEV_H_ +#include + typedef enum { CHAR_DEV_READ = 0, @@ -41,6 +43,6 @@ } char_dev_method_t; -ssize_t char_dev_read(int dev_phone, void *buf, size_t len); -ssize_t char_dev_write(int dev_phone, void *buf, size_t len); +extern ssize_t char_dev_read(async_sess_t *, void *, size_t); +extern ssize_t char_dev_write(async_sess_t *, void *, size_t); #endif Index: uspace/lib/c/include/device/hw_res.h =================================================================== --- uspace/lib/c/include/device/hw_res.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/device/hw_res.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -26,5 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + /** @addtogroup libc * @{ @@ -32,9 +32,10 @@ /** @file */ - + #ifndef LIBC_DEVICE_HW_RES_H_ #define LIBC_DEVICE_HW_RES_H_ #include +#include #include @@ -48,5 +49,5 @@ typedef enum { INTERRUPT, - IO_RANGE, + IO_RANGE, MEM_RANGE } hw_res_type_t; @@ -66,5 +67,5 @@ size_t size; } mem_range; - + struct { uint64_t address; @@ -72,5 +73,5 @@ size_t size; } io_range; - + struct { int irq; @@ -88,13 +89,12 @@ if (hw_res->resources != NULL) { free(hw_res->resources); - hw_res->resources = NULL; } - + hw_res->count = 0; } -extern int hw_res_get_resource_list(int, hw_resource_list_t *); -extern bool hw_res_enable_interrupt(int); +extern int hw_res_get_resource_list(async_sess_t *, hw_resource_list_t *); +extern bool hw_res_enable_interrupt(async_sess_t *); #endif Index: uspace/lib/c/include/devman.h =================================================================== --- uspace/lib/c/include/devman.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/devman.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -41,6 +41,7 @@ #include -extern int devman_get_phone(devman_interface_t, unsigned int); -extern void devman_hangup_phone(devman_interface_t); +extern async_exch_t *devman_exchange_begin_blocking(devman_interface_t); +extern async_exch_t *devman_exchange_begin(devman_interface_t); +extern void devman_exchange_end(async_exch_t *); extern int devman_driver_register(const char *, async_client_conn_t); @@ -48,6 +49,8 @@ devman_handle_t, devman_handle_t *); -extern int devman_device_connect(devman_handle_t, unsigned int); -extern int devman_parent_device_connect(devman_handle_t, unsigned int); +extern async_sess_t *devman_device_connect(exch_mgmt_t, devman_handle_t, + unsigned int); +extern async_sess_t *devman_parent_device_connect(exch_mgmt_t, devman_handle_t, + unsigned int); extern int devman_device_get_handle(const char *, devman_handle_t *, Index: uspace/lib/c/include/devman_obsolete.h =================================================================== --- uspace/lib/c/include/devman_obsolete.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) +++ uspace/lib/c/include/devman_obsolete.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2009 Jiri Svoboda + * Copyright (c) 2010 Lenka Trochtova + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DEVMAN_OBSOLETE_H_ +#define LIBC_DEVMAN_OBSOLETE_H_ + +#include +#include +#include + +extern int devman_obsolete_get_phone(devman_interface_t, unsigned int); +extern void devman_obsolete_hangup_phone(devman_interface_t); + +extern int devman_obsolete_device_connect(devman_handle_t, unsigned int); +extern int devman_obsolete_parent_device_connect(devman_handle_t, unsigned int); + +#endif + +/** @} + */ Index: uspace/lib/c/include/devmap.h =================================================================== --- uspace/lib/c/include/devmap.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/devmap.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -40,16 +40,21 @@ #include -extern int devmap_get_phone(devmap_interface_t, unsigned int); -extern void devmap_hangup_phone(devmap_interface_t iface); +extern async_exch_t *devmap_exchange_begin_blocking(devmap_interface_t); +extern async_exch_t *devmap_exchange_begin(devmap_interface_t); +extern void devmap_exchange_end(async_exch_t *); extern int devmap_driver_register(const char *, async_client_conn_t); extern int devmap_device_register(const char *, devmap_handle_t *); -extern int devmap_device_register_with_iface(const char *, devmap_handle_t *, sysarg_t); +extern int devmap_device_register_with_iface(const char *, devmap_handle_t *, + sysarg_t); -extern int devmap_device_get_handle(const char *, devmap_handle_t *, unsigned int); -extern int devmap_namespace_get_handle(const char *, devmap_handle_t *, unsigned int); +extern int devmap_device_get_handle(const char *, devmap_handle_t *, + unsigned int); +extern int devmap_namespace_get_handle(const char *, devmap_handle_t *, + unsigned int); extern devmap_handle_type_t devmap_handle_probe(devmap_handle_t); -extern int devmap_device_connect(devmap_handle_t, unsigned int); +extern async_sess_t *devmap_device_connect(exch_mgmt_t, devmap_handle_t, + unsigned int); extern int devmap_null_create(void); Index: uspace/lib/c/include/devmap_obsolete.h =================================================================== --- uspace/lib/c/include/devmap_obsolete.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) +++ uspace/lib/c/include/devmap_obsolete.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2009 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_DEVMAP_OBSOLETE_H_ +#define LIBC_DEVMAP_OBSOLETE_H_ + +#include +#include +#include + +extern int devmap_obsolete_get_phone(devmap_interface_t, unsigned int); +extern void devmap_obsolete_hangup_phone(devmap_interface_t iface); + +extern int devmap_obsolete_device_connect(devmap_handle_t, unsigned int); + +#endif + +/** @} + */ Index: uspace/lib/c/include/io/console.h =================================================================== --- uspace/lib/c/include/io/console.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/io/console.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -36,10 +36,8 @@ #define LIBC_IO_CONSOLE_H_ +#include +#include #include - -typedef enum { - KEY_PRESS, - KEY_RELEASE -} console_ev_type_t; +#include typedef enum { @@ -50,8 +48,34 @@ } console_caps_t; +/** Console control structure. */ +typedef struct { + /** Console input file */ + FILE *input; + + /** Console output file */ + FILE *output; + + /** Console input session */ + async_sess_t *input_sess; + + /** Console output session */ + async_sess_t *output_sess; + + /** Input request call with timeout */ + ipc_call_t input_call; + + /** Input response with timeout */ + aid_t input_aid; +} console_ctrl_t; + +typedef enum { + KEY_PRESS, + KEY_RELEASE +} kbd_event_type_t; + /** Console event structure. */ typedef struct { /** Press or release event. */ - console_ev_type_t type; + kbd_event_type_t type; /** Keycode of the key that was pressed or released. */ @@ -63,22 +87,26 @@ /** The character that was generated or '\0' for none. */ wchar_t c; -} console_event_t; +} kbd_event_t; -extern void console_clear(int phone); +extern console_ctrl_t *console_init(FILE *, FILE *); +extern void console_done(console_ctrl_t *); +extern bool console_kcon(void); -extern int console_get_size(int phone, sysarg_t *cols, sysarg_t *rows); -extern int console_get_pos(int phone, sysarg_t *col, sysarg_t *row); -extern void console_set_pos(int phone, sysarg_t col, sysarg_t row); +extern void console_flush(console_ctrl_t *); +extern void console_clear(console_ctrl_t *); -extern void console_set_style(int phone, uint8_t style); -extern void console_set_color(int phone, uint8_t fg_color, uint8_t bg_color, - uint8_t flags); -extern void console_set_rgb_color(int phone, uint32_t fg_color, uint32_t bg_color); +extern int console_get_size(console_ctrl_t *, sysarg_t *, sysarg_t *); +extern int console_get_pos(console_ctrl_t *, sysarg_t *, sysarg_t *); +extern void console_set_pos(console_ctrl_t *, sysarg_t, sysarg_t); -extern void console_cursor_visibility(int phone, bool show); -extern int console_get_color_cap(int phone, sysarg_t *ccap); -extern void console_kcon_enable(int phone); +extern void console_set_style(console_ctrl_t *, uint8_t); +extern void console_set_color(console_ctrl_t *, uint8_t, uint8_t, uint8_t); +extern void console_set_rgb_color(console_ctrl_t *, uint32_t, uint32_t); -extern bool console_get_event(int phone, console_event_t *event); +extern void console_cursor_visibility(console_ctrl_t *, bool); +extern int console_get_color_cap(console_ctrl_t *, sysarg_t *); +extern bool console_get_kbd_event(console_ctrl_t *, kbd_event_t *); +extern bool console_get_kbd_event_timeout(console_ctrl_t *, kbd_event_t *, + suseconds_t *); #endif Index: uspace/lib/c/include/ipc/devmap.h =================================================================== --- uspace/lib/c/include/ipc/devmap.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/ipc/devmap.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -31,6 +31,6 @@ */ -#ifndef DEVMAP_DEVMAP_H_ -#define DEVMAP_DEVMAP_H_ +#ifndef LIBC_IPC_DEVMAP_H_ +#define LIBC_IPC_DEVMAP_H_ #include Index: uspace/lib/c/include/ipc/ipc.h =================================================================== --- uspace/lib/c/include/ipc/ipc.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/ipc/ipc.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -42,4 +42,5 @@ #include #include +#include #include #include @@ -255,4 +256,5 @@ extern int ipc_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t *, sysarg_t *); +extern int ipc_connect_me(int); 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); Index: uspace/lib/c/include/ipc/ns.h =================================================================== --- uspace/lib/c/include/ipc/ns.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/ipc/ns.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -33,8 +33,7 @@ */ -#ifndef LIBC_NS_H_ -#define LIBC_NS_H_ +#ifndef LIBC_IPC_NS_H_ +#define LIBC_IPC_NS_H_ -#include #include @@ -46,8 +45,4 @@ } ns_request_t; -extern int service_register(sysarg_t); -extern int service_connect(sysarg_t, sysarg_t, sysarg_t); -extern int service_connect_blocking(sysarg_t, sysarg_t, sysarg_t); - #endif Index: uspace/lib/c/include/ipc/serial_ctl.h =================================================================== --- uspace/lib/c/include/ipc/serial_ctl.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/ipc/serial_ctl.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -32,11 +32,13 @@ #include -/** ipc methods for getting/setting serial communication properties - * 1st ipc arg: baud rate - * 2nd ipc arg: parity - * 3rd ipc arg: number of bits in one word - * 4th ipc arg: number of stop bits +/** IPC methods for getting/setting serial communication properties + * + * 1st IPC arg: baud rate + * 2nd IPC arg: parity + * 3rd IPC arg: number of bits in one word + * 4th IPC arg: number of stop bits + * */ -typedef enum { +typedef enum { SERIAL_GET_COM_PROPS = DEV_FIRST_CUSTOM_METHOD, SERIAL_SET_COM_PROPS @@ -48,5 +50,5 @@ SERIAL_EVEN_PARITY = 3, SERIAL_MARK_PARITY = 5, - SERIAL_SPACE_PARITY = 7 + SERIAL_SPACE_PARITY = 7 } serial_parity_t; Index: uspace/lib/c/include/ipc/vfs.h =================================================================== --- uspace/lib/c/include/ipc/vfs.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/ipc/vfs.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -69,4 +69,5 @@ VFS_IN_FSTAT, VFS_IN_CLOSE, + VFS_IN_PING, VFS_IN_MOUNT, VFS_IN_UNMOUNT, Index: uspace/lib/c/include/loader/loader.h =================================================================== --- uspace/lib/c/include/loader/loader.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/loader/loader.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -40,9 +40,7 @@ #include -/** Abstraction of a loader connection */ -typedef struct { - /** ID of the phone connected to the loader. */ - int phone_id; -} loader_t; +/** Forward declararion */ +struct loader; +typedef struct loader loader_t; extern int loader_spawn(const char *); Index: uspace/lib/c/include/ns.h =================================================================== --- uspace/lib/c/include/ns.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) +++ uspace/lib/c/include/ns.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_NS_H_ +#define LIBC_NS_H_ + +#include +#include +#include + +extern int service_register(sysarg_t); +extern async_sess_t *service_connect(exch_mgmt_t, sysarg_t, sysarg_t, sysarg_t); +extern async_sess_t *service_connect_blocking(exch_mgmt_t, sysarg_t, sysarg_t, + sysarg_t); + +extern int ns_ping(void); +extern int ns_intro(task_id_t); + +#endif + +/** @} + */ Index: uspace/lib/c/include/ns_obsolete.h =================================================================== --- uspace/lib/c/include/ns_obsolete.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) +++ uspace/lib/c/include/ns_obsolete.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_NS_OBSOLETE_H_ +#define LIBC_NS_OBSOLETE_H_ + +#include +#include + +extern int service_obsolete_connect(sysarg_t, sysarg_t, sysarg_t); +extern int service_obsolete_connect_blocking(sysarg_t, sysarg_t, + sysarg_t); + +#endif + +/** @} + */ Index: uspace/lib/c/include/stdio.h =================================================================== --- uspace/lib/c/include/stdio.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/stdio.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -97,47 +97,7 @@ }; -typedef struct { - /** Linked list pointer. */ - link_t link; - - /** Underlying file descriptor. */ - int fd; - - /** Error indicator. */ - int error; - - /** End-of-file indicator. */ - int eof; - - /** Klog indicator */ - int klog; - - /** Phone to the file provider */ - int phone; - - /** - * Non-zero if the stream needs sync on fflush(). XXX change - * console semantics so that sync is not needed. - */ - int need_sync; - - /** Buffering type */ - enum _buffer_type btype; - - /** Buffer */ - uint8_t *buf; - - /** Buffer size */ - size_t buf_size; - - /** Buffer state */ - enum _buffer_state buf_state; - - /** Buffer I/O pointer */ - uint8_t *buf_head; - - /** Points to end of occupied space when in read mode. */ - uint8_t *buf_tail; -} FILE; +/** Forward declaration */ +struct _IO_FILE; +typedef struct _IO_FILE FILE; extern FILE *stdin; Index: uspace/lib/c/include/udebug.h =================================================================== --- uspace/lib/c/include/udebug.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/udebug.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -38,18 +38,23 @@ #include #include +#include typedef sysarg_t thash_t; -int udebug_begin(int); -int udebug_end(int); -int udebug_set_evmask(int, udebug_evmask_t); -int udebug_thread_read(int, void *, size_t , size_t *, size_t *); -int udebug_name_read(int, void *, size_t, size_t *, size_t *); -int udebug_areas_read(int, void *, size_t, size_t *, size_t *); -int udebug_mem_read(int, void *, uintptr_t, size_t); -int udebug_args_read(int, thash_t, sysarg_t *); -int udebug_regs_read(int, thash_t, void *); -int udebug_go(int, thash_t, udebug_event_t *, sysarg_t *, sysarg_t *); -int udebug_stop(int, thash_t); +extern int udebug_begin(async_sess_t *); +extern int udebug_end(async_sess_t *); +extern int udebug_set_evmask(async_sess_t *, udebug_evmask_t); +extern int udebug_thread_read(async_sess_t *, void *, size_t , size_t *, + size_t *); +extern int udebug_name_read(async_sess_t *, void *, size_t, size_t *, + size_t *); +extern int udebug_areas_read(async_sess_t *, void *, size_t, size_t *, + size_t *); +extern int udebug_mem_read(async_sess_t *, void *, uintptr_t, size_t); +extern int udebug_args_read(async_sess_t *, thash_t, sysarg_t *); +extern int udebug_regs_read(async_sess_t *, thash_t, void *); +extern int udebug_go(async_sess_t *, thash_t, udebug_event_t *, sysarg_t *, + sysarg_t *); +extern int udebug_stop(async_sess_t *, thash_t); #endif Index: uspace/lib/c/include/vfs/vfs.h =================================================================== --- uspace/lib/c/include/vfs/vfs.h (revision 8d6c1f139a0fd8ef52d018e1c68b0dcca5ec1ec9) +++ uspace/lib/c/include/vfs/vfs.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -41,7 +41,9 @@ #include -/** - * This type is a libc version of the VFS triplet. - * It uniquely identifies a file system node within a file system instance. +/** Libc version of the VFS triplet. + * + * Unique identification of a file system node + * within a file system instance. + * */ typedef struct { @@ -58,9 +60,7 @@ extern int open_node(fdi_node_t *, int); -extern int fd_phone(int); extern int fd_node(int, fdi_node_t *); extern FILE *fopen_node(fdi_node_t *, const char *); -extern int fphone(FILE *); extern int fnode(FILE *, fdi_node_t *); Index: uspace/lib/c/include/vfs/vfs_sess.h =================================================================== --- uspace/lib/c/include/vfs/vfs_sess.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) +++ uspace/lib/c/include/vfs/vfs_sess.h (revision 0eff68e2235e2f4737160b4f06cd3e6c1b217a5e) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2007 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_VFS_SESS_H_ +#define LIBC_VFS_SESS_H_ + +#include +#include + +extern async_sess_t *fd_session(exch_mgmt_t, int); +extern async_sess_t *fsession(exch_mgmt_t, FILE *); + +#endif + +/** @} + */