Changeset ee794529 in mainline for uspace/lib/usbhost


Ignore:
Timestamp:
2017-10-22T16:38:19Z (8 years ago)
Author:
Petr Manek <petr.manek@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
89cefe78
Parents:
4594baa
Message:

Refactoring. Renamed functions in bus endpoint interface. Register/release is now register/unregister to prevent name collisions with use/release.

Location:
uspace/lib/usbhost
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usbhost/include/usb/host/bus.h

    r4594baa ree794529  
    8484        endpoint_t *(*create_endpoint)(bus_t *);
    8585        int (*register_endpoint)(bus_t *, endpoint_t *);
    86         int (*release_endpoint)(bus_t *, endpoint_t *);
     86        int (*unregister_endpoint)(bus_t *, endpoint_t *);
    8787        endpoint_t *(*find_endpoint)(bus_t *, usb_target_t, usb_direction_t);
    8888        void (*destroy_endpoint)(endpoint_t *);                 /**< Optional */
    … …  
    129129endpoint_t *bus_create_endpoint(bus_t *);
    130130int bus_register_endpoint(bus_t *, endpoint_t *);
    131 int bus_release_endpoint(bus_t *, endpoint_t *);
     131int bus_unregister_endpoint(bus_t *, endpoint_t *);
    132132endpoint_t *bus_find_endpoint(bus_t *, usb_target_t, usb_direction_t);
    133133

  • uspace/lib/usbhost/src/bus.c

    r4594baa ree794529  
    106106                return ENOENT;
    107107
    108         return bus_release_endpoint(bus, ep);
     108        return bus_unregister_endpoint(bus, ep);
    109109}
    110110
    … …  
    180180}
    181181
    182 int bus_release_endpoint(bus_t *bus, endpoint_t *ep)
     182int bus_unregister_endpoint(bus_t *bus, endpoint_t *ep)
    183183{
    184184        assert(bus);
    … …  
    186186
    187187        fibril_mutex_lock(&bus->guard);
    188         const int r = bus->ops.release_endpoint(bus, ep);
     188        const int r = bus->ops.unregister_endpoint(bus, ep);
    189189        fibril_mutex_unlock(&bus->guard);
    190190

  • uspace/lib/usbhost/src/usb2_bus.c

    r4594baa ree794529  
    309309/** Release bandwidth reserved by the given endpoint.
    310310 */
    311 static int usb2_bus_release_ep(bus_t *bus_base, endpoint_t *ep)
     311static int usb2_bus_unregister_ep(bus_t *bus_base, endpoint_t *ep)
    312312{
    313313        usb2_bus_t *bus = bus_to_usb2_bus(bus_base);
    … …  
    416416        .create_endpoint = usb2_bus_create_ep,
    417417        .find_endpoint = usb2_bus_find_ep,
    418         .release_endpoint = usb2_bus_release_ep,
     418        .unregister_endpoint = usb2_bus_unregister_ep,
    419419        .register_endpoint = usb2_bus_register_ep,
    420420        .request_address = usb2_bus_request_address,
Note: See TracChangeset for help on using the changeset viewer.