Index: uspace/lib/libc/generic/devmap.c =================================================================== --- uspace/lib/libc/generic/devmap.c (revision 2246de644f7ce21502763784228e70ae8aa2aa3f) +++ uspace/lib/libc/generic/devmap.c (revision a095d202b1caf823b2b66c86fe55c5a3b8bdd306) @@ -36,27 +36,58 @@ #include -static int devmap_phone = -1; +static int devmap_phone_driver = -1; +static int devmap_phone_client = -1; /** Get phone to device mapper task. */ -static int devmap_get_phone(unsigned int flags) -{ - int phone; - - if (devmap_phone >= 0) - return devmap_phone; - - if (flags & IPC_FLAG_BLOCKING) { - phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP, - DEVMAP_CLIENT, 0); - } else { - phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, - DEVMAP_CLIENT, 0); - } - - if (phone < 0) - return phone; - - devmap_phone = phone; - return phone; +int devmap_get_phone(devmap_interface_t iface, unsigned int flags) +{ + switch (iface) { + case DEVMAP_DRIVER: + if (devmap_phone_driver >= 0) + return devmap_phone_driver; + + if (flags & IPC_FLAG_BLOCKING) + devmap_phone_driver = ipc_connect_me_to_blocking(PHONE_NS, + SERVICE_DEVMAP, DEVMAP_DRIVER, 0); + else + devmap_phone_driver = ipc_connect_me_to(PHONE_NS, + SERVICE_DEVMAP, DEVMAP_DRIVER, 0); + + return devmap_phone_driver; + case DEVMAP_CLIENT: + if (devmap_phone_client >= 0) + return devmap_phone_client; + + if (flags & IPC_FLAG_BLOCKING) + devmap_phone_client = ipc_connect_me_to_blocking(PHONE_NS, + SERVICE_DEVMAP, DEVMAP_CLIENT, 0); + else + devmap_phone_client = ipc_connect_me_to(PHONE_NS, + SERVICE_DEVMAP, DEVMAP_CLIENT, 0); + + return devmap_phone_client; + default: + return -1; + } +} + +void devmap_hangup_phone(devmap_interface_t iface) +{ + switch (iface) { + case DEVMAP_DRIVER: + if (devmap_phone_driver >= 0) { + ipc_hangup(devmap_phone_driver); + devmap_phone_driver = -1; + } + break; + case DEVMAP_CLIENT: + if (devmap_phone_client >= 0) { + ipc_hangup(devmap_phone_client); + devmap_phone_client = -1; + } + break; + default: + break; + } } @@ -64,58 +95,54 @@ int devmap_driver_register(const char *name, async_client_conn_t conn) { - ipcarg_t retval; - aid_t req; - ipc_call_t answer; - int phone; + int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING); + + if (phone < 0) + return phone; + + ipc_call_t answer; + aid_t req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer); + + ipcarg_t retval = ipc_data_write_start(phone, name, str_size(name) + 1); + + if (retval != EOK) { + async_wait_for(req, NULL); + return -1; + } + + async_set_client_connection(conn); + ipcarg_t callback_phonehash; - - phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP, - DEVMAP_DRIVER, 0); - - if (phone < 0) { + ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash); + async_wait_for(req, &retval); + + return retval; +} + +/** Register new device. + * + * @param name Device name. + * @param handle Output: Handle to the created instance of device. + * + */ +int devmap_device_register(const char *name, dev_handle_t *handle) +{ + int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING); + + if (phone < 0) return phone; - } - - req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer); - retval = ipc_data_write_start(phone, name, str_size(name) + 1); - - if (retval != EOK) { - async_wait_for(req, NULL); - ipc_hangup(phone); - return -1; - } - - async_set_client_connection(conn); - - ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash); - async_wait_for(req, &retval); - - return phone; -} - -int devmap_device_get_handle(const char *name, dev_handle_t *handle, - unsigned int flags) -{ - ipcarg_t retval; - aid_t req; - ipc_call_t answer; - int phone; - - phone = devmap_get_phone(flags); - if (phone < 0) - return phone; - - req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, flags, 0, + + ipc_call_t answer; + aid_t req = async_send_2(phone, DEVMAP_DEVICE_REGISTER, 0, 0, &answer); - - retval = ipc_data_write_start(phone, name, str_size(name) + 1); - - if (retval != EOK) { - async_wait_for(req, NULL); - return retval; - } - - async_wait_for(req, &retval); - + + ipcarg_t retval = ipc_data_write_start(phone, name, str_size(name) + 1); + + if (retval != EOK) { + async_wait_for(req, NULL); + return retval; + } + + async_wait_for(req, &retval); + if (retval != EOK) { if (handle != NULL) @@ -123,15 +150,47 @@ return retval; } - + if (handle != NULL) - *handle = (int) IPC_GET_ARG1(answer); - + *handle = (dev_handle_t) IPC_GET_ARG1(answer); + return retval; } +int devmap_device_get_handle(const char *name, dev_handle_t *handle, unsigned int flags) +{ + int phone = devmap_get_phone(DEVMAP_CLIENT, flags); + + if (phone < 0) + return phone; + + ipc_call_t answer; + aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, flags, 0, + &answer); + + ipcarg_t retval = ipc_data_write_start(phone, name, str_size(name) + 1); + + 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 = (dev_handle_t) IPC_GET_ARG1(answer); + + return retval; +} + int devmap_device_connect(dev_handle_t handle, unsigned int flags) { int phone; - + if (flags & IPC_FLAG_BLOCKING) { phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP, @@ -141,39 +200,45 @@ DEVMAP_CONNECT_TO_DEVICE, handle); } - + return phone; } -/** Register new device. - * - * @param driver_phone - * @param name Device name. - * @param handle Output: Handle to the created instance of device. - */ -int devmap_device_register(int driver_phone, const char *name, int *handle) -{ - ipcarg_t retval; - aid_t req; - ipc_call_t answer; - - req = async_send_2(driver_phone, DEVMAP_DEVICE_REGISTER, 0, 0, - &answer); - - retval = ipc_data_write_start(driver_phone, name, str_size(name) + 1); - - 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; - } - - *handle = (int) IPC_GET_ARG1(answer); - return retval; -} +ipcarg_t devmap_device_get_count(void) +{ + int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING); + + if (phone < 0) + return 0; + + ipcarg_t count; + int retval = ipc_call_sync_0_1(phone, DEVMAP_DEVICE_GET_COUNT, &count); + if (retval != EOK) + return 0; + + return count; +} + +ipcarg_t devmap_device_get_devices(ipcarg_t count, dev_desc_t *data) +{ + int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING); + + if (phone < 0) + return 0; + + ipc_call_t answer; + aid_t req = async_send_0(phone, DEVMAP_DEVICE_GET_DEVICES, &answer); + + ipcarg_t retval = ipc_data_read_start(phone, data, count * sizeof(dev_desc_t)); + + if (retval != EOK) { + async_wait_for(req, NULL); + return 0; + } + + async_wait_for(req, &retval); + + if (retval != EOK) + return 0; + + return IPC_GET_ARG1(answer); +} Index: uspace/lib/libc/include/devmap.h =================================================================== --- uspace/lib/libc/include/devmap.h (revision 2246de644f7ce21502763784228e70ae8aa2aa3f) +++ uspace/lib/libc/include/devmap.h (revision a095d202b1caf823b2b66c86fe55c5a3b8bdd306) @@ -39,11 +39,15 @@ #include -typedef int dev_handle_t; +extern int devmap_get_phone(devmap_interface_t, unsigned int); +extern void devmap_hangup_phone(devmap_interface_t iface); extern int devmap_driver_register(const char *, async_client_conn_t); -extern int devmap_device_get_handle(const char *, dev_handle_t *, - unsigned int); +extern int devmap_device_register(const char *, dev_handle_t *); + +extern int devmap_device_get_handle(const char *, dev_handle_t *, unsigned int); extern int devmap_device_connect(dev_handle_t, unsigned int); -extern int devmap_device_register(int, const char *, int *); + +extern ipcarg_t devmap_device_get_count(void); +extern ipcarg_t devmap_device_get_devices(ipcarg_t, dev_desc_t *); #endif Index: uspace/lib/libc/include/ipc/devmap.h =================================================================== --- uspace/lib/libc/include/ipc/devmap.h (revision 2246de644f7ce21502763784228e70ae8aa2aa3f) +++ uspace/lib/libc/include/ipc/devmap.h (revision a095d202b1caf823b2b66c86fe55c5a3b8bdd306) @@ -38,5 +38,7 @@ #include -#define DEVMAP_NAME_MAXLEN 512 +#define DEVMAP_NAME_MAXLEN 255 + +typedef ipcarg_t dev_handle_t; typedef enum { @@ -46,55 +48,29 @@ DEVMAP_DEVICE_UNREGISTER, DEVMAP_DEVICE_GET_NAME, - DEVMAP_DEVICE_GET_HANDLE + DEVMAP_DEVICE_GET_HANDLE, + DEVMAP_DEVICE_GET_COUNT, + DEVMAP_DEVICE_GET_DEVICES } devmap_request_t; -/** Representation of device driver. - * Each driver is responsible for a set of devices. - */ -typedef struct { - /** Pointers to previous and next drivers in linked list */ - link_t drivers; - /** Pointer to the linked list of devices controlled by - * this driver */ - link_t devices; - /** Phone asociated with this driver */ - ipcarg_t phone; - /** Device driver name */ - char *name; - /** Futex for list of devices owned by this driver */ - atomic_t devices_futex; -} devmap_driver_t; - -/** Info about registered device +/** Interface provided by devmap. + * + * Every process that connects to devmap must ask one of following + * interfaces otherwise connection will be refused. * */ -typedef struct { - /** Pointer to the previous and next device in the list of all devices */ - link_t devices; - /** Pointer to the previous and next device in the list of devices - owned by one driver */ - link_t driver_devices; - /** Unique device identifier */ - int handle; - /** Device name */ - char *name; - /** Device driver handling this device */ - devmap_driver_t *driver; -} devmap_device_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 */ + /** 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. */ + /** Create new connection to instance of device that + is specified by second argument of call. */ DEVMAP_CONNECT_TO_DEVICE } devmap_interface_t; +typedef struct { + dev_handle_t handle; + char name[DEVMAP_NAME_MAXLEN + 1]; +} dev_desc_t; + #endif -