Changeset 68b5ed6e in mainline for uspace/lib/usb


Ignore:
Timestamp:
2011-03-21T14:27:47Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e34e77a
Parents:
3954a63b
Message:

Rename device_keeper* ⇒ usb_device_keeper*

Also extended some device keeper functions names to be more descriptive.

No change in functionality.

Location:
uspace/lib/usb
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usb/include/usb/host/device_keeper.h

    r3954a63b r68b5ed6e  
    4848};
    4949
    50 typedef struct device_keeper {
     50typedef struct {
    5151        struct usb_device_info devices[USB_ADDRESS_COUNT];
    5252        fibril_mutex_t guard;
    5353        fibril_condvar_t default_address_occupied;
    5454        usb_address_t last_address;
    55 } device_keeper_t;
     55} usb_device_keeper_t;
    5656
    57 void device_keeper_init(device_keeper_t *instance);
     57void usb_device_keeper_init(usb_device_keeper_t *instance);
    5858
    59 void device_keeper_reserve_default(
    60     device_keeper_t *instance, usb_speed_t speed);
     59void usb_device_keeper_reserve_default_address(
     60    usb_device_keeper_t *instance, usb_speed_t speed);
    6161
    62 void device_keeper_release_default(device_keeper_t *instance);
     62void usb_device_keeper_release_default_address(usb_device_keeper_t *instance);
    6363
    64 void device_keeper_reset_if_need(
    65     device_keeper_t *instance, usb_target_t target,
     64void usb_device_keeper_reset_if_need(
     65    usb_device_keeper_t *instance, usb_target_t target,
    6666    const unsigned char *setup_data);
    6767
    68 int device_keeper_get_toggle(
    69     device_keeper_t *instance, usb_target_t target, usb_direction_t direction);
     68int usb_device_keeper_get_toggle(
     69    usb_device_keeper_t *instance, usb_target_t target, usb_direction_t direction);
    7070
    71 int device_keeper_set_toggle(device_keeper_t *instance,
     71int usb_device_keeper_set_toggle(usb_device_keeper_t *instance,
    7272    usb_target_t target, usb_direction_t direction, bool toggle);
    7373
    74 usb_address_t device_keeper_request(
    75     device_keeper_t *instance, usb_speed_t speed);
     74usb_address_t device_keeper_get_free_address(
     75    usb_device_keeper_t *instance, usb_speed_t speed);
    7676
    77 void device_keeper_bind(
    78     device_keeper_t *instance, usb_address_t address, devman_handle_t handle);
     77void usb_device_keeper_bind(
     78    usb_device_keeper_t *instance, usb_address_t address, devman_handle_t handle);
    7979
    80 void device_keeper_release(device_keeper_t *instance, usb_address_t address);
     80void usb_device_keeper_release(usb_device_keeper_t *instance, usb_address_t address);
    8181
    82 usb_address_t device_keeper_find(
    83     device_keeper_t *instance, devman_handle_t handle);
     82usb_address_t usb_device_keeper_find(
     83    usb_device_keeper_t *instance, devman_handle_t handle);
    8484
    85 usb_speed_t device_keeper_speed(
    86     device_keeper_t *instance, usb_address_t address);
     85usb_speed_t usb_device_keeper_get_speed(
     86    usb_device_keeper_t *instance, usb_address_t address);
    8787#endif
    8888/**

  • uspace/lib/usb/src/host/device_keeper.c

    r3954a63b r68b5ed6e  
    4545 * Set all values to false/0.
    4646 */
    47 void device_keeper_init(device_keeper_t *instance)
     47void usb_device_keeper_init(usb_device_keeper_t *instance)
    4848{
    4949        assert(instance);
    … …  
    6565 * @param[in] speed Speed of the device requesting default address.
    6666 */
    67 void device_keeper_reserve_default(device_keeper_t *instance, usb_speed_t speed)
     67void usb_device_keeper_reserve_default_address(usb_device_keeper_t *instance, usb_speed_t speed)
    6868{
    6969        assert(instance);
    … …  
    8383 * @param[in] speed Speed of the device requesting default address.
    8484 */
    85 void device_keeper_release_default(device_keeper_t *instance)
     85void usb_device_keeper_release_default_address(usb_device_keeper_t *instance)
    8686{
    8787        assert(instance);
    … …  
    100100 * Really ugly one.
    101101 */
    102 void device_keeper_reset_if_need(
    103     device_keeper_t *instance, usb_target_t target, const unsigned char *data)
     102void usb_device_keeper_reset_if_need(
     103    usb_device_keeper_t *instance, usb_target_t target, const unsigned char *data)
    104104{
    105105        assert(instance);
    … …  
    144144 * @return Error code
    145145 */
    146 int device_keeper_get_toggle(
    147     device_keeper_t *instance, usb_target_t target, usb_direction_t direction)
     146int usb_device_keeper_get_toggle(
     147    usb_device_keeper_t *instance, usb_target_t target, usb_direction_t direction)
    148148{
    149149        assert(instance);
    … …  
    173173 * @return Error code.
    174174 */
    175 int device_keeper_set_toggle(device_keeper_t *instance,
     175int usb_device_keeper_set_toggle(usb_device_keeper_t *instance,
    176176    usb_target_t target, usb_direction_t direction, bool toggle)
    177177{
    … …  
    207207 * @return Free address, or error code.
    208208 */
    209 usb_address_t device_keeper_request(
    210     device_keeper_t *instance, usb_speed_t speed)
     209usb_address_t device_keeper_get_free_address(
     210    usb_device_keeper_t *instance, usb_speed_t speed)
    211211{
    212212        assert(instance);
    … …  
    241241 * @param[in] handle Devman handle of the device.
    242242 */
    243 void device_keeper_bind(
    244     device_keeper_t *instance, usb_address_t address, devman_handle_t handle)
     243void usb_device_keeper_bind(
     244    usb_device_keeper_t *instance, usb_address_t address, devman_handle_t handle)
    245245{
    246246        assert(instance);
    … …  
    258258 * @param[in] address Device address
    259259 */
    260 void device_keeper_release(device_keeper_t *instance, usb_address_t address)
     260void usb_device_keeper_release(usb_device_keeper_t *instance, usb_address_t address)
    261261{
    262262        assert(instance);
    … …  
    276276 * @return USB Address, or error code.
    277277 */
    278 usb_address_t device_keeper_find(
    279     device_keeper_t *instance, devman_handle_t handle)
     278usb_address_t usb_device_keeper_find(
     279    usb_device_keeper_t *instance, devman_handle_t handle)
    280280{
    281281        assert(instance);
    … …  
    299299 * @return USB speed.
    300300 */
    301 usb_speed_t device_keeper_speed(
    302     device_keeper_t *instance, usb_address_t address)
     301usb_speed_t usb_device_keeper_get_speed(
     302    usb_device_keeper_t *instance, usb_address_t address)
    303303{
    304304        assert(instance);
Note: See TracChangeset for help on using the changeset viewer.