Changeset 97c7682 in mainline for uspace/lib/usbhost/src/iface.c


Ignore:
Timestamp:
2012-07-14T11:18:40Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
804d9b6
Parents:
0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r0747468 r97c7682  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
     28
    2829/** @addtogroup libusbhost
    2930 * @{
    … …  
    3233 * @brief HCD DDF interface implementation
    3334 */
     35
    3436#include <ddf/driver.h>
    3537#include <errno.h>
    … …  
    98100        return ret;
    99101}
    100 /*----------------------------------------------------------------------------*/
     102
    101103/** Calls ep_add_hook upon endpoint registration.
    102104 * @param ep Endpoint to be registered.
    … …  
    113115        return EOK;
    114116}
    115 /*----------------------------------------------------------------------------*/
     117
    116118/** Calls ep_remove_hook upon endpoint removal.
    117119 * @param ep Endpoint to be unregistered.
    … …  
    126128                hcd->ep_remove_hook(hcd, ep);
    127129}
    128 /*----------------------------------------------------------------------------*/
     130
    129131/** Calls ep_remove_hook upon endpoint removal. Prints warning.
    130132 * @param ep Endpoint to be unregistered.
    … …  
    141143                hcd->ep_remove_hook(hcd, ep);
    142144}
    143 /*----------------------------------------------------------------------------*/
     145
    144146/** Request address interface function.
    145147 *
    … …  
    164166            &hcd->dev_manager, address, strict, speed);
    165167}
    166 /*----------------------------------------------------------------------------*/
     168
    167169/** Bind address interface function.
    168170 *
    … …  
    183185            &hcd->dev_manager, address, handle);
    184186}
    185 /*----------------------------------------------------------------------------*/
     187
    186188/** Find device handle by address interface function.
    187189 *
    … …  
    200202            &hcd->dev_manager, address, handle, NULL);
    201203}
    202 /*----------------------------------------------------------------------------*/
     204
    203205/** Release address interface function.
    204206 *
    … …  
    218220        return EOK;
    219221}
    220 /*----------------------------------------------------------------------------*/
     222
    221223/** Register endpoint interface function.
    222224 * @param fun DDF function.
    … …  
    254256            register_helper, hcd);
    255257}
    256 /*----------------------------------------------------------------------------*/
     258
    257259/** Unregister endpoint interface function.
    258260 * @param fun DDF function.
    … …  
    274276            endpoint, direction, unregister_helper, hcd);
    275277}
    276 /*----------------------------------------------------------------------------*/
     278
    277279/** Inbound communication interface function.
    278280 * @param fun DDF function.
    … …  
    292294            setup_data, callback, NULL, arg, "READ");
    293295}
    294 /*----------------------------------------------------------------------------*/
     296
    295297/** Outbound communication interface function.
    296298 * @param fun DDF function.
    … …  
    310312            setup_data, NULL, callback, arg, "WRITE");
    311313}
    312 /*----------------------------------------------------------------------------*/
     314
    313315/** usbhc Interface implementation using hcd_t from libusbhost library. */
    314316usbhc_iface_t hcd_iface = {
    … …  
    324326        .write = usb_write,
    325327};
     328
    326329/**
    327330 * @}
Note: See TracChangeset for help on using the changeset viewer.