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

Ignore:
Timestamp:
2012-06-03T20:45:58Z (10 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master
Children:
90478727
Parents:
f7e69f5 (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/recognise.h

    rf7e69f5 re1e4192  
    3333 * USB device recognition.
    3434 */
     35
    3536#ifndef LIBUSBDEV_RECOGNISE_H_
    3637#define LIBUSBDEV_RECOGNISE_H_
     
    4142#include <ipc/devman.h>
    4243
    43 int usb_device_create_match_ids_from_device_descriptor(
     44extern int usb_device_create_match_ids_from_device_descriptor(
    4445    const usb_standard_device_descriptor_t *, match_id_list_t *);
    4546
    46 int usb_device_create_match_ids_from_interface(
     47extern int usb_device_create_match_ids_from_interface(
    4748    const usb_standard_device_descriptor_t *,
    4849    const usb_standard_interface_descriptor_t *, match_id_list_t *);
    4950
    50 int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
     51extern int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
    5152
    52 int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
     53extern int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
    5354    ddf_dev_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
    5455
    5556#endif
     57
    5658/**
    5759 * @}
Note: See TracChangeset for help on using the changeset viewer.