Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ uspace/lib/c/include/async.h (revision f9b2cb4cf365498e1fe141b1aa66950fbc3dcb17) @@ -59,8 +59,9 @@ * * @param callid ID of incoming call or 0 if connection initiated from - * inside using async_connect_to_me() + * inside using async_create_callback_port() * @param call Incoming call or 0 if connection initiated from inside - * @param arg Local argument passed from async_new_connection() or - * async_connect_to_me() + * using async_create_callback_port() + * @param arg Local argument. + * */ typedef void (*async_port_handler_t)(ipc_callid_t, ipc_call_t *, void *); @@ -82,4 +83,12 @@ EXCHANGE_ATOMIC = 0, + /** Exchange management via mutual exclusion + * + * Suitable for any kind of client/server communication, + * but can limit parallelism. + * + */ + EXCHANGE_SERIALIZE = 1, + /** Exchange management via phone cloning * @@ -89,13 +98,5 @@ * */ - EXCHANGE_PARALLEL = 1, - - /** Exchange management via mutual exclusion - * - * Suitable for any kind of client/server communication, - * but can limit parallelism. - * - */ - EXCHANGE_SERIALIZE = 2 + EXCHANGE_PARALLEL = 2 } exch_mgmt_t; @@ -358,6 +359,5 @@ 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_port_handler_t, void *); +extern int async_connect_to_me(async_exch_t *, sysarg_t, sysarg_t, sysarg_t); extern int async_hangup(async_sess_t *); Index: uspace/lib/c/include/devman.h =================================================================== --- uspace/lib/c/include/devman.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ uspace/lib/c/include/devman.h (revision f9b2cb4cf365498e1fe141b1aa66950fbc3dcb17) @@ -42,6 +42,6 @@ #include -extern async_exch_t *devman_exchange_begin_blocking(devman_interface_t); -extern async_exch_t *devman_exchange_begin(devman_interface_t); +extern async_exch_t *devman_exchange_begin_blocking(iface_t); +extern async_exch_t *devman_exchange_begin(iface_t); extern void devman_exchange_end(async_exch_t *); @@ -53,7 +53,6 @@ extern int devman_drv_fun_offline(devman_handle_t); -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, +extern async_sess_t *devman_device_connect(devman_handle_t, unsigned int); +extern async_sess_t *devman_parent_device_connect(devman_handle_t, unsigned int); Index: uspace/lib/c/include/ipc/devman.h =================================================================== --- uspace/lib/c/include/ipc/devman.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ uspace/lib/c/include/ipc/devman.h (revision f9b2cb4cf365498e1fe141b1aa66950fbc3dcb17) @@ -141,11 +141,4 @@ typedef enum { - DEVMAN_DRIVER = 1, - DEVMAN_CLIENT, - DEVMAN_CONNECT_TO_DEVICE, - DEVMAN_CONNECT_TO_PARENTS_DEVICE -} devman_interface_t; - -typedef enum { DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD, DEVMAN_ADD_FUNCTION, Index: uspace/lib/c/include/ipc/driver.h =================================================================== --- uspace/lib/c/include/ipc/driver.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ (revision ) @@ -1,50 +1,0 @@ -/* - * 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 libdrv - * @{ - */ -/** @file - */ - -#ifndef IPC_DRIVER_H_ -#define IPC_DRIVER_H_ - -typedef enum { - DRIVER_DEVMAN = 1, - DRIVER_CLIENT, - DRIVER_DRIVER -} driver_interface_t; - - -#endif - - -/** - * @} - */ Index: uspace/lib/c/include/ipc/inet.h =================================================================== --- uspace/lib/c/include/ipc/inet.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ uspace/lib/c/include/ipc/inet.h (revision f9b2cb4cf365498e1fe141b1aa66950fbc3dcb17) @@ -37,16 +37,4 @@ #include - -/** Inet ports */ -typedef enum { - /** Default port */ - INET_PORT_DEFAULT = 1, - /** Configuration port */ - INET_PORT_CFG, - /** Ping service port */ - INET_PORT_PING, - /** Ping6 service port */ - INET_PORT_PING6 -} inet_port_t; /** Requests on Inet default port */ Index: uspace/lib/c/include/ipc/loc.h =================================================================== --- uspace/lib/c/include/ipc/loc.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ uspace/lib/c/include/ipc/loc.h (revision f9b2cb4cf365498e1fe141b1aa66950fbc3dcb17) @@ -76,20 +76,4 @@ } loc_event_t; -/** Ports provided by location service. - * - * Every process that connects to loc must ask one of following - * ports, otherwise connection will be refused. - * - */ -typedef enum { - /** Service supplier (server) port */ - LOC_PORT_SUPPLIER = 1, - /** Service consumer (client) port */ - LOC_PORT_CONSUMER, - /** Create new connection to instance of device that - is specified by second argument of call. */ - LOC_CONNECT_TO_SERVICE -} loc_interface_t; - typedef struct { service_id_t id; Index: uspace/lib/c/include/ipc/logger.h =================================================================== --- uspace/lib/c/include/ipc/logger.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ uspace/lib/c/include/ipc/logger.h (revision f9b2cb4cf365498e1fe141b1aa66950fbc3dcb17) @@ -69,11 +69,4 @@ } logger_writer_request_t; -typedef enum { - /** Interface for controlling logger behavior. */ - LOGGER_INTERFACE_CONTROL, - /** Interface for servers writing to the log. */ - LOGGER_INTERFACE_WRITER -} logger_interface_t; - #endif Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ uspace/lib/c/include/ipc/services.h (revision f9b2cb4cf365498e1fe141b1aa66950fbc3dcb17) @@ -52,14 +52,11 @@ } service_t; -#define SERVICE_NAME_CORECFG "corecfg" -#define SERVICE_NAME_DHCP "net/dhcp" -#define SERVICE_NAME_DNSR "net/dnsr" -#define SERVICE_NAME_INET "net/inet" -#define SERVICE_NAME_INETCFG "net/inetcfg" -#define SERVICE_NAME_INETPING "net/inetping" -#define SERVICE_NAME_INETPING6 "net/inetping6" -#define SERVICE_NAME_NETCONF "net/netconf" -#define SERVICE_NAME_UDP "net/udp" -#define SERVICE_NAME_TCP "net/tcp" +#define SERVICE_NAME_CORECFG "corecfg" +#define SERVICE_NAME_DHCP "net/dhcp" +#define SERVICE_NAME_DNSR "net/dnsr" +#define SERVICE_NAME_INET "net/inet" +#define SERVICE_NAME_NETCONF "net/netconf" +#define SERVICE_NAME_UDP "net/udp" +#define SERVICE_NAME_TCP "net/tcp" #endif Index: uspace/lib/c/include/loc.h =================================================================== --- uspace/lib/c/include/loc.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ uspace/lib/c/include/loc.h (revision f9b2cb4cf365498e1fe141b1aa66950fbc3dcb17) @@ -42,12 +42,10 @@ typedef void (*loc_cat_change_cb_t)(void); -extern async_exch_t *loc_exchange_begin_blocking(loc_interface_t); -extern async_exch_t *loc_exchange_begin(loc_interface_t); +extern async_exch_t *loc_exchange_begin_blocking(iface_t); +extern async_exch_t *loc_exchange_begin(iface_t); extern void loc_exchange_end(async_exch_t *); extern int loc_server_register(const char *); extern int loc_service_register(const char *, service_id_t *); -extern int loc_service_register_with_iface(const char *, service_id_t *, - sysarg_t); extern int loc_service_unregister(service_id_t); extern int loc_service_add_to_cat(service_id_t, category_id_t); @@ -65,7 +63,5 @@ extern loc_object_type_t loc_id_probe(service_id_t); -extern async_sess_t *loc_service_connect_iface(service_id_t, iface_t, - unsigned int); -extern async_sess_t *loc_service_connect(exch_mgmt_t, service_id_t, +extern async_sess_t *loc_service_connect(service_id_t, iface_t, unsigned int); Index: uspace/lib/c/include/ns.h =================================================================== --- uspace/lib/c/include/ns.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ uspace/lib/c/include/ns.h (revision f9b2cb4cf365498e1fe141b1aa66950fbc3dcb17) @@ -42,14 +42,6 @@ extern int service_register(service_t); -extern async_sess_t *service_connect(exch_mgmt_t, service_t, sysarg_t); -extern async_sess_t *service_connect_iface_extended(service_t, iface_t, sysarg_t); -extern async_sess_t *service_connect_iface(exch_mgmt_t, sysarg_t, service_t, sysarg_t); -extern async_sess_t *service_connect_blocking(exch_mgmt_t, service_t, sysarg_t); -extern async_sess_t *service_connect_blocking_iface_extended(service_t, iface_t, - sysarg_t); -extern async_sess_t *service_connect_blocking_iface(exch_mgmt_t, sysarg_t, service_t, - sysarg_t); -extern async_sess_t *service_bind(service_t, sysarg_t, sysarg_t, sysarg_t, - async_port_handler_t); +extern async_sess_t *service_connect(service_t, iface_t, sysarg_t); +extern async_sess_t *service_connect_blocking(service_t, iface_t, sysarg_t); extern int ns_ping(void); Index: uspace/lib/c/include/vfs/vfs_sess.h =================================================================== --- uspace/lib/c/include/vfs/vfs_sess.h (revision 0dd16778197e5f50b6e77a71d9b8aeb33b2ad863) +++ uspace/lib/c/include/vfs/vfs_sess.h (revision f9b2cb4cf365498e1fe141b1aa66950fbc3dcb17) @@ -39,6 +39,6 @@ #include -extern async_sess_t *fd_session(exch_mgmt_t, int); -extern async_sess_t *fsession(exch_mgmt_t, FILE *); +extern async_sess_t *fd_session(int, iface_t); +extern async_sess_t *fsession(FILE *, iface_t); #endif