Index: uspace/drv/bus/usb/xhci/bus.c =================================================================== --- uspace/drv/bus/usb/xhci/bus.c (revision 6455d39e0502427e5c374bc86c13191c94b14f51) +++ uspace/drv/bus/usb/xhci/bus.c (revision 10cd715240ae1db3090d2fb49f7185790adc313a) @@ -209,5 +209,5 @@ err_address: - bus_release_address(&bus->base, dev->address); + // TODO: deaddress device return err; } @@ -505,14 +505,6 @@ } -static int request_address(bus_t *bus_base, usb_address_t *addr, bool strict, usb_speed_t speed) -{ - assert(addr); - - if (*addr != USB_ADDRESS_DEFAULT) - /* xHCI does not allow software to assign addresses. */ - return ENOTSUP; - - assert(strict); - +static int reserve_default_address(bus_t *bus_base, usb_speed_t speed) +{ xhci_bus_t *xhci_bus = bus_to_xhci_bus(bus_base); @@ -525,9 +517,6 @@ } -static int release_address(bus_t *bus_base, usb_address_t addr) -{ - if (addr != USB_ADDRESS_DEFAULT) - return ENOTSUP; - +static int release_default_address(bus_t *bus_base) +{ xhci_bus_t *xhci_bus = bus_to_xhci_bus(bus_base); @@ -562,8 +551,8 @@ BIND_OP(find_endpoint) - BIND_OP(request_address) - BIND_OP(release_address) + BIND_OP(reserve_default_address) + BIND_OP(release_default_address) + BIND_OP(reset_toggle) - BIND_OP(count_bw) Index: uspace/lib/usbhost/include/usb/host/bus.h =================================================================== --- uspace/lib/usbhost/include/usb/host/bus.h (revision 6455d39e0502427e5c374bc86c13191c94b14f51) +++ uspace/lib/usbhost/include/usb/host/bus.h (revision 10cd715240ae1db3090d2fb49f7185790adc313a) @@ -96,6 +96,6 @@ void (*endpoint_set_toggle)(endpoint_t *, bool); /**< Optional */ - int (*request_address)(bus_t *, usb_address_t*, bool, usb_speed_t); - int (*release_address)(bus_t *, usb_address_t); + int (*reserve_default_address)(bus_t *, usb_speed_t); + int (*release_default_address)(bus_t *); int (*reset_toggle)(bus_t *, usb_target_t, toggle_reset_mode_t); @@ -137,19 +137,6 @@ size_t bus_count_bw(endpoint_t *, size_t); -int bus_request_address(bus_t *, usb_address_t *, bool, usb_speed_t); -int bus_release_address(bus_t *, usb_address_t); - - -static inline int bus_reserve_default_address(bus_t *bus, usb_speed_t speed) { - usb_address_t addr = USB_ADDRESS_DEFAULT; - - const int r = bus_request_address(bus, &addr, true, speed); - assert(addr == USB_ADDRESS_DEFAULT); - return r; -} - -static inline int bus_release_default_address(bus_t *bus) { - return bus_release_address(bus, USB_ADDRESS_DEFAULT); -} +int bus_reserve_default_address(bus_t *, usb_speed_t); +int bus_release_default_address(bus_t *); int bus_reset_toggle(bus_t *, usb_target_t, bool); Index: uspace/lib/usbhost/src/bus.c =================================================================== --- uspace/lib/usbhost/src/bus.c (revision 6455d39e0502427e5c374bc86c13191c94b14f51) +++ uspace/lib/usbhost/src/bus.c (revision 10cd715240ae1db3090d2fb49f7185790adc313a) @@ -199,26 +199,27 @@ } -int bus_request_address(bus_t *bus, usb_address_t *hint, bool strict, usb_speed_t speed) -{ - assert(bus); - - if (!bus->ops.request_address) - return ENOTSUP; - - fibril_mutex_lock(&bus->guard); - const int r = bus->ops.request_address(bus, hint, strict, speed); +int bus_reserve_default_address(bus_t *bus, usb_speed_t speed) +{ + assert(bus); + + if (!bus->ops.reserve_default_address) + return ENOTSUP; + + fibril_mutex_lock(&bus->guard); + const int r = bus->ops.reserve_default_address(bus, speed); fibril_mutex_unlock(&bus->guard); return r; } -int bus_release_address(bus_t *bus, usb_address_t address) -{ - assert(bus); - - if (!bus->ops.release_address) - return ENOTSUP; - - fibril_mutex_lock(&bus->guard); - const int r = bus->ops.release_address(bus, address); +int bus_release_default_address(bus_t *bus) +{ + assert(bus); + + /* If this op is not set, allow everything */ + if (!bus->ops.release_default_address) + return ENOTSUP; + + fibril_mutex_lock(&bus->guard); + const int r = bus->ops.release_default_address(bus); fibril_mutex_unlock(&bus->guard); return r; Index: uspace/lib/usbhost/src/ddf_helpers.c =================================================================== --- uspace/lib/usbhost/src/ddf_helpers.c (revision 6455d39e0502427e5c374bc86c13191c94b14f51) +++ uspace/lib/usbhost/src/ddf_helpers.c (revision 10cd715240ae1db3090d2fb49f7185790adc313a) @@ -362,8 +362,6 @@ const int ret = ddf_fun_unbind(victim->fun); if (ret == EOK) { - usb_address_t address = victim->address; bus_remove_device(hcd->bus, hcd, victim); ddf_fun_destroy(victim->fun); - bus_release_address(hcd->bus, address); } else { usb_log_warning("Failed to unbind device `%s': %s\n", Index: uspace/lib/usbhost/src/usb2_bus.c =================================================================== --- uspace/lib/usbhost/src/usb2_bus.c (revision 6455d39e0502427e5c374bc86c13191c94b14f51) +++ uspace/lib/usbhost/src/usb2_bus.c (revision 10cd715240ae1db3090d2fb49f7185790adc313a) @@ -76,18 +76,112 @@ * @return Error code. */ -static int usb2_bus_get_speed(bus_t *bus_base, usb_address_t address, usb_speed_t *speed) -{ - usb2_bus_t *bus = bus_to_usb2_bus(bus_base); - - if (!usb_address_is_valid(address)) { +static int get_speed(usb2_bus_t *bus, usb_address_t address, usb_speed_t *speed) +{ + if (!usb_address_is_valid(address)) return EINVAL; - } + + if (!bus->devices[address].occupied) + return ENOENT; + + if (speed) + *speed = bus->devices[address].speed; + + return EOK; +} + +/** Get a free USB address + * + * @param[in] bus Device manager structure to use. + * @return Free address, or error code. + */ +static int get_free_address(usb2_bus_t *bus, usb_address_t *addr) +{ + usb_address_t new_address = bus->last_address; + do { + new_address = (new_address + 1) % USB_ADDRESS_COUNT; + if (new_address == USB_ADDRESS_DEFAULT) + new_address = 1; + if (new_address == bus->last_address) + return ENOSPC; + } while (bus->devices[new_address].occupied); + + assert(new_address != USB_ADDRESS_DEFAULT); + bus->last_address = new_address; + + *addr = new_address; + return EOK; +} + +/** Unregister and destroy all endpoints using given address. + * @param bus usb_bus structure, non-null. + * @param address USB address. + * @param endpoint USB endpoint number. + * @param direction Communication direction. + * @return Error code. + */ +static int release_address(usb2_bus_t *bus, usb_address_t address) +{ + if (!usb_address_is_valid(address)) + return EINVAL; const int ret = bus->devices[address].occupied ? EOK : ENOENT; - if (speed && bus->devices[address].occupied) { - *speed = bus->devices[address].speed; + bus->devices[address].occupied = false; + + list_t *list = get_list(bus, address); + for (link_t *link = list_first(list); link != NULL; ) { + endpoint_t *ep = list_get_instance(link, endpoint_t, link); + link = list_next(link, list); + + assert(ep->device->address == address); + list_remove(&ep->link); + + usb_log_warning("Endpoint %d:%d %s was left behind, removing.\n", + address, ep->endpoint, usb_str_direction(ep->direction)); + + /* Drop bus reference */ + endpoint_del_ref(ep); } return ret; +} + +/** Request USB address. + * @param bus usb_device_manager + * @param addr Pointer to requested address value, place to store new address + * @parma strict Fail if the requested address is not available. + * @return Error code. + * @note Default address is only available in strict mode. + */ +static int request_address(usb2_bus_t *bus, usb_address_t *addr, bool strict, usb_speed_t speed) +{ + int err; + + assert(bus); + assert(addr); + + if (!usb_address_is_valid(*addr)) + return EINVAL; + + /* Only grant default address to strict requests */ + if ((*addr == USB_ADDRESS_DEFAULT) && !strict) { + if ((err = get_free_address(bus, addr))) + return err; + } + else if (bus->devices[*addr].occupied) { + if (strict) { + return ENOENT; + } + if ((err = get_free_address(bus, addr))) + return err; + } + + assert(usb_address_is_valid(*addr)); + assert(bus->devices[*addr].occupied == false); + assert(*addr != USB_ADDRESS_DEFAULT || strict); + + bus->devices[*addr].occupied = true; + bus->devices[*addr].speed = speed; + + return EOK; } @@ -106,5 +200,5 @@ }}; -static int usb2_bus_address_device(bus_t *bus, hcd_t *hcd, device_t *dev) +static int address_device(usb2_bus_t *bus, hcd_t *hcd, device_t *dev) { int err; @@ -115,5 +209,5 @@ /** Reserve address early, we want pretty log messages */ usb_address_t address; - if ((err = bus_request_address(bus, &address, false, dev->speed))) { + if ((err = request_address(bus, &address, false, dev->speed))) { usb_log_error("Failed to reserve new address: %s.", str_error(err)); @@ -126,5 +220,5 @@ endpoint_t *default_ep; - err = bus_add_endpoint(bus, dev, &usb2_default_control_ep, &default_ep); + err = bus_add_endpoint(&bus->base, dev, &usb2_default_control_ep, &default_ep); if (err != EOK) { usb_log_error("Device(%d): Failed to add default target: %s.", @@ -150,5 +244,5 @@ /* We need to remove ep before we change the address */ - if ((err = bus_remove_endpoint(bus, default_ep))) { + if ((err = bus_remove_endpoint(&bus->base, default_ep))) { usb_log_error("Device(%d): Failed to unregister default target: %s", address, str_error(err)); goto err_address; @@ -168,5 +262,5 @@ /* Register EP on the new address */ usb_log_debug("Device(%d): Registering control EP.", address); - err = bus_add_endpoint(bus, dev, &control_ep, NULL); + err = bus_add_endpoint(&bus->base, dev, &control_ep, NULL); if (err != EOK) { usb_log_error("Device(%d): Failed to register EP0: %s", @@ -178,8 +272,8 @@ err_default_control_ep: - bus_remove_endpoint(bus, default_ep); + bus_remove_endpoint(&bus->base, default_ep); endpoint_del_ref(default_ep); err_address: - bus_release_address(bus, address); + release_address(bus, address); return err; } @@ -187,12 +281,13 @@ /** Enumerate a new USB device */ -static int usb2_bus_enumerate_device(bus_t *bus, hcd_t *hcd, device_t *dev) +static int usb2_bus_enumerate_device(bus_t *bus_base, hcd_t *hcd, device_t *dev) { int err; + usb2_bus_t *bus = bus_to_usb2_bus(bus_base); /* The speed of the new device was reported by the hub when reserving * default address. */ - if ((err = usb2_bus_get_speed(bus, USB_ADDRESS_DEFAULT, &dev->speed))) { + if ((err = get_speed(bus, USB_ADDRESS_DEFAULT, &dev->speed))) { usb_log_error("Failed to verify speed: %s.", str_error(err)); return err; @@ -211,5 +306,5 @@ /* Assign an address to the device */ - if ((err = usb2_bus_address_device(bus, hcd, dev))) { + if ((err = address_device(bus, hcd, dev))) { usb_log_error("Failed to setup address of the new device: %s", str_error(err)); return err; @@ -219,31 +314,8 @@ if ((err = hcd_ddf_device_explore(hcd, dev))) { usb_log_error("Device(%d): Failed to explore device: %s", dev->address, str_error(err)); - bus_release_address(bus, dev->address); + release_address(bus, dev->address); return err; } - return EOK; -} - -/** Get a free USB address - * - * @param[in] bus Device manager structure to use. - * @return Free address, or error code. - */ -static int usb_bus_get_free_address(usb2_bus_t *bus, usb_address_t *addr) -{ - usb_address_t new_address = bus->last_address; - do { - new_address = (new_address + 1) % USB_ADDRESS_COUNT; - if (new_address == USB_ADDRESS_DEFAULT) - new_address = 1; - if (new_address == bus->last_address) - return ENOSPC; - } while (bus->devices[new_address].occupied); - - assert(new_address != USB_ADDRESS_DEFAULT); - bus->last_address = new_address; - - *addr = new_address; return EOK; } @@ -367,80 +439,20 @@ } -/** Unregister and destroy all endpoints using given address. - * @param bus usb_bus structure, non-null. - * @param address USB address. - * @param endpoint USB endpoint number. - * @param direction Communication direction. - * @return Error code. - */ -static int usb2_bus_release_address(bus_t *bus_base, usb_address_t address) -{ - usb2_bus_t *bus = bus_to_usb2_bus(bus_base); - - if (!usb_address_is_valid(address)) - return EINVAL; - - const int ret = bus->devices[address].occupied ? EOK : ENOENT; - bus->devices[address].occupied = false; - - list_t *list = get_list(bus, address); - for (link_t *link = list_first(list); link != NULL; ) { - endpoint_t *ep = list_get_instance(link, endpoint_t, link); - link = list_next(link, list); - - assert(ep->device->address == address); - list_remove(&ep->link); - - usb_log_warning("Endpoint %d:%d %s was left behind, removing.\n", - address, ep->endpoint, usb_str_direction(ep->direction)); - - /* Drop bus reference */ - endpoint_del_ref(ep); - } - - return ret; -} - -/** Request USB address. - * @param bus usb_device_manager - * @param addr Pointer to requested address value, place to store new address - * @parma strict Fail if the requested address is not available. - * @return Error code. - * @note Default address is only available in strict mode. - */ -static int usb2_bus_request_address(bus_t *bus_base, usb_address_t *addr, bool strict, usb_speed_t speed) -{ - int err; - - usb2_bus_t *bus = bus_to_usb2_bus(bus_base); - assert(addr); - - if (!usb_address_is_valid(*addr)) - return EINVAL; - - /* Only grant default address to strict requests */ - if ((*addr == USB_ADDRESS_DEFAULT) && !strict) { - if ((err = usb_bus_get_free_address(bus, addr))) - return err; - } - else if (bus->devices[*addr].occupied) { - if (strict) { - return ENOENT; - } - if ((err = usb_bus_get_free_address(bus, addr))) - return err; - } - - assert(usb_address_is_valid(*addr)); - assert(bus->devices[*addr].occupied == false); - assert(*addr != USB_ADDRESS_DEFAULT || strict); - - bus->devices[*addr].occupied = true; - bus->devices[*addr].speed = speed; - - return EOK; +static int usb2_bus_register_default_address(bus_t *bus_base, usb_speed_t speed) +{ + usb2_bus_t *bus = bus_to_usb2_bus(bus_base); + usb_address_t addr = USB_ADDRESS_DEFAULT; + return request_address(bus, &addr, true, speed); +} + +static int usb2_bus_release_default_address(bus_t *bus_base) +{ + usb2_bus_t *bus = bus_to_usb2_bus(bus_base); + return release_address(bus, USB_ADDRESS_DEFAULT); } static const bus_ops_t usb2_bus_ops = { + .reserve_default_address = usb2_bus_register_default_address, + .release_default_address = usb2_bus_release_default_address, .enumerate_device = usb2_bus_enumerate_device, .create_endpoint = usb2_bus_create_ep, @@ -448,6 +460,4 @@ .unregister_endpoint = usb2_bus_unregister_ep, .register_endpoint = usb2_bus_register_ep, - .request_address = usb2_bus_request_address, - .release_address = usb2_bus_release_address, .reset_toggle = usb2_bus_reset_toggle, };