Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2012-06-06T21:13:29Z (10 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master
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/usbdev/include/usb/dev/hub.h

    r11b9ad7 r520acaf  
    3535 * For class specific requests, see usb/classes/hub.h.
    3636 */
     37
    3738#ifndef LIBUSBDEV_HUB_H_
    3839#define LIBUSBDEV_HUB_H_
     
    4344#include <usb/hc.h>
    4445
    45 int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
     46extern int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
    4647    int (*)(void *), void *, usb_address_t *, ddf_dev_ops_t *, void *,
    4748    ddf_fun_t **);
     
    6061} usb_hub_attached_device_t;
    6162
    62 int usb_hub_register_device(usb_hc_connection_t *,
     63extern int usb_hub_register_device(usb_hc_connection_t *,
    6364    const usb_hub_attached_device_t *);
    6465
     
    6970        if (attached_device == NULL)
    7071                return EBADMEM;
     72       
    7173        return usb_hc_release_address(conn, attached_device->address);
    7274}
    7375
    7476#endif
     77
    7578/**
    7679 * @}
Note: See TracChangeset for help on using the changeset viewer.