Changeset 5a6cc679 in mainline for uspace/lib/usbdev/include/usb


Ignore:
Timestamp:
2018-01-31T02:21:24Z (7 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a0a9cc2
Parents:
132ab5d1
Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works :)

Location:
uspace/lib/usbdev/include/usb/dev
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h

    r132ab5d1 r5a6cc679  
    3838#define LIBUSBDEV_ALTERNATE_IFACES_H_
    3939
     40#include <errno.h>
    4041#include <usb/descriptor.h>
    4142#include <stddef.h>
    … …  
    6667
    6768size_t usb_interface_count_alternates(const uint8_t *, size_t, uint8_t);
    68 int usb_alternate_interfaces_init(usb_alternate_interfaces_t *,
     69errno_t usb_alternate_interfaces_init(usb_alternate_interfaces_t *,
    6970    const uint8_t *, size_t, int);
    7071void usb_alternate_interfaces_deinit(usb_alternate_interfaces_t *);

  • uspace/lib/usbdev/include/usb/dev/device.h

    r132ab5d1 r5a6cc679  
    5959
    6060/* DDF parts */
    61 int usb_device_create_ddf(ddf_dev_t *, const usb_endpoint_description_t **, const char **);
     61errno_t usb_device_create_ddf(ddf_dev_t *, const usb_endpoint_description_t **, const char **);
    6262void usb_device_destroy_ddf(ddf_dev_t *);
    6363
    … …  
    7777void usb_device_bus_exchange_end(async_exch_t *);
    7878
    79 int usb_device_select_interface(usb_device_t *, uint8_t,
     79errno_t usb_device_select_interface(usb_device_t *, uint8_t,
    8080    const usb_endpoint_description_t **);
    8181
    82 int usb_device_create_pipes(usb_device_t *usb_dev,
     82errno_t usb_device_create_pipes(usb_device_t *usb_dev,
    8383    const usb_endpoint_description_t **endpoints);
    8484void usb_device_destroy_pipes(usb_device_t *);

  • uspace/lib/usbdev/include/usb/dev/driver.h

    r132ab5d1 r5a6cc679  
    4343typedef struct {
    4444        /** Callback when a new device was added to the system. */
    45         int (*device_add)(usb_device_t *);
     45        errno_t (*device_add)(usb_device_t *);
    4646        /** Callback when a device is about to be removed from the system. */
    47         int (*device_remove)(usb_device_t *);
     47        errno_t (*device_remove)(usb_device_t *);
    4848        /** Callback when a device was removed from the system. */
    49         int (*device_gone)(usb_device_t *);
     49        errno_t (*device_gone)(usb_device_t *);
    5050        /** Callback asking the driver to online a specific function. */
    51         int (*function_online)(ddf_fun_t *);
     51        errno_t (*function_online)(ddf_fun_t *);
    5252        /** Callback asking the driver to offline a specific function. */
    53         int (*function_offline)(ddf_fun_t *);
     53        errno_t (*function_offline)(ddf_fun_t *);
    5454} usb_driver_ops_t;
    5555

  • uspace/lib/usbdev/include/usb/dev/pipes.h

    r132ab5d1 r5a6cc679  
    9898} usb_endpoint_mapping_t;
    9999
    100 int usb_pipe_initialize(usb_pipe_t *, usb_dev_session_t *);
    101 int usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *);
     100errno_t usb_pipe_initialize(usb_pipe_t *, usb_dev_session_t *);
     101errno_t usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *);
    102102
    103 int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     103errno_t usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
    104104    size_t, const uint8_t *, size_t, usb_dev_session_t *);
    105105
    106 int usb_pipe_register(usb_pipe_t *, const usb_standard_endpoint_descriptor_t *, const usb_superspeed_endpoint_companion_descriptor_t *);
    107 int usb_pipe_unregister(usb_pipe_t *);
     106errno_t usb_pipe_register(usb_pipe_t *, const usb_standard_endpoint_descriptor_t *, const usb_superspeed_endpoint_companion_descriptor_t *);
     107errno_t usb_pipe_unregister(usb_pipe_t *);
    108108
    109 int usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);
    110 int usb_pipe_write(usb_pipe_t *, const void *, size_t);
     109errno_t usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);
     110errno_t usb_pipe_write(usb_pipe_t *, const void *, size_t);
    111111
    112 int usb_pipe_control_read(usb_pipe_t *, const void *, size_t,
     112errno_t usb_pipe_control_read(usb_pipe_t *, const void *, size_t,
    113113    void *, size_t, size_t *);
    114 int usb_pipe_control_write(usb_pipe_t *, const void *, size_t,
     114errno_t usb_pipe_control_write(usb_pipe_t *, const void *, size_t,
    115115    const void *, size_t);
    116116

  • uspace/lib/usbdev/include/usb/dev/poll.h

    r132ab5d1 r5a6cc679  
    118118         * @return Whether to continue in polling.
    119119         */
    120         bool (*on_error)(usb_device_t *dev, int err_code, void *arg);
     120        bool (*on_error)(usb_device_t *dev, errno_t err_code, void *arg);
    121121
    122122
    … …  
    139139} usb_polling_t;
    140140
    141 int usb_polling_init(usb_polling_t *);
     141errno_t usb_polling_init(usb_polling_t *);
    142142void usb_polling_fini(usb_polling_t *);
    143143
    144 int usb_polling_start(usb_polling_t *);
    145 int usb_polling_join(usb_polling_t *);
     144errno_t usb_polling_start(usb_polling_t *);
     145errno_t usb_polling_join(usb_polling_t *);
    146146
    147147#endif

  • uspace/lib/usbdev/include/usb/dev/recognise.h

    r132ab5d1 r5a6cc679  
    4242#include <devman.h>
    4343
    44 extern int usb_device_create_match_ids_from_device_descriptor(
     44extern errno_t usb_device_create_match_ids_from_device_descriptor(
    4545    const usb_standard_device_descriptor_t *, match_id_list_t *);
    4646
    47 extern int usb_device_create_match_ids_from_interface(
     47extern errno_t usb_device_create_match_ids_from_interface(
    4848    const usb_standard_device_descriptor_t *,
    4949    const usb_standard_interface_descriptor_t *, match_id_list_t *);
    5050
    51 extern int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
     51extern errno_t usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
    5252
    5353#endif

  • uspace/lib/usbdev/include/usb/dev/request.h

    r132ab5d1 r5a6cc679  
    4444#include <usb/request.h>
    4545
    46 int usb_control_request_set(usb_pipe_t *,
     46errno_t usb_control_request_set(usb_pipe_t *,
    4747    usb_request_type_t, usb_request_recipient_t, uint8_t,
    4848    uint16_t, uint16_t, const void *, size_t);
    4949
    50 int usb_control_request_get(usb_pipe_t *,
     50errno_t usb_control_request_get(usb_pipe_t *,
    5151    usb_request_type_t, usb_request_recipient_t, uint8_t,
    5252    uint16_t, uint16_t, void *, size_t, size_t *);
    5353
    54 int usb_request_get_status(usb_pipe_t *, usb_request_recipient_t,
     54errno_t usb_request_get_status(usb_pipe_t *, usb_request_recipient_t,
    5555    uint16_t, uint16_t *);
    56 int usb_request_clear_feature(usb_pipe_t *, usb_request_type_t,
     56errno_t usb_request_clear_feature(usb_pipe_t *, usb_request_type_t,
    5757    usb_request_recipient_t, uint16_t, uint16_t);
    58 int usb_request_set_feature(usb_pipe_t *, usb_request_type_t,
     58errno_t usb_request_set_feature(usb_pipe_t *, usb_request_type_t,
    5959    usb_request_recipient_t, uint16_t, uint16_t);
    60 int usb_request_get_descriptor(usb_pipe_t *, usb_request_type_t,
     60errno_t usb_request_get_descriptor(usb_pipe_t *, usb_request_type_t,
    6161    usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t,
    6262    size_t *);
    63 int usb_request_get_descriptor_alloc(usb_pipe_t *, usb_request_type_t,
     63errno_t usb_request_get_descriptor_alloc(usb_pipe_t *, usb_request_type_t,
    6464    usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void **, size_t *);
    65 int usb_request_get_device_descriptor(usb_pipe_t *,
     65errno_t usb_request_get_device_descriptor(usb_pipe_t *,
    6666    usb_standard_device_descriptor_t *);
    67 int usb_request_get_bare_configuration_descriptor(usb_pipe_t *, int,
     67errno_t usb_request_get_bare_configuration_descriptor(usb_pipe_t *, int,
    6868    usb_standard_configuration_descriptor_t *);
    69 int usb_request_get_full_configuration_descriptor(usb_pipe_t *, int,
     69errno_t usb_request_get_full_configuration_descriptor(usb_pipe_t *, int,
    7070    void *, size_t, size_t *);
    71 int usb_request_get_full_configuration_descriptor_alloc(usb_pipe_t *,
     71errno_t usb_request_get_full_configuration_descriptor_alloc(usb_pipe_t *,
    7272    int, const void **, size_t *);
    73 int usb_request_set_descriptor(usb_pipe_t *, usb_request_type_t,
     73errno_t usb_request_set_descriptor(usb_pipe_t *, usb_request_type_t,
    7474    usb_request_recipient_t, uint8_t, uint8_t, uint16_t, const void *, size_t);
    7575
    76 int usb_request_get_configuration(usb_pipe_t *, uint8_t *);
    77 int usb_request_set_configuration(usb_pipe_t *, uint8_t);
     76errno_t usb_request_get_configuration(usb_pipe_t *, uint8_t *);
     77errno_t usb_request_set_configuration(usb_pipe_t *, uint8_t);
    7878
    79 int usb_request_get_interface(usb_pipe_t *, uint8_t, uint8_t *);
    80 int usb_request_set_interface(usb_pipe_t *, uint8_t, uint8_t);
     79errno_t usb_request_get_interface(usb_pipe_t *, uint8_t, uint8_t *);
     80errno_t usb_request_set_interface(usb_pipe_t *, uint8_t, uint8_t);
    8181
    82 int usb_request_get_supported_languages(usb_pipe_t *,
     82errno_t usb_request_get_supported_languages(usb_pipe_t *,
    8383    l18_win_locales_t **, size_t *);
    84 int usb_request_get_string(usb_pipe_t *, size_t, l18_win_locales_t,
     84errno_t usb_request_get_string(usb_pipe_t *, size_t, l18_win_locales_t,
    8585    char **);
    8686
    87 int usb_pipe_clear_halt(usb_pipe_t *, usb_pipe_t *);
    88 int usb_request_get_endpoint_status(usb_pipe_t *, usb_pipe_t *, uint16_t *);
     87errno_t usb_pipe_clear_halt(usb_pipe_t *, usb_pipe_t *);
     88errno_t usb_request_get_endpoint_status(usb_pipe_t *, usb_pipe_t *, uint16_t *);
    8989
    9090#endif
Note: See TracChangeset for help on using the changeset viewer.