Changeset b7fd2a0 in mainline for uspace/lib/usbhid


Ignore:
Timestamp:
2018-01-13T03:10:29Z (8 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/usbhid
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usbhid/include/usb/hid/hiddescriptor.h

    r36f0738 rb7fd2a0  
    4343#include <usb/hid/hidtypes.h>
    4444
    45 int usb_hid_parse_report_descriptor(usb_hid_report_t *report,
     45errno_t usb_hid_parse_report_descriptor(usb_hid_report_t *report,
    4646                const uint8_t *data, size_t size);
    4747
    4848void usb_hid_descriptor_print(usb_hid_report_t *report);
    4949
    50 int usb_hid_report_init(usb_hid_report_t *report);
     50errno_t usb_hid_report_init(usb_hid_report_t *report);
    5151
    5252void usb_hid_report_deinit(usb_hid_report_t *report);
    5353
    54 int usb_hid_report_append_fields(usb_hid_report_t *report,
     54errno_t usb_hid_report_append_fields(usb_hid_report_t *report,
    5555                usb_hid_report_item_t *report_item);
    5656

  • uspace/lib/usbhid/include/usb/hid/hidparser.h

    r36f0738 rb7fd2a0  
    4747 * Input report parser functions
    4848 */
    49 int usb_hid_parse_report(const usb_hid_report_t *report, const uint8_t *data,
     49errno_t usb_hid_parse_report(const usb_hid_report_t *report, const uint8_t *data,
    5050                size_t size, uint8_t *report_id);
    5151
    … …  
    6565
    6666
    67 int usb_hid_report_output_translate(usb_hid_report_t *report,
     67errno_t usb_hid_report_output_translate(usb_hid_report_t *report,
    6868                uint8_t report_id, uint8_t *buffer, size_t size);
    6969

  • uspace/lib/usbhid/include/usb/hid/hidpath.h

    r36f0738 rb7fd2a0  
    118118void usb_hid_report_path_free(usb_hid_report_path_t *path);
    119119
    120 int usb_hid_report_path_set_report_id(usb_hid_report_path_t *usage_path,
     120errno_t usb_hid_report_path_set_report_id(usb_hid_report_path_t *usage_path,
    121121                uint8_t report_id);
    122122
    123 int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path,
     123errno_t usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path,
    124124                int32_t usage_page, int32_t usage);
    125125

  • uspace/lib/usbhid/include/usb/hid/hidreport.h

    r36f0738 rb7fd2a0  
    5858 *         usb_pipe_end_session() or usb_request_get_descriptor().
    5959 */
    60 int usb_hid_process_report_descriptor(usb_device_t *dev,
     60errno_t usb_hid_process_report_descriptor(usb_device_t *dev,
    6161    usb_hid_report_t *report, uint8_t **report_desc, size_t *report_size);
    6262

  • uspace/lib/usbhid/include/usb/hid/request.h

    r36f0738 rb7fd2a0  
    4444
    4545
    46 int usbhid_req_set_report(usb_pipe_t *ctrl_pipe, int iface_no,
     46errno_t usbhid_req_set_report(usb_pipe_t *ctrl_pipe, int iface_no,
    4747    usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size);
    4848
    49 int usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
     49errno_t usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
    5050    usb_hid_protocol_t protocol);
    5151
    52 int usbhid_req_set_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t duration);
     52errno_t usbhid_req_set_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t duration);
    5353
    54 int usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no,
     54errno_t usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no,
    5555    usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size,
    5656    size_t *actual_size);
    5757
    58 int usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
     58errno_t usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
    5959    usb_hid_protocol_t *protocol);
    6060
    61 int usbhid_req_get_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t *duration);
     61errno_t usbhid_req_get_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t *duration);
    6262
    6363

  • uspace/lib/usbhid/src/hiddescriptor.c

    r36f0738 rb7fd2a0  
    134134 * @retval EOK If report structure was successfully initialized
    135135 */
    136 int usb_hid_report_init(usb_hid_report_t *report)
     136errno_t usb_hid_report_init(usb_hid_report_t *report)
    137137{
    138138        if (report == NULL) {
    … …  
    162162 *
    163163 */
    164 int usb_hid_report_append_fields(usb_hid_report_t *report,
     164errno_t usb_hid_report_append_fields(usb_hid_report_t *report,
    165165                usb_hid_report_item_t *report_item) {
    166166
    … …  
    356356 * @retval EOK If report descriptor is successfully parsed
    357357 */
    358 int usb_hid_parse_report_descriptor(usb_hid_report_t *report,
     358errno_t usb_hid_parse_report_descriptor(usb_hid_report_t *report,
    359359    const uint8_t *data, size_t size)
    360360{

  • uspace/lib/usbhid/src/hidparser.c

    r36f0738 rb7fd2a0  
    127127 * @return Error code.
    128128 */
    129 int usb_hid_parse_report(const usb_hid_report_t *report, const uint8_t *data,
     129errno_t usb_hid_parse_report(const usb_hid_report_t *report, const uint8_t *data,
    130130    size_t size, uint8_t *report_id)
    131131{
    … …  
    334334 * @return Error code
    335335 */
    336 int usb_hid_report_output_translate(usb_hid_report_t *report,
     336errno_t usb_hid_report_output_translate(usb_hid_report_t *report,
    337337    uint8_t report_id, uint8_t *buffer, size_t size)
    338338{

  • uspace/lib/usbhid/src/hidpath.c

    r36f0738 rb7fd2a0  
    7373 * @return Error code
    7474 */
    75 int usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path,
     75errno_t usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path,
    7676                                    int32_t usage_page, int32_t usage)
    7777{       
    … …  
    423423 * @return Error code
    424424 */
    425 int usb_hid_report_path_set_report_id(usb_hid_report_path_t *path,
     425errno_t usb_hid_report_path_set_report_id(usb_hid_report_path_t *path,
    426426        uint8_t report_id)
    427427{

  • uspace/lib/usbhid/src/hidreport.c

    r36f0738 rb7fd2a0  
    5050#include <usb/hid/hidreport.h>
    5151
    52 static int usb_hid_get_report_descriptor(usb_device_t *dev,
     52static errno_t usb_hid_get_report_descriptor(usb_device_t *dev,
    5353    uint8_t **report_desc, size_t *size)
    5454{
    … …  
    135135         * Get the descriptor from the device.
    136136         */
    137         int rc = usb_request_get_descriptor(usb_device_get_default_pipe(dev),
     137        errno_t rc = usb_request_get_descriptor(usb_device_get_default_pipe(dev),
    138138            USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_INTERFACE,
    139139            USB_DESCTYPE_HID_REPORT, 0, usb_device_get_iface_number(dev),
    … …  
    163163
    164164
    165 int usb_hid_process_report_descriptor(usb_device_t *dev,
     165errno_t usb_hid_process_report_descriptor(usb_device_t *dev,
    166166    usb_hid_report_t *report, uint8_t **report_desc, size_t *report_size)
    167167{
    … …  
    175175//      size_t report_size;
    176176       
    177         int rc = usb_hid_get_report_descriptor(dev, report_desc, report_size);
     177        errno_t rc = usb_hid_get_report_descriptor(dev, report_desc, report_size);
    178178       
    179179        if (rc != EOK) {

  • uspace/lib/usbhid/src/hidreq.c

    r36f0738 rb7fd2a0  
    5858 * @return Other value inherited from function usb_control_request_set().
    5959 */
    60 int usbhid_req_set_report(usb_pipe_t *ctrl_pipe, int iface_no,
     60errno_t usbhid_req_set_report(usb_pipe_t *ctrl_pipe, int iface_no,
    6161    usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size)
    6262{
    … …  
    7777         */
    7878       
    79         int rc;
     79        errno_t rc;
    8080       
    8181        uint16_t value = 0;
    … …  
    108108 * @return Other value inherited from function usb_control_request_set().
    109109 */
    110 int usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
     110errno_t usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
    111111    usb_hid_protocol_t protocol)
    112112{
    … …  
    127127         */
    128128       
    129         int rc;
     129        errno_t rc;
    130130
    131131        usb_log_debug("Sending Set Protocol request to the device ("
    … …  
    157157 * @return Other value inherited from function usb_control_request_set().
    158158 */
    159 int usbhid_req_set_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t duration)
    160 {
    161         if (ctrl_pipe == NULL) {
    162                 usb_log_warning("usbhid_req_set_report(): no pipe given.\n");
    163                 return EINVAL;
    164         }
    165        
    166         if (iface_no < 0) {
    167                 usb_log_warning("usbhid_req_set_report(): no interface given."
    168                     "\n");
    169                 return EINVAL;
    170         }
    171        
    172         /*
    173          * No need for checking other parameters, as they are checked in
    174          * the called function (usb_control_request_set()).
    175          */
    176        
    177         int rc;
     159errno_t usbhid_req_set_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t duration)
     160{
     161        if (ctrl_pipe == NULL) {
     162                usb_log_warning("usbhid_req_set_report(): no pipe given.\n");
     163                return EINVAL;
     164        }
     165       
     166        if (iface_no < 0) {
     167                usb_log_warning("usbhid_req_set_report(): no interface given."
     168                    "\n");
     169                return EINVAL;
     170        }
     171       
     172        /*
     173         * No need for checking other parameters, as they are checked in
     174         * the called function (usb_control_request_set()).
     175         */
     176       
     177        errno_t rc;
    178178
    179179        usb_log_debug("Sending Set Idle request to the device ("
    … …  
    210210 * @return Other value inherited from function usb_control_request_set().
    211211 */
    212 int usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no,
     212errno_t usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no,
    213213    usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size,
    214214    size_t *actual_size)
    … …  
    230230         */
    231231       
    232         int rc;
     232        errno_t rc;
    233233
    234234        uint16_t value = 0;
    … …  
    262262 * @return Other value inherited from function usb_control_request_set().
    263263 */
    264 int usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
     264errno_t usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
    265265    usb_hid_protocol_t *protocol)
    266266{
    … …  
    281281         */
    282282       
    283         int rc;
     283        errno_t rc;     
    284284
    285285        usb_log_debug("Sending Get Protocol request to the device ("
    … …  
    324324 *         usb_control_request_set().
    325325 */
    326 int usbhid_req_get_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t *duration)
    327 {
    328         if (ctrl_pipe == NULL) {
    329                 usb_log_warning("usbhid_req_set_report(): no pipe given.\n");
    330                 return EINVAL;
    331         }
    332        
    333         if (iface_no < 0) {
    334                 usb_log_warning("usbhid_req_set_report(): no interface given."
    335                     "\n");
    336                 return EINVAL;
    337         }
    338        
    339         /*
    340          * No need for checking other parameters, as they are checked in
    341          * the called function (usb_control_request_set()).
    342          */
    343        
    344         int rc;
     326errno_t usbhid_req_get_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t *duration)
     327{
     328        if (ctrl_pipe == NULL) {
     329                usb_log_warning("usbhid_req_set_report(): no pipe given.\n");
     330                return EINVAL;
     331        }
     332       
     333        if (iface_no < 0) {
     334                usb_log_warning("usbhid_req_set_report(): no interface given."
     335                    "\n");
     336                return EINVAL;
     337        }
     338       
     339        /*
     340         * No need for checking other parameters, as they are checked in
     341         * the called function (usb_control_request_set()).
     342         */
     343       
     344        errno_t rc;
    345345
    346346        usb_log_debug("Sending Get Idle request to the device ("
Note: See TracChangeset for help on using the changeset viewer.