Index: uspace/lib/c/include/devmap.h =================================================================== --- uspace/lib/c/include/devmap.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) +++ (revision ) @@ -1,72 +1,0 @@ -/* - * 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_H_ -#define LIBC_DEVMAP_H_ - -#include -#include -#include - -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_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 async_sess_t *devmap_device_connect(exch_mgmt_t, devmap_handle_t, - unsigned int); - -extern int devmap_null_create(void); -extern void devmap_null_destroy(int); - -extern size_t devmap_count_namespaces(void); -extern size_t devmap_count_devices(devmap_handle_t); - -extern size_t devmap_get_namespaces(dev_desc_t **); -extern size_t devmap_get_devices(devmap_handle_t, dev_desc_t **); - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/devman.h =================================================================== --- uspace/lib/c/include/ipc/devman.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) +++ uspace/lib/c/include/ipc/devman.h (revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299) @@ -130,5 +130,5 @@ DEVMAN_CLIENT, DEVMAN_CONNECT_TO_DEVICE, - DEVMAN_CONNECT_FROM_DEVMAP, + DEVMAN_CONNECT_FROM_LOC, DEVMAN_CONNECT_TO_PARENTS_DEVICE } devman_interface_t; Index: uspace/lib/c/include/ipc/devmap.h =================================================================== --- uspace/lib/c/include/ipc/devmap.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) +++ (revision ) @@ -1,85 +1,0 @@ -/* - * Copyright (c) 2007 Josef Cejka - * 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 devmap - * @{ - */ - -#ifndef LIBC_IPC_DEVMAP_H_ -#define LIBC_IPC_DEVMAP_H_ - -#include - -#define DEVMAP_NAME_MAXLEN 255 - -typedef sysarg_t devmap_handle_t; - -typedef enum { - DEV_HANDLE_NONE, - DEV_HANDLE_NAMESPACE, - DEV_HANDLE_DEVICE -} devmap_handle_type_t; - -typedef enum { - DEVMAP_DRIVER_REGISTER = IPC_FIRST_USER_METHOD, - DEVMAP_DRIVER_UNREGISTER, - DEVMAP_DEVICE_REGISTER, - DEVMAP_DEVICE_UNREGISTER, - DEVMAP_DEVICE_GET_HANDLE, - DEVMAP_NAMESPACE_GET_HANDLE, - DEVMAP_HANDLE_PROBE, - DEVMAP_NULL_CREATE, - DEVMAP_NULL_DESTROY, - DEVMAP_GET_NAMESPACE_COUNT, - DEVMAP_GET_DEVICE_COUNT, - DEVMAP_GET_NAMESPACES, - DEVMAP_GET_DEVICES -} devmap_request_t; - -/** Interface provided by devmap. - * - * Every process that connects to devmap must ask one of following - * interfaces otherwise connection will be refused. - * - */ -typedef enum { - /** Connect as device driver */ - DEVMAP_DRIVER = 1, - /** Connect as client */ - DEVMAP_CLIENT, - /** Create new connection to instance of device that - is specified by second argument of call. */ - DEVMAP_CONNECT_TO_DEVICE -} devmap_interface_t; - -typedef struct { - devmap_handle_t handle; - char name[DEVMAP_NAME_MAXLEN + 1]; -} dev_desc_t; - -#endif Index: uspace/lib/c/include/ipc/loc.h =================================================================== --- uspace/lib/c/include/ipc/loc.h (revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299) +++ uspace/lib/c/include/ipc/loc.h (revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299) @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2007 Josef Cejka + * Copyright (c) 2011 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 loc + * @{ + */ + +#ifndef LIBC_IPC_LOC_H_ +#define LIBC_IPC_LOC_H_ + +#include + +#define LOC_NAME_MAXLEN 255 + +typedef sysarg_t service_id_t; + +typedef enum { + LOC_OBJECT_NONE, + LOC_OBJECT_NAMESPACE, + LOC_OBJECT_SERVICE +} loc_object_type_t; + +typedef enum { + LOC_SERVER_REGISTER = IPC_FIRST_USER_METHOD, + LOC_SERVER_UNREGISTER, + LOC_SERVICE_REGISTER, + LOC_SERVICE_UNREGISTER, + LOC_SERVICE_GET_ID, + LOC_NAMESPACE_GET_ID, + LOC_ID_PROBE, + LOC_NULL_CREATE, + LOC_NULL_DESTROY, + LOC_GET_NAMESPACE_COUNT, + LOC_GET_SERVICE_COUNT, + LOC_GET_NAMESPACES, + LOC_GET_SERVICES +} loc_request_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; + char name[LOC_NAME_MAXLEN + 1]; +} loc_sdesc_t; + +#endif Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) +++ uspace/lib/c/include/ipc/services.h (revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299) @@ -43,5 +43,5 @@ SERVICE_VIDEO, SERVICE_VFS, - SERVICE_DEVMAP, + SERVICE_LOC, SERVICE_DEVMAN, SERVICE_IRC, Index: uspace/lib/c/include/loc.h =================================================================== --- uspace/lib/c/include/loc.h (revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299) +++ uspace/lib/c/include/loc.h (revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299) @@ -0,0 +1,72 @@ +/* + * 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_LOC_H_ +#define LIBC_LOC_H_ + +#include +#include +#include + +extern async_exch_t *loc_exchange_begin_blocking(loc_interface_t); +extern async_exch_t *loc_exchange_begin(loc_interface_t); +extern void loc_exchange_end(async_exch_t *); + +extern int loc_server_register(const char *, async_client_conn_t); +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_get_id(const char *, service_id_t *, + unsigned int); +extern int loc_namespace_get_id(const char *, service_id_t *, + unsigned int); +extern loc_object_type_t loc_id_probe(service_id_t); + +extern async_sess_t *loc_service_connect(exch_mgmt_t, service_id_t, + unsigned int); + +extern int loc_null_create(void); +extern void loc_null_destroy(int); + +extern size_t loc_count_namespaces(void); +extern size_t loc_count_services(service_id_t); + +extern size_t loc_get_namespaces(loc_sdesc_t **); +extern size_t loc_get_services(service_id_t, loc_sdesc_t **); + +#endif + +/** @} + */ Index: uspace/lib/c/include/sys/stat.h =================================================================== --- uspace/lib/c/include/sys/stat.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) +++ uspace/lib/c/include/sys/stat.h (revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299) @@ -39,9 +39,9 @@ #include #include -#include +#include struct stat { fs_handle_t fs_handle; - devmap_handle_t devmap_handle; + service_id_t service_id; fs_index_t index; unsigned int lnkcnt; @@ -49,5 +49,5 @@ bool is_directory; aoff64_t size; - devmap_handle_t device; + service_id_t service; }; Index: uspace/lib/c/include/vfs/vfs.h =================================================================== --- uspace/lib/c/include/vfs/vfs.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) +++ uspace/lib/c/include/vfs/vfs.h (revision 15f3c3fbb3cd87db466db2f9b1379fe5b0794299) @@ -38,5 +38,5 @@ #include #include -#include +#include #include @@ -49,5 +49,5 @@ typedef struct { fs_handle_t fs_handle; - devmap_handle_t devmap_handle; + service_id_t service_id; fs_index_t index; } fdi_node_t;