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 :)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/hid/usbhid/generic/hiddev.c

    r132ab5d1 r5a6cc679  
    6060
    6161static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun);
    62 static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer,
     62static errno_t usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer,
    6363    size_t size, size_t *act_size, int *event_nr, unsigned int flags);
    64 static int usb_generic_hid_client_connected(ddf_fun_t *fun);
     64static errno_t usb_generic_hid_client_connected(ddf_fun_t *fun);
    6565static size_t usb_generic_get_report_descriptor_length(ddf_fun_t *fun);
    66 static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc,
     66static errno_t usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc,
    6767    size_t size, size_t *actual_size);
    6868
    … …  
    102102}
    103103
    104 static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer,
     104static errno_t usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer,
    105105    size_t size, size_t *act_size, int *event_nr, unsigned int flags)
    106106{
    … …  
    143143}
    144144
    145 static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc,
     145static errno_t usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc,
    146146    size_t size, size_t *actual_size)
    147147{
    … …  
    160160}
    161161
    162 static int usb_generic_hid_client_connected(ddf_fun_t *fun)
     162static errno_t usb_generic_hid_client_connected(ddf_fun_t *fun)
    163163{
    164164        usb_log_debug("Generic HID: Client connected.");
    … …  
    180180}
    181181
    182 int usb_generic_hid_init(usb_hid_dev_t *hid_dev, void **data)
     182errno_t usb_generic_hid_init(usb_hid_dev_t *hid_dev, void **data)
    183183{
    184184        usb_hid_gen_fun_t *hid_fun;
    … …  
    202202        ddf_fun_set_ops(fun, &usb_generic_hid_ops);
    203203
    204         int rc = ddf_fun_bind(fun);
     204        errno_t rc = ddf_fun_bind(fun);
    205205        if (rc != EOK) {
    206206                usb_log_error("Could not bind DDF function: %s.",
Note: See TracChangeset for help on using the changeset viewer.