Changeset 10cd715 in mainline for uspace/drv/bus/usb/xhci/bus.c


Ignore:
Timestamp:
2017-12-14T14:25:40Z (7 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd05140
Parents:
6455d39
git-author:
Ondřej Hlavatý <aearsis@…> (2017-12-14 14:24:28)
git-committer:
Ondřej Hlavatý <aearsis@…> (2017-12-14 14:25:40)
Message:

usbhost bus: request_address → reserve_default_address

It doesn't make sense to expose requesting addresses other than the
default one from the bus.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/xhci/bus.c

    r6455d39 r10cd715  
    209209
    210210err_address:
    211         bus_release_address(&bus->base, dev->address);
     211        // TODO: deaddress device
    212212        return err;
    213213}
    … …  
    505505}
    506506
    507 static int request_address(bus_t *bus_base, usb_address_t *addr, bool strict, usb_speed_t speed)
    508 {
    509         assert(addr);
    510 
    511         if (*addr != USB_ADDRESS_DEFAULT)
    512                 /* xHCI does not allow software to assign addresses. */
    513                 return ENOTSUP;
    514 
    515         assert(strict);
    516 
     507static int reserve_default_address(bus_t *bus_base, usb_speed_t speed)
     508{
    517509        xhci_bus_t *xhci_bus = bus_to_xhci_bus(bus_base);
    518510
    … …  
    525517}
    526518
    527 static int release_address(bus_t *bus_base, usb_address_t addr)
    528 {
    529         if (addr != USB_ADDRESS_DEFAULT)
    530                 return ENOTSUP;
    531 
     519static int release_default_address(bus_t *bus_base)
     520{
    532521        xhci_bus_t *xhci_bus = bus_to_xhci_bus(bus_base);
    533522
    … …  
    562551        BIND_OP(find_endpoint)
    563552
    564         BIND_OP(request_address)
    565         BIND_OP(release_address)
     553        BIND_OP(reserve_default_address)
     554        BIND_OP(release_default_address)
     555
    566556        BIND_OP(reset_toggle)
    567 
    568557        BIND_OP(count_bw)
    569558
Note: See TracChangeset for help on using the changeset viewer.