Index: uspace/drv/vhc/Makefile =================================================================== --- uspace/drv/vhc/Makefile (revision 3f45993eb7dca245d8cf7a8185f179b4537df8d3) +++ uspace/drv/vhc/Makefile (revision be9cbec75a34734d1f77615e18765621994e8a67) @@ -39,5 +39,4 @@ SOURCES = \ - addrmgm.c \ conndev.c \ connhost.c \ Index: pace/drv/vhc/addrmgm.c =================================================================== --- uspace/drv/vhc/addrmgm.c (revision 3f45993eb7dca245d8cf7a8185f179b4537df8d3) +++ (revision ) @@ -1,199 +1,0 @@ -/* - * Copyright (c) 2010 Vojtech Horky - * 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 usb - * @{ - */ -/** @file - * @brief Address management. - */ - -#include -#include -#include -#include -#include -#include - -#include "vhcd.h" -#include "conn.h" - -#define ADDRESS_COUNT 100 -#define DEFAULT_ADDRESS 0 - -typedef struct { - usb_address_t address; - devman_handle_t devman_handle; - bool available; -} address_info_t; - -static address_info_t dev_address[ADDRESS_COUNT]; -fibril_mutex_t address_guard; - -typedef struct { - fibril_mutex_t condvar_guard; - fibril_condvar_t condvar; - bool available; -} reservable_address_info_t; - -static reservable_address_info_t default_address; - -void address_init(void) -{ - usb_address_t i; - for (i = 0; i < ADDRESS_COUNT; i++) { - dev_address[i].address = i + 1; - dev_address[i].available = true; - dev_address[i].devman_handle = 0; - } - - fibril_mutex_initialize(&address_guard); - fibril_mutex_initialize(&default_address.condvar_guard); - fibril_condvar_initialize(&default_address.condvar); -} - -int reserve_default_address(device_t *dev) -{ - fibril_mutex_lock(&default_address.condvar_guard); - while (!default_address.available) { - fibril_condvar_wait(&default_address.condvar, - &default_address.condvar_guard); - } - fibril_mutex_unlock(&default_address.condvar_guard); - - return EOK; -} - -int release_default_address(device_t *dev) -{ - fibril_mutex_lock(&default_address.condvar_guard); - default_address.available = true; - fibril_condvar_signal(&default_address.condvar); - fibril_mutex_unlock(&default_address.condvar_guard); - - return EOK; -} - -int request_address(device_t *dev, usb_address_t *address) -{ - fibril_mutex_lock(&address_guard); - usb_address_t i; - bool found = false; - for (i = 0; i < ADDRESS_COUNT; i++) { - if (dev_address[i].available) { - dev_address[i].available = false; - *address = dev_address[i].address; - found = true; - break; - } - } - fibril_mutex_unlock(&address_guard); - - if (!found) { - return ELIMIT; - } else { - return EOK; - } -} - -int bind_address(device_t *dev, usb_address_t address, devman_handle_t handle) -{ - if (address == DEFAULT_ADDRESS) { - return EPERM; - } - - int rc = EPERM; - - fibril_mutex_lock(&address_guard); - usb_address_t i; - for (i = 0; i < ADDRESS_COUNT; i++) { - if (dev_address[i].address == address) { - if (dev_address[i].available) { - rc = ENOENT; - break; - } - - dev_address[i].devman_handle = handle; - rc = EOK; - break; - } - } - fibril_mutex_unlock(&address_guard); - - return rc; -} - -int tell_address(device_t *dev, devman_handle_t handle, usb_address_t *address) -{ - int rc = ENOENT; - - fibril_mutex_lock(&address_guard); - usb_address_t i; - for (i = 0; i < ADDRESS_COUNT; i++) { - if (dev_address[i].devman_handle == handle) { - *address = dev_address[i].address; - rc = EOK; - break; - } - } - fibril_mutex_unlock(&address_guard); - - return rc; -} - -int release_address(device_t *dev, usb_address_t address) -{ - if (address == DEFAULT_ADDRESS) { - return EPERM; - } - - int rc = EPERM; - - fibril_mutex_lock(&address_guard); - usb_address_t i; - for (i = 0; i < ADDRESS_COUNT; i++) { - if (dev_address[i].address == address) { - if (dev_address[i].available) { - rc = ENOENT; - break; - } - - dev_address[i].available = true; - dev_address[i].devman_handle = 0; - rc = EOK; - break; - } - } - fibril_mutex_unlock(&address_guard); - - return rc; -} - -/** - * @} - */ Index: uspace/drv/vhc/conn.h =================================================================== --- uspace/drv/vhc/conn.h (revision 3f45993eb7dca245d8cf7a8185f179b4537df8d3) +++ uspace/drv/vhc/conn.h (revision be9cbec75a34734d1f77615e18765621994e8a67) @@ -48,11 +48,5 @@ void address_init(void); -int reserve_default_address(device_t *); -int release_default_address(device_t *); -int request_address(device_t *, usb_address_t *); -int release_address(device_t *, usb_address_t); -int bind_address(device_t *, usb_address_t, devman_handle_t); -int tell_address(device_t *, devman_handle_t, usb_address_t *); void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *); Index: uspace/drv/vhc/connhost.c =================================================================== --- uspace/drv/vhc/connhost.c (revision 3f45993eb7dca245d8cf7a8185f179b4537df8d3) +++ uspace/drv/vhc/connhost.c (revision be9cbec75a34734d1f77615e18765621994e8a67) @@ -36,4 +36,5 @@ #include #include +#include #include "vhcd.h" @@ -218,4 +219,58 @@ } +static usb_address_keeping_t addresses; + + +static int reserve_default_address(device_t *dev) +{ + usb_address_keeping_reserve_default(&addresses); + return EOK; +} + +static int release_default_address(device_t *dev) +{ + usb_address_keeping_release_default(&addresses); + return EOK; +} + +static int request_address(device_t *dev, usb_address_t *address) +{ + usb_address_t addr = usb_address_keeping_request(&addresses); + if (addr < 0) { + return (int)addr; + } + + *address = addr; + return EOK; +} + +static int release_address(device_t *dev, usb_address_t address) +{ + return usb_address_keeping_release(&addresses, address); +} + +static int bind_address(device_t *dev, usb_address_t address, + devman_handle_t handle) +{ + usb_address_keeping_devman_bind(&addresses, address, handle); + return EOK; +} + +static int tell_address(device_t *dev, devman_handle_t handle, + usb_address_t *address) +{ + usb_address_t addr = usb_address_keeping_find(&addresses, handle); + if (addr < 0) { + return addr; + } + + *address = addr; + return EOK; +} + +void address_init(void) +{ + usb_address_keeping_init(&addresses, 50); +} usbhc_iface_t vhc_iface = {