Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 7c014d1fbbe9734e6ee3616fac584d8cc996df36) +++ uspace/lib/c/Makefile (revision b7c33b0fe7496d849c86aa6a08470f9f4baf71c4) @@ -97,7 +97,5 @@ generic/ipc.c \ generic/ns.c \ - generic/ns_obsolete.c \ generic/async.c \ - generic/async_obsolete.c \ generic/loader.c \ generic/getopt.c \ Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 7c014d1fbbe9734e6ee3616fac584d8cc996df36) +++ uspace/lib/c/generic/async.c (revision b7c33b0fe7496d849c86aa6a08470f9f4baf71c4) @@ -118,4 +118,52 @@ #define CONN_HASH_TABLE_BUCKETS 32 +/** Session data */ +struct async_sess { + /** List of inactive exchanges */ + list_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; + + /** Mutex for stateful connections */ + fibril_mutex_t remote_state_mtx; + + /** Data for stateful connections */ + void *remote_state_data; +}; + +/** Exchange data */ +struct async_exch { + /** 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 framework global futex */ atomic_t async_futex = FUTEX_INITIALIZER; @@ -134,4 +182,17 @@ ipc_call_t call; } msg_t; + +/** Message data */ +typedef struct { + awaiter_t wdata; + + /** If reply was received. */ + bool done; + + /** Pointer to where the answer data is stored. */ + ipc_call_t *dataptr; + + sysarg_t retval; +} amsg_t; /* Client connection data */ Index: uspace/lib/c/generic/async_obsolete.c =================================================================== --- uspace/lib/c/generic/async_obsolete.c (revision 7c014d1fbbe9734e6ee3616fac584d8cc996df36) +++ (revision ) @@ -1,450 +1,0 @@ -/* - * 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 - */ - -#define LIBC_ASYNC_C_ -#define LIBC_ASYNC_OBSOLETE_C_ -#include -#include -#include -#include "private/async.h" -#undef LIBC_ASYNC_C_ -#undef LIBC_ASYNC_OBSOLETE_C_ - -#include -#include -#include - -/** Send message and return id of the sent message. - * - * The return value can be used as input for async_wait() to wait for - * completion. - * - * @param phoneid Handle of the phone that will be used for the send. - * @param method Service-defined method. - * @param arg1 Service-defined payload argument. - * @param arg2 Service-defined payload argument. - * @param arg3 Service-defined payload argument. - * @param arg4 Service-defined payload argument. - * @param dataptr If non-NULL, storage where the reply data will be - * stored. - * - * @return Hash of the sent message or 0 on error. - * - */ -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) -{ - amsg_t *msg = malloc(sizeof(amsg_t)); - - if (!msg) - return 0; - - msg->done = false; - msg->dataptr = dataptr; - - msg->wdata.to_event.inlist = false; - - /* - * We may sleep in the next method, - * but it will use its own means - */ - msg->wdata.active = true; - - ipc_call_async_4(phoneid, method, arg1, arg2, arg3, arg4, msg, - reply_received, true); - - return (aid_t) msg; -} - -/** Pseudo-synchronous message sending - fast version. - * - * Send message asynchronously and return only after the reply arrives. - * - * This function can only transfer 4 register payload arguments. For - * transferring more arguments, see the slower async_req_slow(). - * - * @param phoneid Hash of the phone through which to make the call. - * @param method Method of the call. - * @param arg1 Service-defined payload argument. - * @param arg2 Service-defined payload argument. - * @param arg3 Service-defined payload argument. - * @param arg4 Service-defined payload argument. - * @param r1 If non-NULL, storage for the 1st reply argument. - * @param r2 If non-NULL, storage for the 2nd reply argument. - * @param r3 If non-NULL, storage for the 3rd reply argument. - * @param r4 If non-NULL, storage for the 4th reply argument. - * @param r5 If non-NULL, storage for the 5th reply argument. - * - * @return Return code of the reply or a negative error code. - * - */ -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) -{ - ipc_call_t result; - aid_t eid = async_obsolete_send_4(phoneid, method, arg1, arg2, arg3, arg4, - &result); - - sysarg_t rc; - async_wait_for(eid, &rc); - - if (r1) - *r1 = IPC_GET_ARG1(result); - - if (r2) - *r2 = IPC_GET_ARG2(result); - - if (r3) - *r3 = IPC_GET_ARG3(result); - - if (r4) - *r4 = IPC_GET_ARG4(result); - - if (r5) - *r5 = IPC_GET_ARG5(result); - - return rc; -} - -/** Wrapper for IPC_M_SHARE_OUT calls using the async framework. - * - * @param phoneid Phone that will be used to contact the receiving side. - * @param src Source address space area base address. - * @param flags Flags to be used for sharing. Bits can be only cleared. - * - * @return Zero on success or a negative error code from errno.h. - * - */ -int async_obsolete_share_out_start(int phoneid, void *src, unsigned int flags) -{ - return async_obsolete_req_3_0(phoneid, IPC_M_SHARE_OUT, (sysarg_t) src, 0, - (sysarg_t) flags); -} - -/** Wrapper for ipc_hangup. - * - * @param phone Phone handle to hung up. - * - * @return Zero on success or a negative error code. - * - */ -int async_obsolete_hangup(int phone) -{ - return ipc_hangup(phone); -} - -/** Wrapper for IPC_M_DATA_WRITE calls using the async framework. - * - * @param phoneid Phone that will be used to contact the receiving side. - * @param src Address of the beginning of the source buffer. - * @param size Size of the source buffer. - * @param flags Flags to control the data transfer. - * - * @return Zero on success or a negative error code from errno.h. - * - */ -int async_obsolete_data_write_start_generic(int phoneid, const void *src, size_t size, - int flags) -{ - return async_obsolete_req_3_0(phoneid, IPC_M_DATA_WRITE, (sysarg_t) src, - (sysarg_t) size, (sysarg_t) flags); -} - -/** Start IPC_M_DATA_READ using the async framework. - * - * @param phoneid Phone that will be used to contact the receiving side. - * @param dst Address of the beginning of the destination buffer. - * @param size Size of the destination buffer (in bytes). - * @param dataptr Storage of call data (arg 2 holds actual data size). - * - * @return Hash of the sent message or 0 on error. - * - */ -aid_t async_obsolete_data_read(int phone, void *dst, size_t size, - ipc_call_t *dataptr) -{ - return async_obsolete_send_2(phone, IPC_M_DATA_READ, (sysarg_t) dst, - (sysarg_t) size, dataptr); -} - -/** Wrapper for IPC_M_DATA_READ calls using the async framework. - * - * @param phoneid Phone that will be used to contact the receiving side. - * @param dst Address of the beginning of the destination buffer. - * @param size Size of the destination buffer. - * @param flags Flags to control the data transfer. - * - * @return Zero on success or a negative error code from errno.h. - * - */ -int async_obsolete_data_read_start_generic(int phoneid, void *dst, size_t size, int flags) -{ - return async_obsolete_req_3_0(phoneid, IPC_M_DATA_READ, (sysarg_t) dst, - (sysarg_t) size, (sysarg_t) flags); -} - -/** Wrapper for making IPC_M_CONNECT_TO_ME calls using the async framework. - * - * Ask through phone for a new connection to some service. - * - * @param phone Phone handle used for contacting the other side. - * @param arg1 User defined argument. - * @param arg2 User defined argument. - * @param arg3 User defined argument. - * @param client_receiver Connection handing routine. - * - * @return New phone handle on success or a negative error code. - * - */ -int async_obsolete_connect_to_me(int phone, sysarg_t arg1, sysarg_t arg2, - sysarg_t arg3, async_client_conn_t client_receiver, void *carg) -{ - sysarg_t task_hash; - sysarg_t phone_hash; - int rc = async_obsolete_req_3_5(phone, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3, - NULL, NULL, NULL, &task_hash, &phone_hash); - if (rc != EOK) - return rc; - - if (client_receiver != NULL) - async_new_connection(task_hash, phone_hash, 0, NULL, - client_receiver, carg); - - return EOK; -} - -/** Wrapper for making IPC_M_CONNECT_ME_TO calls using the async framework. - * - * Ask through phone for a new connection to some service. - * - * @param phone Phone handle used for contacting the other side. - * @param arg1 User defined argument. - * @param arg2 User defined argument. - * @param arg3 User defined argument. - * - * @return New phone handle on success or a negative error code. - * - */ -int async_obsolete_connect_me_to(int phone, sysarg_t arg1, sysarg_t arg2, - sysarg_t arg3) -{ - sysarg_t newphid; - int rc = async_obsolete_req_3_5(phone, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3, - NULL, NULL, NULL, NULL, &newphid); - - if (rc != EOK) - return rc; - - return newphid; -} - -/** Wrapper for making IPC_M_CONNECT_ME_TO calls using the async framework. - * - * Ask through phone for a new connection to some service and block until - * success. - * - * @param phoneid Phone handle used for contacting the other side. - * @param arg1 User defined argument. - * @param arg2 User defined argument. - * @param arg3 User defined argument. - * - * @return New phone handle on success or a negative error code. - * - */ -int async_obsolete_connect_me_to_blocking(int phoneid, sysarg_t arg1, sysarg_t arg2, - sysarg_t arg3) -{ - sysarg_t newphid; - int rc = async_obsolete_req_4_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3, - IPC_FLAG_BLOCKING, NULL, NULL, NULL, NULL, &newphid); - - if (rc != EOK) - return rc; - - return newphid; -} - -/** Send message and return id of the sent message - * - * The return value can be used as input for async_wait() to wait for - * completion. - * - * @param phoneid Handle of the phone that will be used for the send. - * @param method Service-defined method. - * @param arg1 Service-defined payload argument. - * @param arg2 Service-defined payload argument. - * @param arg3 Service-defined payload argument. - * @param arg4 Service-defined payload argument. - * @param arg5 Service-defined payload argument. - * @param dataptr If non-NULL, storage where the reply data will be - * stored. - * - * @return Hash of the sent message or 0 on error. - * - */ -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) -{ - amsg_t *msg = malloc(sizeof(amsg_t)); - - if (!msg) - return 0; - - msg->done = false; - msg->dataptr = dataptr; - - msg->wdata.to_event.inlist = false; - - /* - * We may sleep in the next method, - * but it will use its own means - */ - msg->wdata.active = true; - - ipc_call_async_5(phoneid, method, arg1, arg2, arg3, arg4, arg5, msg, - reply_received, true); - - return (aid_t) msg; -} - -void async_obsolete_msg_0(int phone, sysarg_t imethod) -{ - ipc_call_async_0(phone, imethod, NULL, NULL, true); -} - -void async_obsolete_msg_1(int phone, sysarg_t imethod, sysarg_t arg1) -{ - ipc_call_async_1(phone, imethod, arg1, NULL, NULL, true); -} - -void async_obsolete_msg_2(int phone, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2) -{ - ipc_call_async_2(phone, imethod, arg1, arg2, NULL, NULL, true); -} - -void async_obsolete_msg_3(int phone, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, - sysarg_t arg3) -{ - ipc_call_async_3(phone, imethod, arg1, arg2, arg3, NULL, NULL, true); -} - -void async_obsolete_msg_4(int phone, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, - sysarg_t arg3, sysarg_t arg4) -{ - ipc_call_async_4(phone, imethod, arg1, arg2, arg3, arg4, NULL, NULL, - true); -} - -void async_obsolete_msg_5(int phone, sysarg_t imethod, sysarg_t arg1, sysarg_t arg2, - sysarg_t arg3, sysarg_t arg4, sysarg_t arg5) -{ - ipc_call_async_5(phone, imethod, arg1, arg2, arg3, arg4, arg5, NULL, - NULL, true); -} - -/** Wrapper for IPC_M_SHARE_IN calls using the async framework. - * - * @param phoneid Phone that will be used to contact the receiving side. - * @param dst Destination address space area base. - * @param size Size of the destination address space area. - * @param arg User defined argument. - * @param flags Storage for the received flags. Can be NULL. - * - * @return Zero on success or a negative error code from errno.h. - * - */ -int async_obsolete_share_in_start(int phoneid, void *dst, size_t size, sysarg_t arg, - unsigned int *flags) -{ - sysarg_t tmp_flags; - int res = async_obsolete_req_3_2(phoneid, IPC_M_SHARE_IN, (sysarg_t) dst, - (sysarg_t) size, arg, NULL, &tmp_flags); - - if (flags) - *flags = (unsigned int) tmp_flags; - - return res; -} - -int async_obsolete_forward_fast(ipc_callid_t callid, int phoneid, sysarg_t imethod, - sysarg_t arg1, sysarg_t arg2, unsigned int mode) -{ - return ipc_forward_fast(callid, phoneid, imethod, arg1, arg2, mode); -} - -int async_obsolete_forward_slow(ipc_callid_t callid, int phoneid, sysarg_t imethod, - sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, - unsigned int mode) -{ - return ipc_forward_slow(callid, phoneid, imethod, arg1, arg2, arg3, arg4, - arg5, mode); -} - -/** Wrapper for forwarding any data that is about to be received - * - */ -int async_obsolete_data_write_forward_fast(int phoneid, sysarg_t method, sysarg_t arg1, - sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, ipc_call_t *dataptr) -{ - ipc_callid_t callid; - if (!async_data_write_receive(&callid, NULL)) { - ipc_answer_0(callid, EINVAL); - return EINVAL; - } - - aid_t msg = async_obsolete_send_fast(phoneid, method, arg1, arg2, arg3, arg4, - dataptr); - if (msg == 0) { - ipc_answer_0(callid, EINVAL); - return EINVAL; - } - - int retval = ipc_forward_fast(callid, phoneid, 0, 0, 0, - IPC_FF_ROUTE_FROM_ME); - if (retval != EOK) { - async_wait_for(msg, NULL); - ipc_answer_0(callid, retval); - return retval; - } - - sysarg_t rc; - async_wait_for(msg, &rc); - - return (int) rc; -} - -/** @} - */ Index: uspace/lib/c/generic/ns_obsolete.c =================================================================== --- uspace/lib/c/generic/ns_obsolete.c (revision 7c014d1fbbe9734e6ee3616fac584d8cc996df36) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (c) 2011 Martin Decky - * 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 - */ - -#include -#include -#include -#include - -int service_obsolete_connect(sysarg_t service, sysarg_t arg2, sysarg_t arg3) -{ - return async_obsolete_connect_me_to(PHONE_NS, service, arg2, arg3); -} - -int service_obsolete_connect_blocking(sysarg_t service, sysarg_t arg2, sysarg_t arg3) -{ - return async_obsolete_connect_me_to_blocking(PHONE_NS, service, arg2, arg3); -} - -/** @} - */ Index: uspace/lib/c/generic/private/async.h =================================================================== --- uspace/lib/c/generic/private/async.h (revision 7c014d1fbbe9734e6ee3616fac584d8cc996df36) +++ uspace/lib/c/generic/private/async.h (revision b7c33b0fe7496d849c86aa6a08470f9f4baf71c4) @@ -43,52 +43,4 @@ #include -/** Session data */ -struct _async_sess { - /** List of inactive exchanges */ - list_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; - - /** Mutex for stateful connections */ - fibril_mutex_t remote_state_mtx; - - /** Data for stateful connections */ - void *remote_state_data; -}; - -/** Exchange data */ -struct _async_exch { - /** 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; -}; - /** Structures of this type are used to track the timeout events. */ typedef struct { @@ -129,17 +81,4 @@ } awaiter_t; -/** Message data */ -typedef struct { - awaiter_t wdata; - - /** If reply was received. */ - bool done; - - /** Pointer to where the answer data is stored. */ - ipc_call_t *dataptr; - - sysarg_t retval; -} amsg_t; - extern void __async_init(void); extern void async_insert_timeout(awaiter_t *); Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision 7c014d1fbbe9734e6ee3616fac584d8cc996df36) +++ uspace/lib/c/include/async.h (revision b7c33b0fe7496d849c86aa6a08470f9f4baf71c4) @@ -96,9 +96,9 @@ /** Forward declarations */ -struct _async_exch; -struct _async_sess; - -typedef struct _async_sess async_sess_t; -typedef struct _async_exch async_exch_t; +struct async_exch; +struct async_sess; + +typedef struct async_sess async_sess_t; +typedef struct async_exch async_exch_t; extern atomic_t threads_in_ipc_wait; Index: uspace/lib/c/include/async_obsolete.h =================================================================== --- uspace/lib/c/include/async_obsolete.h (revision 7c014d1fbbe9734e6ee3616fac584d8cc996df36) +++ (revision ) @@ -1,264 +1,0 @@ -/* - * 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_ - -#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, void *); -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/ns_obsolete.h =================================================================== --- uspace/lib/c/include/ns_obsolete.h (revision 7c014d1fbbe9734e6ee3616fac584d8cc996df36) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * 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 - -/** @} - */