Changeset 43c3937 in mainline for uspace/lib/drv/include


Ignore:
Timestamp:
2011-01-07T10:43:15Z (15 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5097bed4
Parents:
5f7d96e (diff), 0f191a2 (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 with usb/development

Location:
uspace/lib/drv/include
Files:
1 added
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/drv/include/remote_usb.h

    r5f7d96e r43c3937  
    11/*
    2  * Copyright (c) 2010 Jakub Jermar
     2 * Copyright (c) 2010 Vojtech Horky
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup libc
     29/** @addtogroup libdrv
    3030 * @{
    3131 */
     
    3333 */
    3434
    35 #ifndef LIBC_ASYNC_REL_H_
    36 #define LIBC_ASYNC_REL_H_
     35#ifndef LIBDRV_REMOTE_USB_H_
     36#define LIBDRV_REMOTE_USB_H_
    3737
    38 extern int async_rel_init(void);
    39 extern int async_relation_create(int);
    40 extern void async_relation_destroy(int, int);
     38remote_iface_t remote_usb_iface;
    4139
    4240#endif
    4341
    44 /** @}
     42/**
     43 * @}
    4544 */
  • uspace/lib/drv/include/usbhc_iface.h

    r5f7d96e r43c3937  
    3131 */
    3232/** @file
    33  * @brief USB interface definition.
     33 * @brief USB host controller interface definition.
    3434 */
    3535
     
    226226    usbhc_iface_transfer_in_callback_t, void *);
    227227
    228 /** USB devices communication interface. */
     228/** USB host controller communication interface. */
    229229typedef struct {
    230230        int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);
Note: See TracChangeset for help on using the changeset viewer.