Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ uspace/lib/c/Makefile (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -64,5 +64,4 @@ generic/cap.c \ generic/clipboard.c \ - generic/devmap.c \ generic/devman.c \ generic/device/hw_res.c \ @@ -71,4 +70,5 @@ generic/event.c \ generic/errno.c \ + generic/loc.c \ generic/mem.c \ generic/str.c \ Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ uspace/lib/c/generic/devman.c (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -271,14 +271,14 @@ } -int devman_add_device_to_class(devman_handle_t devman_handle, - const char *class_name) +int devman_add_device_to_category(devman_handle_t devman_handle, + const char *cat_name) { async_exch_t *exch = devman_exchange_begin_blocking(DEVMAN_DRIVER); ipc_call_t answer; - aid_t req = async_send_1(exch, DEVMAN_ADD_DEVICE_TO_CLASS, + aid_t req = async_send_1(exch, DEVMAN_ADD_DEVICE_TO_CATEGORY, devman_handle, &answer); - sysarg_t retval = async_data_write_start(exch, class_name, - str_size(class_name)); + sysarg_t retval = async_data_write_start(exch, cat_name, + str_size(cat_name)); devman_exchange_end(exch); @@ -308,4 +308,23 @@ } +/** Remove function from device. + * + * Request devman to remove function owned by this driver task. + * @param funh Devman handle of the function + * + * @return EOK on success or negative error code. + */ +int devman_remove_function(devman_handle_t funh) +{ + async_exch_t *exch; + sysarg_t retval; + + exch = devman_exchange_begin_blocking(DEVMAN_DRIVER); + retval = async_req_1_0(exch, DEVMAN_REMOVE_FUNCTION, (sysarg_t) funh); + devman_exchange_end(exch); + + return (int) retval; +} + async_sess_t *devman_parent_device_connect(exch_mgmt_t mgmt, devman_handle_t handle, unsigned int flags) @@ -333,5 +352,5 @@ exch = devman_exchange_begin(DEVMAN_CLIENT); if (exch == NULL) - return errno; + return ENOMEM; } @@ -364,59 +383,9 @@ } -int devman_device_get_handle_by_class(const char *classname, - const char *devname, devman_handle_t *handle, unsigned int flags) -{ - async_exch_t *exch; - - if (flags & IPC_FLAG_BLOCKING) - exch = devman_exchange_begin_blocking(DEVMAN_CLIENT); - else { - exch = devman_exchange_begin(DEVMAN_CLIENT); - if (exch == NULL) - return errno; - } - - ipc_call_t answer; - aid_t req = async_send_1(exch, DEVMAN_DEVICE_GET_HANDLE_BY_CLASS, - flags, &answer); - sysarg_t retval = async_data_write_start(exch, classname, - str_size(classname)); - - if (retval != EOK) { - devman_exchange_end(exch); - async_wait_for(req, NULL); - return retval; - } - - retval = async_data_write_start(exch, devname, - str_size(devname)); - - devman_exchange_end(exch); - - if (retval != EOK) { - async_wait_for(req, NULL); - return retval; - } - - async_wait_for(req, &retval); - - if (retval != EOK) { - if (handle != NULL) - *handle = (devman_handle_t) -1; - - return retval; - } - - if (handle != NULL) - *handle = (devman_handle_t) IPC_GET_ARG1(answer); - - return retval; -} - int devman_get_device_path(devman_handle_t handle, char *path, size_t path_size) { async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT); if (exch == NULL) - return errno; + return ENOMEM; ipc_call_t answer; @@ -463,4 +432,17 @@ } +int devman_fun_sid_to_handle(service_id_t sid, devman_handle_t *handle) +{ + async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT); + if (exch == NULL) + return ENOMEM; + + sysarg_t retval = async_req_1_1(exch, DEVMAN_FUN_SID_TO_HANDLE, + sid, handle); + + devman_exchange_end(exch); + return (int) retval; +} + /** @} */ Index: uspace/lib/c/generic/devmap.c =================================================================== --- uspace/lib/c/generic/devmap.c (revision d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ (revision ) @@ -1,521 +1,0 @@ -/* - * Copyright (c) 2007 Josef Cejka - * 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. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static FIBRIL_MUTEX_INITIALIZE(devmap_driver_block_mutex); -static FIBRIL_MUTEX_INITIALIZE(devmap_client_block_mutex); - -static FIBRIL_MUTEX_INITIALIZE(devmap_driver_mutex); -static FIBRIL_MUTEX_INITIALIZE(devmap_client_mutex); - -static async_sess_t *devmap_driver_block_sess = NULL; -static async_sess_t *devmap_client_block_sess = NULL; - -static async_sess_t *devmap_driver_sess = NULL; -static async_sess_t *devmap_client_sess = NULL; - -static void clone_session(fibril_mutex_t *mtx, async_sess_t *src, - async_sess_t **dst) -{ - fibril_mutex_lock(mtx); - - if ((*dst == NULL) && (src != NULL)) - *dst = src; - - fibril_mutex_unlock(mtx); -} - -/** Start an async exchange on the devmap session (blocking). - * - * @param iface Device mapper interface to choose - * - * @return New exchange. - * - */ -async_exch_t *devmap_exchange_begin_blocking(devmap_interface_t iface) -{ - switch (iface) { - case DEVMAP_DRIVER: - fibril_mutex_lock(&devmap_driver_block_mutex); - - while (devmap_driver_block_sess == NULL) { - clone_session(&devmap_driver_mutex, devmap_driver_sess, - &devmap_driver_block_sess); - - if (devmap_driver_block_sess == NULL) - devmap_driver_block_sess = - service_connect_blocking(EXCHANGE_SERIALIZE, - SERVICE_DEVMAP, DEVMAP_DRIVER, 0); - } - - fibril_mutex_unlock(&devmap_driver_block_mutex); - - clone_session(&devmap_driver_mutex, devmap_driver_block_sess, - &devmap_driver_sess); - - return async_exchange_begin(devmap_driver_block_sess); - case DEVMAP_CLIENT: - fibril_mutex_lock(&devmap_client_block_mutex); - - while (devmap_client_block_sess == NULL) { - clone_session(&devmap_client_mutex, devmap_client_sess, - &devmap_client_block_sess); - - if (devmap_client_block_sess == NULL) - devmap_client_block_sess = - service_connect_blocking(EXCHANGE_SERIALIZE, - SERVICE_DEVMAP, DEVMAP_CLIENT, 0); - } - - fibril_mutex_unlock(&devmap_client_block_mutex); - - clone_session(&devmap_client_mutex, devmap_client_block_sess, - &devmap_client_sess); - - return async_exchange_begin(devmap_client_block_sess); - default: - return NULL; - } -} - -/** Start an async exchange on the devmap session. - * - * @param iface Device mapper interface to choose - * - * @return New exchange. - * - */ -async_exch_t *devmap_exchange_begin(devmap_interface_t iface) -{ - switch (iface) { - case DEVMAP_DRIVER: - fibril_mutex_lock(&devmap_driver_mutex); - - if (devmap_driver_sess == NULL) - devmap_driver_sess = - service_connect(EXCHANGE_SERIALIZE, SERVICE_DEVMAP, - DEVMAP_DRIVER, 0); - - fibril_mutex_unlock(&devmap_driver_mutex); - - if (devmap_driver_sess == NULL) - return NULL; - - return async_exchange_begin(devmap_driver_sess); - case DEVMAP_CLIENT: - fibril_mutex_lock(&devmap_client_mutex); - - if (devmap_client_sess == NULL) - devmap_client_sess = - service_connect(EXCHANGE_SERIALIZE, SERVICE_DEVMAP, - DEVMAP_CLIENT, 0); - - fibril_mutex_unlock(&devmap_client_mutex); - - if (devmap_client_sess == NULL) - return NULL; - - return async_exchange_begin(devmap_client_sess); - default: - return NULL; - } -} - -/** Finish an async exchange on the devmap session. - * - * @param exch Exchange to be finished. - * - */ -void devmap_exchange_end(async_exch_t *exch) -{ - async_exchange_end(exch); -} - -/** Register new driver with devmap. */ -int devmap_driver_register(const char *name, async_client_conn_t conn) -{ - async_exch_t *exch = devmap_exchange_begin_blocking(DEVMAP_DRIVER); - - ipc_call_t answer; - aid_t req = async_send_2(exch, DEVMAP_DRIVER_REGISTER, 0, 0, &answer); - sysarg_t retval = async_data_write_start(exch, name, str_size(name)); - - devmap_exchange_end(exch); - - if (retval != EOK) { - async_wait_for(req, NULL); - return retval; - } - - async_set_client_connection(conn); - - exch = devmap_exchange_begin(DEVMAP_DRIVER); - async_connect_to_me(exch, 0, 0, 0, NULL, NULL); - devmap_exchange_end(exch); - - async_wait_for(req, &retval); - return retval; -} - -/** Register new device. - * - * The @p interface is used when forwarding connection to the driver. - * If not 0, the first argument is the interface and the second argument - * is the devmap handle of the device. - * - * When the interface is zero (default), the first argument is directly - * the handle (to ensure backward compatibility). - * - * @param fqdn Fully qualified device name. - * @param[out] handle Handle to the created instance of device. - * @param interface Interface when forwarding. - * - */ -int devmap_device_register_with_iface(const char *fqdn, - devmap_handle_t *handle, sysarg_t interface) -{ - async_exch_t *exch = devmap_exchange_begin_blocking(DEVMAP_DRIVER); - - ipc_call_t answer; - aid_t req = async_send_2(exch, DEVMAP_DEVICE_REGISTER, interface, 0, - &answer); - sysarg_t retval = async_data_write_start(exch, fqdn, str_size(fqdn)); - - devmap_exchange_end(exch); - - if (retval != EOK) { - async_wait_for(req, NULL); - return retval; - } - - async_wait_for(req, &retval); - - if (retval != EOK) { - if (handle != NULL) - *handle = -1; - - return retval; - } - - if (handle != NULL) - *handle = (devmap_handle_t) IPC_GET_ARG1(answer); - - return retval; -} - -/** Register new device. - * - * @param fqdn Fully qualified device name. - * @param handle Output: Handle to the created instance of device. - * - */ -int devmap_device_register(const char *fqdn, devmap_handle_t *handle) -{ - return devmap_device_register_with_iface(fqdn, handle, 0); -} - -int devmap_device_get_handle(const char *fqdn, devmap_handle_t *handle, - unsigned int flags) -{ - async_exch_t *exch; - - if (flags & IPC_FLAG_BLOCKING) - exch = devmap_exchange_begin_blocking(DEVMAP_CLIENT); - else { - exch = devmap_exchange_begin(DEVMAP_CLIENT); - if (exch == NULL) - return errno; - } - - ipc_call_t answer; - aid_t req = async_send_2(exch, DEVMAP_DEVICE_GET_HANDLE, flags, 0, - &answer); - sysarg_t retval = async_data_write_start(exch, fqdn, str_size(fqdn)); - - devmap_exchange_end(exch); - - if (retval != EOK) { - async_wait_for(req, NULL); - return retval; - } - - async_wait_for(req, &retval); - - if (retval != EOK) { - if (handle != NULL) - *handle = (devmap_handle_t) -1; - - return retval; - } - - if (handle != NULL) - *handle = (devmap_handle_t) IPC_GET_ARG1(answer); - - return retval; -} - -int devmap_namespace_get_handle(const char *name, devmap_handle_t *handle, - unsigned int flags) -{ - async_exch_t *exch; - - if (flags & IPC_FLAG_BLOCKING) - exch = devmap_exchange_begin_blocking(DEVMAP_CLIENT); - else { - exch = devmap_exchange_begin(DEVMAP_CLIENT); - if (exch == NULL) - return errno; - } - - ipc_call_t answer; - aid_t req = async_send_2(exch, DEVMAP_NAMESPACE_GET_HANDLE, flags, 0, - &answer); - sysarg_t retval = async_data_write_start(exch, name, str_size(name)); - - devmap_exchange_end(exch); - - if (retval != EOK) { - async_wait_for(req, NULL); - return retval; - } - - async_wait_for(req, &retval); - - if (retval != EOK) { - if (handle != NULL) - *handle = (devmap_handle_t) -1; - - return retval; - } - - if (handle != NULL) - *handle = (devmap_handle_t) IPC_GET_ARG1(answer); - - return retval; -} - -devmap_handle_type_t devmap_handle_probe(devmap_handle_t handle) -{ - async_exch_t *exch = devmap_exchange_begin_blocking(DEVMAP_CLIENT); - - sysarg_t type; - int retval = async_req_1_1(exch, DEVMAP_HANDLE_PROBE, handle, &type); - - devmap_exchange_end(exch); - - if (retval != EOK) - return DEV_HANDLE_NONE; - - return (devmap_handle_type_t) type; -} - -async_sess_t *devmap_device_connect(exch_mgmt_t mgmt, devmap_handle_t handle, - unsigned int flags) -{ - async_sess_t *sess; - - if (flags & IPC_FLAG_BLOCKING) - sess = service_connect_blocking(mgmt, SERVICE_DEVMAP, - DEVMAP_CONNECT_TO_DEVICE, handle); - else - sess = service_connect(mgmt, SERVICE_DEVMAP, - DEVMAP_CONNECT_TO_DEVICE, handle); - - return sess; -} - -int devmap_null_create(void) -{ - async_exch_t *exch = devmap_exchange_begin_blocking(DEVMAP_CLIENT); - - sysarg_t null_id; - int retval = async_req_0_1(exch, DEVMAP_NULL_CREATE, &null_id); - - devmap_exchange_end(exch); - - if (retval != EOK) - return -1; - - return (int) null_id; -} - -void devmap_null_destroy(int null_id) -{ - async_exch_t *exch = devmap_exchange_begin_blocking(DEVMAP_CLIENT); - async_req_1_0(exch, DEVMAP_NULL_DESTROY, (sysarg_t) null_id); - devmap_exchange_end(exch); -} - -static size_t devmap_count_namespaces_internal(async_exch_t *exch) -{ - sysarg_t count; - int retval = async_req_0_1(exch, DEVMAP_GET_NAMESPACE_COUNT, &count); - if (retval != EOK) - return 0; - - return count; -} - -static size_t devmap_count_devices_internal(async_exch_t *exch, - devmap_handle_t ns_handle) -{ - sysarg_t count; - int retval = async_req_1_1(exch, DEVMAP_GET_DEVICE_COUNT, ns_handle, - &count); - if (retval != EOK) - return 0; - - return count; -} - -size_t devmap_count_namespaces(void) -{ - async_exch_t *exch = devmap_exchange_begin_blocking(DEVMAP_CLIENT); - size_t size = devmap_count_namespaces_internal(exch); - devmap_exchange_end(exch); - - return size; -} - -size_t devmap_count_devices(devmap_handle_t ns_handle) -{ - async_exch_t *exch = devmap_exchange_begin_blocking(DEVMAP_CLIENT); - size_t size = devmap_count_devices_internal(exch, ns_handle); - devmap_exchange_end(exch); - - return size; -} - -size_t devmap_get_namespaces(dev_desc_t **data) -{ - /* Loop until namespaces read succesful */ - while (true) { - async_exch_t *exch = devmap_exchange_begin_blocking(DEVMAP_CLIENT); - size_t count = devmap_count_namespaces_internal(exch); - devmap_exchange_end(exch); - - if (count == 0) - return 0; - - dev_desc_t *devs = (dev_desc_t *) calloc(count, sizeof(dev_desc_t)); - if (devs == NULL) - return 0; - - exch = devmap_exchange_begin(DEVMAP_CLIENT); - - ipc_call_t answer; - aid_t req = async_send_0(exch, DEVMAP_GET_NAMESPACES, &answer); - int rc = async_data_read_start(exch, devs, count * sizeof(dev_desc_t)); - - devmap_exchange_end(exch); - - if (rc == EOVERFLOW) { - /* - * Number of namespaces has changed since - * the last call of DEVMAP_DEVICE_GET_NAMESPACE_COUNT - */ - free(devs); - continue; - } - - if (rc != EOK) { - async_wait_for(req, NULL); - free(devs); - return 0; - } - - sysarg_t retval; - async_wait_for(req, &retval); - - if (retval != EOK) - return 0; - - *data = devs; - return count; - } -} - -size_t devmap_get_devices(devmap_handle_t ns_handle, dev_desc_t **data) -{ - /* Loop until devices read succesful */ - while (true) { - async_exch_t *exch = devmap_exchange_begin_blocking(DEVMAP_CLIENT); - size_t count = devmap_count_devices_internal(exch, ns_handle); - devmap_exchange_end(exch); - - if (count == 0) - return 0; - - dev_desc_t *devs = (dev_desc_t *) calloc(count, sizeof(dev_desc_t)); - if (devs == NULL) - return 0; - - exch = devmap_exchange_begin(DEVMAP_CLIENT); - - ipc_call_t answer; - aid_t req = async_send_1(exch, DEVMAP_GET_DEVICES, ns_handle, &answer); - int rc = async_data_read_start(exch, devs, count * sizeof(dev_desc_t)); - - devmap_exchange_end(exch); - - if (rc == EOVERFLOW) { - /* - * Number of devices has changed since - * the last call of DEVMAP_DEVICE_GET_DEVICE_COUNT - */ - free(devs); - continue; - } - - if (rc != EOK) { - async_wait_for(req, NULL); - free(devs); - return 0; - } - - sysarg_t retval; - async_wait_for(req, &retval); - - if (retval != EOK) - return 0; - - *data = devs; - return count; - } -} Index: uspace/lib/c/generic/io/io.c =================================================================== --- uspace/lib/c/generic/io/io.c (revision d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ uspace/lib/c/generic/io/io.c (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -45,5 +45,5 @@ #include #include -#include +#include #include #include "../private/io.h" Index: uspace/lib/c/generic/loc.c =================================================================== --- uspace/lib/c/generic/loc.c (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) +++ uspace/lib/c/generic/loc.c (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -0,0 +1,876 @@ +/* + * 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. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static FIBRIL_MUTEX_INITIALIZE(loc_supp_block_mutex); +static FIBRIL_MUTEX_INITIALIZE(loc_cons_block_mutex); + +static FIBRIL_MUTEX_INITIALIZE(loc_supplier_mutex); +static FIBRIL_MUTEX_INITIALIZE(loc_consumer_mutex); + +static FIBRIL_MUTEX_INITIALIZE(loc_callback_mutex); +static bool loc_callback_created = false; + +static async_sess_t *loc_supp_block_sess = NULL; +static async_sess_t *loc_cons_block_sess = NULL; + +static async_sess_t *loc_supplier_sess = NULL; +static async_sess_t *loc_consumer_sess = NULL; + +static loc_cat_change_cb_t cat_change_cb = NULL; + +static void loc_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + loc_cat_change_cb_t cb_fun; + + while (true) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) { + /* TODO: Handle hangup */ + return; + } + + int retval; + + switch (IPC_GET_IMETHOD(call)) { + case LOC_EVENT_CAT_CHANGE: + fibril_mutex_lock(&loc_callback_mutex); + cb_fun = cat_change_cb; + if (cb_fun != NULL) { + (*cb_fun)(); + } + fibril_mutex_unlock(&loc_callback_mutex); + retval = 0; + break; + default: + retval = ENOTSUP; + } + + async_answer_0(callid, retval); + } +} + + +static void clone_session(fibril_mutex_t *mtx, async_sess_t *src, + async_sess_t **dst) +{ + fibril_mutex_lock(mtx); + + if ((*dst == NULL) && (src != NULL)) + *dst = src; + + fibril_mutex_unlock(mtx); +} + +static int loc_callback_create(void) +{ + async_exch_t *exch; + sysarg_t retval; + int rc = EOK; + + fibril_mutex_lock(&loc_callback_mutex); + + if (!loc_callback_created) { + exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + + ipc_call_t answer; + aid_t req = async_send_0(exch, LOC_CALLBACK_CREATE, &answer); + async_connect_to_me(exch, 0, 0, 0, loc_cb_conn, NULL); + loc_exchange_end(exch); + + async_wait_for(req, &retval); + if (rc != EOK) + goto done; + + if (retval != EOK) { + rc = retval; + goto done; + } + + loc_callback_created = true; + } + + rc = EOK; +done: + fibril_mutex_unlock(&loc_callback_mutex); + return rc; +} + +/** Start an async exchange on the loc session (blocking). + * + * @param iface Location service interface to choose + * + * @return New exchange. + * + */ +async_exch_t *loc_exchange_begin_blocking(loc_interface_t iface) +{ + switch (iface) { + case LOC_PORT_SUPPLIER: + fibril_mutex_lock(&loc_supp_block_mutex); + + while (loc_supp_block_sess == NULL) { + clone_session(&loc_supplier_mutex, loc_supplier_sess, + &loc_supp_block_sess); + + if (loc_supp_block_sess == NULL) + loc_supp_block_sess = + service_connect_blocking(EXCHANGE_SERIALIZE, + SERVICE_LOC, LOC_PORT_SUPPLIER, 0); + } + + fibril_mutex_unlock(&loc_supp_block_mutex); + + clone_session(&loc_supplier_mutex, loc_supp_block_sess, + &loc_supplier_sess); + + return async_exchange_begin(loc_supp_block_sess); + case LOC_PORT_CONSUMER: + fibril_mutex_lock(&loc_cons_block_mutex); + + while (loc_cons_block_sess == NULL) { + clone_session(&loc_consumer_mutex, loc_consumer_sess, + &loc_cons_block_sess); + + if (loc_cons_block_sess == NULL) + loc_cons_block_sess = + service_connect_blocking(EXCHANGE_SERIALIZE, + SERVICE_LOC, LOC_PORT_CONSUMER, 0); + } + + fibril_mutex_unlock(&loc_cons_block_mutex); + + clone_session(&loc_consumer_mutex, loc_cons_block_sess, + &loc_consumer_sess); + + return async_exchange_begin(loc_cons_block_sess); + default: + return NULL; + } +} + +/** Start an async exchange on the loc session. + * + * @param iface Location service interface to choose + * + * @return New exchange. + * + */ +async_exch_t *loc_exchange_begin(loc_interface_t iface) +{ + switch (iface) { + case LOC_PORT_SUPPLIER: + fibril_mutex_lock(&loc_supplier_mutex); + + if (loc_supplier_sess == NULL) + loc_supplier_sess = + service_connect(EXCHANGE_SERIALIZE, SERVICE_LOC, + LOC_PORT_SUPPLIER, 0); + + fibril_mutex_unlock(&loc_supplier_mutex); + + if (loc_supplier_sess == NULL) + return NULL; + + return async_exchange_begin(loc_supplier_sess); + case LOC_PORT_CONSUMER: + fibril_mutex_lock(&loc_consumer_mutex); + + if (loc_consumer_sess == NULL) + loc_consumer_sess = + service_connect(EXCHANGE_SERIALIZE, SERVICE_LOC, + LOC_PORT_CONSUMER, 0); + + fibril_mutex_unlock(&loc_consumer_mutex); + + if (loc_consumer_sess == NULL) + return NULL; + + return async_exchange_begin(loc_consumer_sess); + default: + return NULL; + } +} + +/** Finish an async exchange on the loc session. + * + * @param exch Exchange to be finished. + * + */ +void loc_exchange_end(async_exch_t *exch) +{ + async_exchange_end(exch); +} + +/** Register new driver with loc. */ +int loc_server_register(const char *name, async_client_conn_t conn) +{ + async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER); + + ipc_call_t answer; + aid_t req = async_send_2(exch, LOC_SERVER_REGISTER, 0, 0, &answer); + sysarg_t retval = async_data_write_start(exch, name, str_size(name)); + + loc_exchange_end(exch); + + if (retval != EOK) { + async_wait_for(req, NULL); + return retval; + } + + async_set_client_connection(conn); + + exch = loc_exchange_begin(LOC_PORT_SUPPLIER); + async_connect_to_me(exch, 0, 0, 0, NULL, NULL); + loc_exchange_end(exch); + + async_wait_for(req, &retval); + return retval; +} + +/** Register new service. + * + * The @p interface is used when forwarding connection to the server. + * If not 0, the first argument is the interface and the second argument + * is the service ID. + * + * When the interface is zero (default), the first argument is directly + * the handle (to ensure backward compatibility). + * + * @param fqsn Fully qualified service name + * @param[out] sid Service ID of new service + * @param interface Interface when forwarding + * + */ +int loc_service_register_with_iface(const char *fqsn, + service_id_t *sid, sysarg_t interface) +{ + async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER); + + ipc_call_t answer; + aid_t req = async_send_2(exch, LOC_SERVICE_REGISTER, interface, 0, + &answer); + sysarg_t retval = async_data_write_start(exch, fqsn, str_size(fqsn)); + + loc_exchange_end(exch); + + if (retval != EOK) { + async_wait_for(req, NULL); + return retval; + } + + async_wait_for(req, &retval); + + if (retval != EOK) { + if (sid != NULL) + *sid = -1; + + return retval; + } + + if (sid != NULL) + *sid = (service_id_t) IPC_GET_ARG1(answer); + + return retval; +} + +/** Register new service. + * + * @param fqsn Fully qualified service name + * @param sid Output: ID of new service + * + */ +int loc_service_register(const char *fqdn, service_id_t *sid) +{ + return loc_service_register_with_iface(fqdn, sid, 0); +} + +/** Unregister service. + * + * @param sid Service ID + */ +int loc_service_unregister(service_id_t sid) +{ + async_exch_t *exch; + sysarg_t retval; + + exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER); + retval = async_req_1_0(exch, LOC_SERVICE_UNREGISTER, sid); + loc_exchange_end(exch); + + return (int)retval; +} + +int loc_service_get_id(const char *fqdn, service_id_t *handle, + unsigned int flags) +{ + async_exch_t *exch; + + if (flags & IPC_FLAG_BLOCKING) + exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + else { + exch = loc_exchange_begin(LOC_PORT_CONSUMER); + if (exch == NULL) + return errno; + } + + ipc_call_t answer; + aid_t req = async_send_2(exch, LOC_SERVICE_GET_ID, flags, 0, + &answer); + sysarg_t retval = async_data_write_start(exch, fqdn, str_size(fqdn)); + + loc_exchange_end(exch); + + if (retval != EOK) { + async_wait_for(req, NULL); + return retval; + } + + async_wait_for(req, &retval); + + if (retval != EOK) { + if (handle != NULL) + *handle = (service_id_t) -1; + + return retval; + } + + if (handle != NULL) + *handle = (service_id_t) IPC_GET_ARG1(answer); + + return retval; +} + +/** Get object name. + * + * Provided ID of an object, return its name. + * + * @param method IPC method + * @param id Object ID + * @param name Place to store pointer to new string. Caller should + * free it using free(). + * @return EOK on success or negative error code + */ +static int loc_get_name_internal(sysarg_t method, sysarg_t id, char **name) +{ + async_exch_t *exch; + char name_buf[LOC_NAME_MAXLEN + 1]; + ipc_call_t dreply; + size_t act_size; + sysarg_t dretval; + + *name = NULL; + exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + + ipc_call_t answer; + aid_t req = async_send_1(exch, method, id, &answer); + aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, + &dreply); + async_wait_for(dreq, &dretval); + + loc_exchange_end(exch); + + if (dretval != EOK) { + async_wait_for(req, NULL); + return dretval; + } + + sysarg_t retval; + async_wait_for(req, &retval); + + if (retval != EOK) + return retval; + + act_size = IPC_GET_ARG2(dreply); + assert(act_size <= LOC_NAME_MAXLEN); + name_buf[act_size] = '\0'; + + *name = str_dup(name_buf); + if (*name == NULL) + return ENOMEM; + + return EOK; +} + +/** Get category name. + * + * Provided ID of a service, return its name. + * + * @param cat_id Category ID + * @param name Place to store pointer to new string. Caller should + * free it using free(). + * @return EOK on success or negative error code + */ +int loc_category_get_name(category_id_t cat_id, char **name) +{ + return loc_get_name_internal(LOC_CATEGORY_GET_NAME, cat_id, name); +} + +/** Get service name. + * + * Provided ID of a service, return its name. + * + * @param svc_id Service ID + * @param name Place to store pointer to new string. Caller should + * free it using free(). + * @return EOK on success or negative error code + */ +int loc_service_get_name(service_id_t svc_id, char **name) +{ + return loc_get_name_internal(LOC_SERVICE_GET_NAME, svc_id, name); +} + +int loc_namespace_get_id(const char *name, service_id_t *handle, + unsigned int flags) +{ + async_exch_t *exch; + + if (flags & IPC_FLAG_BLOCKING) + exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + else { + exch = loc_exchange_begin(LOC_PORT_CONSUMER); + if (exch == NULL) + return errno; + } + + ipc_call_t answer; + aid_t req = async_send_2(exch, LOC_NAMESPACE_GET_ID, flags, 0, + &answer); + sysarg_t retval = async_data_write_start(exch, name, str_size(name)); + + loc_exchange_end(exch); + + if (retval != EOK) { + async_wait_for(req, NULL); + return retval; + } + + async_wait_for(req, &retval); + + if (retval != EOK) { + if (handle != NULL) + *handle = (service_id_t) -1; + + return retval; + } + + if (handle != NULL) + *handle = (service_id_t) IPC_GET_ARG1(answer); + + return retval; +} + +/** Get category ID. + * + * Provided name of a category, return its ID. + * + * @param name Category name + * @param cat_id Place to store ID + * @param flags IPC_FLAG_BLOCKING to wait for location service to start + * @return EOK on success or negative error code + */ +int loc_category_get_id(const char *name, category_id_t *cat_id, + unsigned int flags) +{ + async_exch_t *exch; + + if (flags & IPC_FLAG_BLOCKING) + exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + else { + exch = loc_exchange_begin(LOC_PORT_CONSUMER); + if (exch == NULL) + return errno; + } + + ipc_call_t answer; + aid_t req = async_send_0(exch, LOC_CATEGORY_GET_ID, + &answer); + sysarg_t retval = async_data_write_start(exch, name, str_size(name)); + + loc_exchange_end(exch); + + if (retval != EOK) { + async_wait_for(req, NULL); + return retval; + } + + async_wait_for(req, &retval); + + if (retval != EOK) { + if (cat_id != NULL) + *cat_id = (category_id_t) -1; + + return retval; + } + + if (cat_id != NULL) + *cat_id = (category_id_t) IPC_GET_ARG1(answer); + + return retval; +} + + +loc_object_type_t loc_id_probe(service_id_t handle) +{ + async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + + sysarg_t type; + int retval = async_req_1_1(exch, LOC_ID_PROBE, handle, &type); + + loc_exchange_end(exch); + + if (retval != EOK) + return LOC_OBJECT_NONE; + + return (loc_object_type_t) type; +} + +async_sess_t *loc_service_connect(exch_mgmt_t mgmt, service_id_t handle, + unsigned int flags) +{ + async_sess_t *sess; + + if (flags & IPC_FLAG_BLOCKING) + sess = service_connect_blocking(mgmt, SERVICE_LOC, + LOC_CONNECT_TO_SERVICE, handle); + else + sess = service_connect(mgmt, SERVICE_LOC, + LOC_CONNECT_TO_SERVICE, handle); + + return sess; +} + +int loc_null_create(void) +{ + async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + + sysarg_t null_id; + int retval = async_req_0_1(exch, LOC_NULL_CREATE, &null_id); + + loc_exchange_end(exch); + + if (retval != EOK) + return -1; + + return (int) null_id; +} + +void loc_null_destroy(int null_id) +{ + async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + async_req_1_0(exch, LOC_NULL_DESTROY, (sysarg_t) null_id); + loc_exchange_end(exch); +} + +static size_t loc_count_namespaces_internal(async_exch_t *exch) +{ + sysarg_t count; + int retval = async_req_0_1(exch, LOC_GET_NAMESPACE_COUNT, &count); + if (retval != EOK) + return 0; + + return count; +} + +/** Add service to category. + * + * @param svc_id Service ID + * @param cat_id Category ID + * @return EOK on success or negative error code + */ +int loc_service_add_to_cat(service_id_t svc_id, service_id_t cat_id) +{ + async_exch_t *exch; + sysarg_t retval; + + exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER); + retval = async_req_2_0(exch, LOC_SERVICE_ADD_TO_CAT, svc_id, cat_id); + loc_exchange_end(exch); + + return retval; +} + +static size_t loc_count_services_internal(async_exch_t *exch, + service_id_t ns_handle) +{ + sysarg_t count; + int retval = async_req_1_1(exch, LOC_GET_SERVICE_COUNT, ns_handle, + &count); + if (retval != EOK) + return 0; + + return count; +} + +size_t loc_count_namespaces(void) +{ + async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + size_t size = loc_count_namespaces_internal(exch); + loc_exchange_end(exch); + + return size; +} + +size_t loc_count_services(service_id_t ns_handle) +{ + async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + size_t size = loc_count_services_internal(exch, ns_handle); + loc_exchange_end(exch); + + return size; +} + +size_t loc_get_namespaces(loc_sdesc_t **data) +{ + /* Loop until read is succesful */ + while (true) { + async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + size_t count = loc_count_namespaces_internal(exch); + loc_exchange_end(exch); + + if (count == 0) + return 0; + + loc_sdesc_t *devs = (loc_sdesc_t *) calloc(count, sizeof(loc_sdesc_t)); + if (devs == NULL) + return 0; + + exch = loc_exchange_begin(LOC_PORT_CONSUMER); + + ipc_call_t answer; + aid_t req = async_send_0(exch, LOC_GET_NAMESPACES, &answer); + int rc = async_data_read_start(exch, devs, count * sizeof(loc_sdesc_t)); + + loc_exchange_end(exch); + + if (rc == EOVERFLOW) { + /* + * Number of namespaces has changed since + * the last call of LOC_GET_NAMESPACE_COUNT + */ + free(devs); + continue; + } + + if (rc != EOK) { + async_wait_for(req, NULL); + free(devs); + return 0; + } + + sysarg_t retval; + async_wait_for(req, &retval); + + if (retval != EOK) + return 0; + + *data = devs; + return count; + } +} + +size_t loc_get_services(service_id_t ns_handle, loc_sdesc_t **data) +{ + /* Loop until read is succesful */ + while (true) { + async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + size_t count = loc_count_services_internal(exch, ns_handle); + loc_exchange_end(exch); + + if (count == 0) + return 0; + + loc_sdesc_t *devs = (loc_sdesc_t *) calloc(count, sizeof(loc_sdesc_t)); + if (devs == NULL) + return 0; + + exch = loc_exchange_begin(LOC_PORT_CONSUMER); + + ipc_call_t answer; + aid_t req = async_send_1(exch, LOC_GET_SERVICES, ns_handle, &answer); + int rc = async_data_read_start(exch, devs, count * sizeof(loc_sdesc_t)); + + loc_exchange_end(exch); + + if (rc == EOVERFLOW) { + /* + * Number of services has changed since + * the last call of LOC_GET_SERVICE_COUNT + */ + free(devs); + continue; + } + + if (rc != EOK) { + async_wait_for(req, NULL); + free(devs); + return 0; + } + + sysarg_t retval; + async_wait_for(req, &retval); + + if (retval != EOK) + return 0; + + *data = devs; + return count; + } +} + +static int loc_category_get_ids_once(sysarg_t method, sysarg_t arg1, + sysarg_t *id_buf, size_t buf_size, size_t *act_size) +{ + async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER); + + ipc_call_t answer; + aid_t req = async_send_1(exch, method, arg1, &answer); + int rc = async_data_read_start(exch, id_buf, buf_size); + + loc_exchange_end(exch); + + if (rc != EOK) { + async_wait_for(req, NULL); + return rc; + } + + sysarg_t retval; + async_wait_for(req, &retval); + + if (retval != EOK) { + return retval; + } + + *act_size = IPC_GET_ARG1(answer); + return EOK; +} + +/** Get list of IDs. + * + * Returns an allocated array of service IDs. + * + * @param method IPC method + * @param arg1 IPC argument 1 + * @param data Place to store pointer to array of IDs + * @param count Place to store number of IDs + * @return EOK on success or negative error code + */ +static int loc_get_ids_internal(sysarg_t method, sysarg_t arg1, + sysarg_t **data, size_t *count) +{ + service_id_t *ids; + size_t act_size; + size_t alloc_size; + int rc; + + *data = NULL; + act_size = 0; /* silence warning */ + + rc = loc_category_get_ids_once(method, arg1, NULL, 0, + &act_size); + if (rc != EOK) + return rc; + + alloc_size = act_size; + ids = malloc(alloc_size); + if (ids == NULL) + return ENOMEM; + + while (true) { + rc = loc_category_get_ids_once(method, arg1, ids, alloc_size, + &act_size); + if (rc != EOK) + return rc; + + if (act_size <= alloc_size) + break; + + alloc_size *= 2; + free(ids); + + ids = malloc(alloc_size); + if (ids == NULL) + return ENOMEM; + } + + *count = act_size / sizeof(category_id_t); + *data = ids; + return EOK; +} + +/** Get list of services in category. + * + * Returns an allocated array of service IDs. + * + * @param cat_id Category ID + * @param data Place to store pointer to array of IDs + * @param count Place to store number of IDs + * @return EOK on success or negative error code + */ +int loc_category_get_svcs(category_id_t cat_id, service_id_t **data, + size_t *count) +{ + return loc_get_ids_internal(LOC_CATEGORY_GET_SVCS, cat_id, + data, count); +} + +/** Get list of categories. + * + * Returns an allocated array of category IDs. + * + * @param data Place to store pointer to array of IDs + * @param count Place to store number of IDs + * @return EOK on success or negative error code + */ +int loc_get_categories(category_id_t **data, size_t *count) +{ + return loc_get_ids_internal(LOC_GET_CATEGORIES, 0, + data, count); +} + +int loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun) +{ + if (loc_callback_create() != EOK) + return EIO; + + cat_change_cb = cb_fun; + return EOK; +} Index: uspace/lib/c/generic/vfs/vfs.c =================================================================== --- uspace/lib/c/generic/vfs/vfs.c (revision d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ uspace/lib/c/generic/vfs/vfs.c (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -51,7 +51,7 @@ #include #include -#include +#include #include -#include +#include static FIBRIL_MUTEX_INITIALIZE(vfs_mutex); @@ -142,27 +142,27 @@ } -int mount(const char *fs_name, const char *mp, const char *fqdn, +int mount(const char *fs_name, const char *mp, const char *fqsn, const char *opts, unsigned int flags) { int null_id = -1; - char null[DEVMAP_NAME_MAXLEN]; - - if (str_cmp(fqdn, "") == 0) { + char null[LOC_NAME_MAXLEN]; + + if (str_cmp(fqsn, "") == 0) { /* No device specified, create a fresh null/%d device instead */ - null_id = devmap_null_create(); + null_id = loc_null_create(); if (null_id == -1) return ENOMEM; - snprintf(null, DEVMAP_NAME_MAXLEN, "null/%d", null_id); - fqdn = null; - } - - devmap_handle_t devmap_handle; - int res = devmap_device_get_handle(fqdn, &devmap_handle, flags); + snprintf(null, LOC_NAME_MAXLEN, "null/%d", null_id); + fqsn = null; + } + + service_id_t service_id; + int res = loc_service_get_id(fqsn, &service_id, flags); if (res != EOK) { if (null_id != -1) - devmap_null_destroy(null_id); + loc_null_destroy(null_id); return res; @@ -173,5 +173,5 @@ if (!mpa) { if (null_id != -1) - devmap_null_destroy(null_id); + loc_null_destroy(null_id); return ENOMEM; @@ -181,5 +181,5 @@ sysarg_t rc_orig; - aid_t req = async_send_2(exch, VFS_IN_MOUNT, devmap_handle, flags, NULL); + aid_t req = async_send_2(exch, VFS_IN_MOUNT, service_id, flags, NULL); sysarg_t rc = async_data_write_start(exch, (void *) mpa, mpa_size); if (rc != EOK) { @@ -189,5 +189,5 @@ if (null_id != -1) - devmap_null_destroy(null_id); + loc_null_destroy(null_id); if (rc_orig == EOK) @@ -204,5 +204,5 @@ if (null_id != -1) - devmap_null_destroy(null_id); + loc_null_destroy(null_id); if (rc_orig == EOK) @@ -219,5 +219,5 @@ if (null_id != -1) - devmap_null_destroy(null_id); + loc_null_destroy(null_id); if (rc_orig == EOK) @@ -235,5 +235,5 @@ if (null_id != -1) - devmap_null_destroy(null_id); + loc_null_destroy(null_id); if (rc_orig == EOK) @@ -248,5 +248,5 @@ if ((rc != EOK) && (null_id != -1)) - devmap_null_destroy(null_id); + loc_null_destroy(null_id); return (int) rc; @@ -792,10 +792,10 @@ } - if (!stat.device) { + if (!stat.service) { errno = ENOENT; return NULL; } - return devmap_device_connect(mgmt, stat.device, 0); + return loc_service_connect(mgmt, stat.service, 0); } Index: uspace/lib/c/include/devman.h =================================================================== --- uspace/lib/c/include/devman.h (revision d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ uspace/lib/c/include/devman.h (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -38,4 +38,5 @@ #include +#include #include #include @@ -48,4 +49,5 @@ extern int devman_add_function(const char *, fun_type_t, match_id_list_t *, devman_handle_t, devman_handle_t *); +extern int devman_remove_function(devman_handle_t); extern async_sess_t *devman_device_connect(exch_mgmt_t, devman_handle_t, @@ -56,9 +58,8 @@ extern int devman_device_get_handle(const char *, devman_handle_t *, unsigned int); -extern int devman_device_get_handle_by_class(const char *, const char *, - devman_handle_t *, unsigned int); extern int devman_get_device_path(devman_handle_t, char *, size_t); -extern int devman_add_device_to_class(devman_handle_t, const char *); +extern int devman_add_device_to_category(devman_handle_t, const char *); +extern int devman_fun_sid_to_handle(service_id_t, devman_handle_t *); #endif Index: uspace/lib/c/include/devmap.h =================================================================== --- uspace/lib/c/include/devmap.h (revision d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ (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 d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ uspace/lib/c/include/ipc/devman.h (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -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; @@ -138,6 +138,6 @@ DEVMAN_ADD_FUNCTION, DEVMAN_ADD_MATCH_ID, - DEVMAN_ADD_DEVICE_TO_CLASS - + DEVMAN_ADD_DEVICE_TO_CATEGORY, + DEVMAN_REMOVE_FUNCTION } driver_to_devman_t; @@ -149,6 +149,6 @@ typedef enum { DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD, - DEVMAN_DEVICE_GET_HANDLE_BY_CLASS, - DEVMAN_DEVICE_GET_DEVICE_PATH + DEVMAN_DEVICE_GET_DEVICE_PATH, + DEVMAN_FUN_SID_TO_HANDLE } client_to_devman_t; Index: uspace/lib/c/include/ipc/devmap.h =================================================================== --- uspace/lib/c/include/ipc/devmap.h (revision d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ (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 e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) +++ uspace/lib/c/include/ipc/loc.h (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -0,0 +1,98 @@ +/* + * 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 sysarg_t category_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_ADD_TO_CAT, + LOC_SERVICE_REGISTER, + LOC_SERVICE_UNREGISTER, + LOC_SERVICE_GET_ID, + LOC_SERVICE_GET_NAME, + LOC_NAMESPACE_GET_ID, + LOC_CALLBACK_CREATE, + LOC_CATEGORY_GET_ID, + LOC_CATEGORY_GET_NAME, + LOC_CATEGORY_GET_SVCS, + LOC_ID_PROBE, + LOC_NULL_CREATE, + LOC_NULL_DESTROY, + LOC_GET_NAMESPACE_COUNT, + LOC_GET_SERVICE_COUNT, + LOC_GET_CATEGORIES, + LOC_GET_NAMESPACES, + LOC_GET_SERVICES +} loc_request_t; + +typedef enum { + LOC_EVENT_CAT_CHANGE = IPC_FIRST_USER_METHOD +} 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; + 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 d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ uspace/lib/c/include/ipc/services.h (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -45,5 +45,5 @@ SERVICE_VIDEO = FOURCC('v', 'i', 'd', ' '), SERVICE_VFS = FOURCC('v', 'f', 's', ' '), - SERVICE_DEVMAP = FOURCC('d', 'e', 'v', 'p'), + SERVICE_LOC = FOURCC('l', 'o', 'c', ' '), SERVICE_DEVMAN = FOURCC('d', 'e', 'v', 'n'), SERVICE_IRC = FOURCC('i', 'r', 'c', ' '), Index: uspace/lib/c/include/loc.h =================================================================== --- uspace/lib/c/include/loc.h (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) +++ uspace/lib/c/include/loc.h (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -0,0 +1,84 @@ +/* + * 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 + +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 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_unregister(service_id_t); +extern int loc_service_add_to_cat(service_id_t, category_id_t); + +extern int loc_service_get_id(const char *, service_id_t *, + unsigned int); +extern int loc_service_get_name(service_id_t, char **); +extern int loc_namespace_get_id(const char *, service_id_t *, + unsigned int); +extern int loc_category_get_id(const char *, category_id_t *, + unsigned int); +extern int loc_category_get_name(category_id_t, char **); +extern int loc_category_get_svcs(category_id_t, category_id_t **, size_t *); +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 **); +extern int loc_get_categories(category_id_t **, size_t *); +extern int loc_register_cat_change_cb(loc_cat_change_cb_t); + + +#endif + +/** @} + */ Index: uspace/lib/c/include/sys/stat.h =================================================================== --- uspace/lib/c/include/sys/stat.h (revision d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ uspace/lib/c/include/sys/stat.h (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -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 d894fbdb1cbc656ff7db4a33f03a2d331d2b4837) +++ uspace/lib/c/include/vfs/vfs.h (revision e14a1031cc92bf3c52f3afbe8c19cb40e7e3d8ea) @@ -38,5 +38,5 @@ #include #include -#include +#include #include #include