Changeset b7fd2a0 in mainline for uspace/lib/usbdev/include


Ignore:
Timestamp:
2018-01-13T03:10:29Z (7 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a53ed3a
Parents:
36f0738
Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

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

Legend:

Unmodified
Added
Removed

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

    r36f0738 rb7fd2a0  
    6767
    6868size_t usb_interface_count_alternates(const uint8_t *, size_t, uint8_t);
    69 int usb_alternate_interfaces_init(usb_alternate_interfaces_t *,
     69errno_t usb_alternate_interfaces_init(usb_alternate_interfaces_t *,
    7070    const uint8_t *, size_t, int);
    7171void usb_alternate_interfaces_deinit(usb_alternate_interfaces_t *);

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

    r36f0738 rb7fd2a0  
    5858
    5959/* DDF parts */
    60 int usb_device_create_ddf(ddf_dev_t *, const usb_endpoint_description_t **, const char **);
     60errno_t usb_device_create_ddf(ddf_dev_t *, const usb_endpoint_description_t **, const char **);
    6161void usb_device_destroy_ddf(ddf_dev_t *);
    6262
    … …  
    7676void usb_device_bus_exchange_end(async_exch_t *);
    7777
    78 int usb_device_select_interface(usb_device_t *, uint8_t,
     78errno_t usb_device_select_interface(usb_device_t *, uint8_t,
    7979    const usb_endpoint_description_t **);
    8080
    81 int usb_device_create_pipes(usb_device_t *usb_dev,
     81errno_t usb_device_create_pipes(usb_device_t *usb_dev,
    8282    const usb_endpoint_description_t **endpoints);
    8383void usb_device_destroy_pipes(usb_device_t *);

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

    r36f0738 rb7fd2a0  
    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_rem)(usb_device_t *);
     47        errno_t (*device_rem)(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} usb_driver_ops_t;
    5151

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

    r36f0738 rb7fd2a0  
    109109} usb_endpoint_mapping_t;
    110110
    111 int usb_pipe_initialize(usb_pipe_t *, usb_endpoint_t, usb_transfer_type_t,
     111errno_t usb_pipe_initialize(usb_pipe_t *, usb_endpoint_t, usb_transfer_type_t,
    112112    size_t, usb_direction_t, unsigned, usb_dev_session_t *);
    113 int usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *);
     113errno_t usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *);
    114114
    115 int usb_pipe_probe_default_control(usb_pipe_t *);
    116 int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     115errno_t usb_pipe_probe_default_control(usb_pipe_t *);
     116errno_t usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
    117117    size_t, const uint8_t *, size_t, usb_dev_session_t *);
    118118
    119 int usb_pipe_register(usb_pipe_t *, unsigned);
    120 int usb_pipe_unregister(usb_pipe_t *);
     119errno_t usb_pipe_register(usb_pipe_t *, unsigned);
     120errno_t usb_pipe_unregister(usb_pipe_t *);
    121121
    122 int usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);
    123 int usb_pipe_write(usb_pipe_t *, const void *, size_t);
     122errno_t usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);
     123errno_t usb_pipe_write(usb_pipe_t *, const void *, size_t);
    124124
    125 int usb_pipe_control_read(usb_pipe_t *, const void *, size_t,
     125errno_t usb_pipe_control_read(usb_pipe_t *, const void *, size_t,
    126126    void *, size_t, size_t *);
    127 int usb_pipe_control_write(usb_pipe_t *, const void *, size_t,
     127errno_t usb_pipe_control_write(usb_pipe_t *, const void *, size_t,
    128128    const void *, size_t);
    129129

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

    r36f0738 rb7fd2a0  
    8787         * @return Whether to continue in polling.
    8888         */
    89         bool (*on_error)(usb_device_t *dev, int err_code, void *arg);
     89        bool (*on_error)(usb_device_t *dev, errno_t err_code, void *arg);
    9090        /** Argument to pass to callbacks. */
    9191        void *arg;
    … …  
    9595typedef void (*usb_polling_terminted_callback_t)(usb_device_t *, bool, void *);
    9696
    97 extern int usb_device_auto_polling(usb_device_t *, usb_endpoint_t,
     97extern errno_t usb_device_auto_polling(usb_device_t *, usb_endpoint_t,
    9898    const usb_device_auto_polling_t *, size_t);
    9999
    100 extern int usb_device_auto_poll(usb_device_t *, usb_endpoint_t,
     100extern errno_t usb_device_auto_poll(usb_device_t *, usb_endpoint_t,
    101101    usb_polling_callback_t, size_t, int, usb_polling_terminted_callback_t, void *);
    102102
    103 extern int usb_device_auto_polling_desc(usb_device_t *,
     103extern errno_t usb_device_auto_polling_desc(usb_device_t *,
    104104    const usb_endpoint_description_t *, const usb_device_auto_polling_t *,
    105105    size_t);
    106106
    107 extern int usb_device_auto_poll_desc(usb_device_t *,
     107extern errno_t usb_device_auto_poll_desc(usb_device_t *,
    108108    const usb_endpoint_description_t *, usb_polling_callback_t, size_t, int,
    109109    usb_polling_terminted_callback_t, void *);

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

    r36f0738 rb7fd2a0  
    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

    r36f0738 rb7fd2a0  
    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_request_clear_endpoint_halt(usb_pipe_t *, uint16_t);
    88 int usb_pipe_clear_halt(usb_pipe_t *, usb_pipe_t *);
    89 int usb_request_get_endpoint_status(usb_pipe_t *, usb_pipe_t *, uint16_t *);
     87errno_t usb_request_clear_endpoint_halt(usb_pipe_t *, uint16_t);
     88errno_t usb_pipe_clear_halt(usb_pipe_t *, usb_pipe_t *);
     89errno_t usb_request_get_endpoint_status(usb_pipe_t *, usb_pipe_t *, uint16_t *);
    9090
    9191#endif
Note: See TracChangeset for help on using the changeset viewer.