Ignore:
Timestamp:
2012-06-06T21:13:29Z (12 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5f679702
Parents:
11b9ad7 (diff), 3123d2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/usbhost/include/usb/host/hcd.h

    r11b9ad7 r520acaf  
    3333 *
    3434 */
     35
    3536#ifndef LIBUSBHOST_HOST_HCD_H
    3637#define LIBUSBHOST_HOST_HCD_H
     
    6162        void (*ep_remove_hook)(hcd_t *, endpoint_t *);
    6263};
    63 /*----------------------------------------------------------------------------*/
     64
    6465/** Initialize hcd_t structure.
    6566 * Initializes device and endpoint managers. Sets data and hook pointer to NULL.
     
    7980        hcd->ep_remove_hook = NULL;
    8081}
    81 /*----------------------------------------------------------------------------*/
     82
    8283/** Check registered endpoints and reset toggle bit if necessary.
    8384 * @param hcd hcd_t structure, non-null.
     
    9293            &hcd->ep_manager, target, (const uint8_t *)setup_data);
    9394}
    94 /*----------------------------------------------------------------------------*/
     95
    9596/** Data retrieve wrapper.
    9697 * @param fun ddf function, non-null.
     
    102103        return fun->driver_data;
    103104}
    104 /*----------------------------------------------------------------------------*/
     105
    105106extern usbhc_iface_t hcd_iface;
    106107
    107108#endif
     109
    108110/**
    109111 * @}
Note: See TracChangeset for help on using the changeset viewer.