Index: uspace/lib/usb/include/usb/hc.h =================================================================== --- uspace/lib/usb/include/usb/hc.h (revision 94fbf78519c6a5d5b6009321e986dfa44de82d37) +++ uspace/lib/usb/include/usb/hc.h (revision ef4e8ebd75646b8bbaae1cb095cb149bfdd9d744) @@ -84,10 +84,6 @@ int usb_hc_connection_close(usb_hc_connection_t *); -usb_address_t usb_hc_request_address(usb_hc_connection_t *, usb_address_t, bool, - usb_speed_t); -int usb_hc_bind_address(usb_hc_connection_t *, usb_address_t, devman_handle_t); int usb_hc_get_handle_by_address(usb_hc_connection_t *, usb_address_t, devman_handle_t *); -int usb_hc_release_address(usb_hc_connection_t *, usb_address_t); int usb_hc_register_endpoint(usb_hc_connection_t *, usb_address_t, Index: uspace/lib/usb/src/ddfiface.c =================================================================== --- uspace/lib/usb/src/ddfiface.c (revision 94fbf78519c6a5d5b6009321e986dfa44de82d37) +++ uspace/lib/usb/src/ddfiface.c (revision ef4e8ebd75646b8bbaae1cb095cb149bfdd9d744) @@ -40,5 +40,4 @@ #include #include -#include #include #include @@ -52,11 +51,4 @@ }; -/** DDF interface for USB device, implementation for child of a typical hub. */ -usb_iface_t usb_iface_hub_child_impl = { - .get_hc_handle = usb_iface_get_hc_handle_device_impl, - .get_my_address = usb_iface_get_my_address_from_device_data, -}; - - /** Get host controller handle, interface implementation for hub driver. * @@ -69,21 +61,4 @@ assert(fun); return usb_get_hc_by_handle(ddf_fun_get_handle(fun), handle); -} - -/** Get host controller handle, interface implementation for HC driver. - * - * @param[in] fun Device function the operation is running on. - * @param[out] handle Storage for the host controller handle. - * @return Always EOK. - */ -int usb_iface_get_hc_handle_hc_impl(ddf_fun_t *fun, devman_handle_t *handle) -{ - assert(fun); - - if (handle != NULL) { - *handle = ddf_fun_get_handle(fun); - } - - return EOK; } @@ -102,24 +77,4 @@ } -/** Get USB device address, interface implementation for child of - * a hub driver. - * - * This implementation eccepts 0 as valid handle and replaces it with fun's - * handle. - * - * @param[in] fun Device function the operation is running on. - * @param[in] handle Devman handle of USB device we want address of. - * @param[out] address Storage for USB address of device with handle @p handle. - * @return Error code. - */ -int usb_iface_get_my_address_from_device_data(ddf_fun_t *fun, - usb_address_t *address) -{ - const usb_hub_attached_device_t *device = ddf_fun_data_get(fun); - assert(device->fun == fun); - if (address) - *address = device->address; - return EOK; -} /** Index: uspace/lib/usb/src/hc.c =================================================================== --- uspace/lib/usb/src/hc.c (revision 94fbf78519c6a5d5b6009321e986dfa44de82d37) +++ uspace/lib/usb/src/hc.c (revision ef4e8ebd75646b8bbaae1cb095cb149bfdd9d744) @@ -164,37 +164,4 @@ } -/** Ask host controller for free address assignment. - * - * @param connection Opened connection to host controller. - * @param preferred Preferred SUB address. - * @param strict Fail if the preferred address is not avialable. - * @param speed Speed of the new device (device that will be assigned - * the returned address). - * @return Assigned USB address or negative error code. - */ -usb_address_t usb_hc_request_address(usb_hc_connection_t *connection, - usb_address_t preferred, bool strict, usb_speed_t speed) -{ - async_exch_t *exch; - EXCH_INIT(connection, exch); - - usb_address_t address = preferred; - const int ret = usbhc_request_address(exch, &address, strict, speed); - - EXCH_FINI(connection, exch); - return ret == EOK ? address : ret; -} - -int usb_hc_bind_address(usb_hc_connection_t * connection, - usb_address_t address, devman_handle_t handle) -{ - async_exch_t *exch; - EXCH_INIT(connection, exch); - - const int ret = usbhc_bind_address(exch, address, handle); - - EXCH_FINI(connection, exch); - return ret; -} /** Get handle of USB device with given address. @@ -217,16 +184,4 @@ } -int usb_hc_release_address(usb_hc_connection_t *connection, - usb_address_t address) -{ - async_exch_t *exch; - EXCH_INIT(connection, exch); - - const int ret = usbhc_release_address(exch, address); - - EXCH_FINI(connection, exch); - return ret; -} - int usb_hc_register_endpoint(usb_hc_connection_t *connection, usb_address_t address, usb_endpoint_t endpoint, usb_transfer_type_t type, Index: uspace/lib/usbdev/Makefile =================================================================== --- uspace/lib/usbdev/Makefile (revision 94fbf78519c6a5d5b6009321e986dfa44de82d37) +++ uspace/lib/usbdev/Makefile (revision ef4e8ebd75646b8bbaae1cb095cb149bfdd9d744) @@ -39,5 +39,4 @@ src/devpoll.c \ src/dp.c \ - src/hub.c \ src/pipes.c \ src/pipesinit.c \ Index: uspace/lib/usbdev/include/usb/dev/hub.h =================================================================== --- uspace/lib/usbdev/include/usb/dev/hub.h (revision 94fbf78519c6a5d5b6009321e986dfa44de82d37) +++ (revision ) @@ -1,79 +1,0 @@ -/* - * Copyright (c) 2011 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 libusbdev - * @{ - */ -/** @file - * Functions needed by hub drivers. - * - * For class specific requests, see usb/classes/hub.h. - */ - -#ifndef LIBUSBDEV_HUB_H_ -#define LIBUSBDEV_HUB_H_ - -#include -#include -#include -#include - -extern int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, - usb_speed_t, int (*)(void *), void *, usb_address_t *, ddf_fun_t **); - -/** Info about device attached to host controller. - * - * This structure exists only to keep the same signature of - * usb_hc_register_device() when more properties of the device - * would have to be passed to the host controller. - */ -typedef struct { - /** Device address. */ - usb_address_t address; - /** DDF function (external) of the device. */ - ddf_fun_t *fun; -} usb_hub_attached_device_t; - -extern int usb_hub_register_device(usb_hc_connection_t *, - const usb_hub_attached_device_t *); - -static inline int usb_hub_unregister_device(usb_hc_connection_t *conn, - const usb_hub_attached_device_t *attached_device) -{ - assert(conn); - if (attached_device == NULL) - return EBADMEM; - - return usb_hc_release_address(conn, attached_device->address); -} - -#endif - -/** - * @} - */ Index: uspace/lib/usbdev/src/hub.c =================================================================== --- uspace/lib/usbdev/src/hub.c (revision 94fbf78519c6a5d5b6009321e986dfa44de82d37) +++ (revision ) @@ -1,333 +1,0 @@ -/* - * Copyright (c) 2011 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 libusbdev - * @{ - */ -/** @file - * Functions needed by hub drivers. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** How much time to wait between attempts to get the default address. - * The value is based on typical value for port reset + some overhead. - */ -#define DEFAULT_ADDRESS_ATTEMPT_DELAY_USEC (1000 * (10 + 2)) - -/** Inform host controller about new device. - * - * @param connection Opened connection to host controller. - * @param attached_device Information about the new device. - * @return Error code. - */ -int usb_hub_register_device(usb_hc_connection_t *connection, - const usb_hub_attached_device_t *attached_device) -{ - assert(connection); - if (attached_device == NULL || attached_device->fun == NULL) - return EBADMEM; - return usb_hc_bind_address(connection, - attached_device->address, ddf_fun_get_handle(attached_device->fun)); -} - -/** Change address of connected device. - * This function automatically updates the backing connection to point to - * the new address. It also unregisterrs the old endpoint and registers - * a new one. - * This creates whole bunch of problems: - * 1. All pipes using this wire are broken because they are not - * registered for new address - * 2. All other pipes for this device are using wrong address, - * possibly targeting completely different device - * - * @param pipe Control endpoint pipe (session must be already started). - * @param new_address New USB address to be set (in native endianness). - * @return Error code. - */ -static int usb_request_set_address(usb_pipe_t *pipe, usb_address_t new_address) -{ - if ((new_address < 0) || (new_address >= USB11_ADDRESS_MAX)) { - return EINVAL; - } - assert(pipe); - assert(pipe->wire != NULL); - - const uint16_t addr = uint16_host2usb((uint16_t)new_address); - - int rc = usb_control_request_set(pipe, - USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE, - USB_DEVREQ_SET_ADDRESS, addr, 0, NULL, 0); - - if (rc != EOK) { - return rc; - } - - /* TODO: prevent others from accessing the wire now. */ - if (usb_pipe_unregister(pipe) != EOK) { - usb_log_warning( - "Failed to unregister the old pipe on address change.\n"); - } - /* Address changed. We can release the old one, thus - * allowing other to us it. */ - usb_hc_release_address(pipe->wire->hc_connection, pipe->wire->address); - - /* The address is already changed so set it in the wire */ - pipe->wire->address = new_address; - rc = usb_pipe_register(pipe, 0); - if (rc != EOK) - return EADDRNOTAVAIL; - - return EOK; -} - -/** Wrapper for registering attached device to the hub. - * - * The @p enable_port function is expected to enable signaling on given - * port. - * The argument can have arbitrary meaning and it is not touched at all - * by this function (it is passed as is to the @p enable_port function). - * - * If the @p enable_port fails (i.e. does not return EOK), the device - * addition is canceled. - * The return value is then returned (it is good idea to use different - * error codes than those listed as return codes by this function itself). - * - * The @p connection representing connection with host controller does not - * need to be started. - * This function duplicates the connection to allow simultaneous calls of - * this function (i.e. from different fibrils). - * - * @param[in] parent Parent device (i.e. the hub device). - * @param[in] connection Connection to host controller. Must be non-null. - * @param[in] dev_speed New device speed. - * @param[in] enable_port Function for enabling signaling through the port the - * device is attached to. - * @param[in] arg Any data argument to @p enable_port. - * @param[out] assigned_address USB address of the device. - * @param[in] dev_ops Child device ops. Will use default if not provided. - * @param[in] new_dev_data Arbitrary pointer to be stored in the child - * as @c driver_data. Will allocate and assign usb_hub_attached_device_t - * structure if NULL. - * @param[out] new_fun Storage where pointer to allocated child function - * will be written. Must be non-null. - * @return Error code. - * @retval EINVAL Either connection or new_fun is a NULL pointer. - * @retval ENOENT Connection to HC not opened. - * @retval EADDRNOTAVAIL Failed retrieving free address from host controller. - * @retval EBUSY Failed reserving default USB address. - * @retval ENOTCONN Problem connecting to the host controller via USB pipe. - * @retval ESTALL Problem communication with device (either SET_ADDRESS - * request or requests for descriptors when creating match ids). - */ -int usb_hc_new_device_wrapper(ddf_dev_t *parent, - usb_hc_connection_t *hc_conn, usb_speed_t dev_speed, - int (*enable_port)(void *arg), void *arg, usb_address_t *assigned_address, - ddf_fun_t **new_fun) -{ - if ((new_fun == NULL) || (hc_conn == NULL)) - return EINVAL; - - int rc; - struct timeval start_time; - - rc = gettimeofday(&start_time, NULL); - if (rc != EOK) { - return rc; - } - - /* We are gona do a lot of communication better open it in advance. */ - rc = usb_hc_connection_open(hc_conn); - if (rc != EOK) { - return rc; - } - - /* Request a new address. */ - usb_address_t dev_addr = - usb_hc_request_address(hc_conn, 0, false, dev_speed); - if (dev_addr < 0) { - rc = EADDRNOTAVAIL; - goto close_connection; - } - - /* Initialize connection to device. */ - usb_device_connection_t dev_conn; - rc = usb_device_connection_initialize( - &dev_conn, hc_conn, USB_ADDRESS_DEFAULT); - if (rc != EOK) { - rc = ENOTCONN; - goto leave_release_free_address; - } - - /* Initialize control pipe on default address. Don't register yet. */ - usb_pipe_t ctrl_pipe; - rc = usb_pipe_initialize_default_control(&ctrl_pipe, &dev_conn); - if (rc != EOK) { - rc = ENOTCONN; - goto leave_release_free_address; - } - - /* - * The default address request might fail. - * That means that someone else is already using that address. - * We will simply wait and try again. - * (Someone else already wants to add a new device.) - */ - do { - rc = usb_hc_request_address(hc_conn, USB_ADDRESS_DEFAULT, - true, dev_speed); - if (rc == ENOENT) { - /* Do not overheat the CPU ;-). */ - async_usleep(DEFAULT_ADDRESS_ATTEMPT_DELAY_USEC); - } - } while (rc == ENOENT); - if (rc < 0) { - goto leave_release_free_address; - } - - /* Register control pipe on default address. 0 means no interval. */ - rc = usb_pipe_register(&ctrl_pipe, 0); - if (rc != EOK) { - rc = ENOTCONN; - goto leave_release_default_address; - } - - struct timeval end_time; - rc = gettimeofday(&end_time, NULL); - if (rc != EOK) { - goto leave_release_default_address; - } - - /* According to the USB spec part 9.1.2 host allows 100ms time for - * the insertion process to complete. According to 7.1.7.1 this is the - * time between attach detected and port reset. However, the setup done - * above might use much of this time so we should only wait to fill - * up the 100ms quota*/ - const suseconds_t elapsed = tv_sub(&end_time, &start_time); - if (elapsed < 100000) { - async_usleep(100000 - elapsed); - } - - /* Endpoint is registered. We can enable the port and change address. */ - rc = enable_port(arg); - if (rc != EOK) { - goto leave_release_default_address; - } - /* USB spec 7.1.7.1: The USB System Software guarantees a minimum of - * 10ms for reset recovery. Device response to any bus transactions - * addressed to the default device address during the reset recovery - * time is undefined. - */ - async_usleep(10000); - - /* Get max_packet_size value. */ - rc = usb_pipe_probe_default_control(&ctrl_pipe); - if (rc != EOK) { - rc = ESTALL; - goto leave_release_default_address; - } - - rc = usb_request_set_address(&ctrl_pipe, dev_addr); - if (rc != EOK) { - rc = ESTALL; - goto leave_release_default_address; - } - - - /* Register the device with devman. */ - /* FIXME: create device_register that will get opened ctrl pipe. */ - ddf_fun_t *child_fun; - rc = usb_device_register_child_in_devman(&ctrl_pipe, - parent, &child_fun); - if (rc != EOK) { - goto leave_release_free_address; - } - - const usb_hub_attached_device_t new_device = { - .address = dev_addr, - .fun = child_fun, - }; - - - /* Inform the host controller about the handle. */ - rc = usb_hub_register_device(hc_conn, &new_device); - if (rc != EOK) { - /* The child function is already created. */ - ddf_fun_destroy(child_fun); - rc = EDESTADDRREQ; - goto leave_release_free_address; - } - - if (assigned_address != NULL) { - *assigned_address = dev_addr; - } - - *new_fun = child_fun; - - rc = EOK; - goto close_connection; - - /* - * Error handling (like nested exceptions) starts here. - * Completely ignoring errors here. - */ -leave_release_default_address: - if (usb_hc_release_address(hc_conn, USB_ADDRESS_DEFAULT) != EOK) - usb_log_warning("%s: Failed to release defaut address.\n", - __FUNCTION__); - -leave_release_free_address: - /* This might be either 0:0 or dev_addr:0 */ - if (usb_pipe_unregister(&ctrl_pipe) != EOK) - usb_log_warning("%s: Failed to unregister default pipe.\n", - __FUNCTION__); - - if (usb_hc_release_address(hc_conn, dev_addr) != EOK) - usb_log_warning("%s: Failed to release address: %d.\n", - __FUNCTION__, dev_addr); - -close_connection: - if (usb_hc_connection_close(hc_conn) != EOK) - usb_log_warning("%s: Failed to close hc connection.\n", - __FUNCTION__); - - return rc; -} - -/** - * @} - */ Index: uspace/lib/usbdev/src/recognise.c =================================================================== --- uspace/lib/usbdev/src/recognise.c (revision 94fbf78519c6a5d5b6009321e986dfa44de82d37) +++ uspace/lib/usbdev/src/recognise.c (revision ef4e8ebd75646b8bbaae1cb095cb149bfdd9d744) @@ -37,5 +37,4 @@ #include #include -#include #include #include @@ -46,9 +45,4 @@ #include #include - -/** DDF operations of child devices. */ -static ddf_dev_ops_t child_ops = { - .interfaces[USB_DEV_IFACE] = &usb_iface_hub_child_impl -}; /** Get integer part from BCD coded number. */ @@ -295,95 +289,4 @@ } -/** Probe for device kind and register it in devman. - * - * @param[in] ctrl_pipe Control pipe to the device. - * @param[in] parent Parent device. - * @param[in] dev_ops Child device ops. Default child_ops will be used if NULL. - * @param[in] dev_data Arbitrary pointer to be stored in the child - * as @c driver_data. - * @param[out] child_fun Storage where pointer to allocated child function - * will be written. - * @return Error code. - * - */ -int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe, - ddf_dev_t *parent, ddf_fun_t **child_fun) -{ - if (child_fun == NULL || ctrl_pipe == NULL) - return EINVAL; - - /** Index to append after device name for uniqueness. */ - static atomic_t device_name_index = {0}; - const size_t this_device_name_index = - (size_t) atomic_preinc(&device_name_index); - - ddf_fun_t *child = NULL; - int rc; - - /* - * TODO: Once the device driver framework support persistent - * naming etc., something more descriptive could be created. - */ - char child_name[12]; /* The format is: "usbAB_aXYZ", length 11 */ - rc = snprintf(child_name, sizeof(child_name), - "usb%02zu_a%d", this_device_name_index, ctrl_pipe->wire->address); - if (rc < 0) { - goto failure; - } - - child = ddf_fun_create(parent, fun_inner, child_name); - if (child == NULL) { - rc = ENOMEM; - goto failure; - } - - ddf_fun_set_ops(child, &child_ops); - /* - * Store the attached device in fun - * driver data if there is no other data - */ - usb_hub_attached_device_t *new_device = ddf_fun_data_alloc( - child, sizeof(usb_hub_attached_device_t)); - if (!new_device) { - rc = ENOMEM; - goto failure; - } - - new_device->address = ctrl_pipe->wire->address; - new_device->fun = child; - - match_id_list_t match_ids; - init_match_ids(&match_ids); - rc = usb_device_create_match_ids(ctrl_pipe, &match_ids); - if (rc != EOK) - goto failure; - - list_foreach(match_ids.ids, id_link) { - match_id_t *match_id = list_get_instance(id_link, match_id_t, link); - rc = ddf_fun_add_match_id(child, match_id->id, match_id->score); - if (rc != EOK) { - clean_match_ids(&match_ids); - goto failure; - } - } - - clean_match_ids(&match_ids); - - rc = ddf_fun_bind(child); - if (rc != EOK) - goto failure; - - *child_fun = child; - return EOK; - -failure: - if (child != NULL) { - /* This takes care of match_id deallocation as well. */ - ddf_fun_destroy(child); - } - - return rc; -} - /** * @}