Changeset 5a6cc679 in mainline for uspace/drv/hid/usbhid


Ignore:
Timestamp:
2018-01-31T02:21:24Z (8 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/drv/hid/usbhid
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/hid/usbhid/blink1/blink1.c

    r132ab5d1 r5a6cc679  
    6060} blink1_report_t;
    6161
    62 static int usb_blink1_color_set(ddf_fun_t *fun, pixel_t pixel)
     62static errno_t usb_blink1_color_set(ddf_fun_t *fun, pixel_t pixel)
    6363{
    6464        usb_blink1_t *blink1_dev = (usb_blink1_t *) ddf_fun_data_get(fun);
    … …  
    9393};
    9494
    95 int usb_blink1_init(usb_hid_dev_t *hid_dev, void **data)
     95errno_t usb_blink1_init(usb_hid_dev_t *hid_dev, void **data)
    9696{
    9797        if (hid_dev == NULL) {
    … …  
    121121        ddf_fun_set_ops(fun, &blink1_ops);
    122122       
    123         int rc = ddf_fun_bind(fun);
     123        errno_t rc = ddf_fun_bind(fun);
    124124        if (rc != EOK) {
    125125                usb_log_error("Could not bind DDF function `%s': %s.",
    … …  
    159159        usb_blink1_t *blink1_dev = (usb_blink1_t *) data;
    160160       
    161         int rc = ddf_fun_unbind(blink1_dev->fun);
     161        errno_t rc = ddf_fun_unbind(blink1_dev->fun);
    162162        if (rc != EOK) {
    163163                usb_log_error("Could not unbind function `%s', it "

  • uspace/drv/hid/usbhid/blink1/blink1.h

    r132ab5d1 r5a6cc679  
    5252extern const char *HID_BLINK1_CATEGORY;
    5353
    54 extern int usb_blink1_init(usb_hid_dev_t *, void **);
     54extern errno_t usb_blink1_init(usb_hid_dev_t *, void **);
    5555extern void usb_blink1_deinit(usb_hid_dev_t *, void *);
    5656

  • 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.",

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

    r132ab5d1 r5a6cc679  
    5151} usb_hid_gen_fun_t;
    5252
    53 extern int usb_generic_hid_init(usb_hid_dev_t *, void **);
     53extern errno_t usb_generic_hid_init(usb_hid_dev_t *, void **);
    5454extern void usb_generic_hid_deinit(usb_hid_dev_t *, void *);
    5555extern bool usb_generic_hid_polling_callback(usb_hid_dev_t *, void *);

  • uspace/drv/hid/usbhid/kbd/kbddev.c

    r132ab5d1 r5a6cc679  
    257257
    258258        // TODO: what about the Report ID?
    259         int rc = usb_hid_report_output_translate(&hid_dev->report, 0,
     259        errno_t rc = usb_hid_report_output_translate(&hid_dev->report, 0,
    260260            kbd_dev->output_buffer, kbd_dev->output_size);
    261261
    … …  
    435435        }
    436436
    437         int ret =
     437        errno_t ret =
    438438           usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
    439439        if (ret != EOK) {
    … …  
    480480/* HID/KBD structure manipulation                                             */
    481481
    482 static int kbd_dev_init(usb_kbd_t *kbd_dev, usb_hid_dev_t *hid_dev)
     482static errno_t kbd_dev_init(usb_kbd_t *kbd_dev, usb_hid_dev_t *hid_dev)
    483483{
    484484        assert(kbd_dev);
    … …  
    507507        }
    508508
    509         int ret =
     509        errno_t ret =
    510510            usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
    511511        if (ret != EOK) {
    … …  
    616616 * @return Other value inherited from function usbhid_dev_init().
    617617 */
    618 int usb_kbd_init(usb_hid_dev_t *hid_dev, void **data)
     618errno_t usb_kbd_init(usb_hid_dev_t *hid_dev, void **data)
    619619{
    620620        usb_log_debug("Initializing HID/KBD structure...");
    … …  
    642642        }
    643643
    644         int ret = kbd_dev_init(kbd_dev, hid_dev);
     644        errno_t ret = kbd_dev_init(kbd_dev, hid_dev);
    645645        if (ret != EOK) {
    646646                usb_log_error("Failed to initialize KBD device  structure.");
    … …  
    776776}
    777777
    778 int usb_kbd_set_boot_protocol(usb_hid_dev_t *hid_dev)
     778errno_t usb_kbd_set_boot_protocol(usb_hid_dev_t *hid_dev)
    779779{
    780780        assert(hid_dev);
    781         int rc = usb_hid_parse_report_descriptor(
     781        errno_t rc = usb_hid_parse_report_descriptor(
    782782            &hid_dev->report, USB_KBD_BOOT_REPORT_DESCRIPTOR,
    783783            sizeof(USB_KBD_BOOT_REPORT_DESCRIPTOR));

  • uspace/drv/hid/usbhid/kbd/kbddev.h

    r132ab5d1 r5a6cc679  
    115115extern const char *HID_KBD_CATEGORY;
    116116
    117 extern int usb_kbd_init(usb_hid_dev_t *, void **);
     117extern errno_t usb_kbd_init(usb_hid_dev_t *, void **);
    118118extern bool usb_kbd_polling_callback(usb_hid_dev_t *, void *);
    119119extern int usb_kbd_is_initialized(const usb_kbd_t *);
    … …  
    122122extern void usb_kbd_push_ev(usb_kbd_t *, int, unsigned int);
    123123extern void usb_kbd_deinit(usb_hid_dev_t *, void *);
    124 extern int usb_kbd_set_boot_protocol(usb_hid_dev_t *);
     124extern errno_t usb_kbd_set_boot_protocol(usb_hid_dev_t *);
    125125
    126126#endif /* USB_HID_KBDDEV_H_ */

  • uspace/drv/hid/usbhid/kbd/kbdrepeat.c

    r132ab5d1 r5a6cc679  
    117117 * @retval EINVAL if no argument is supplied.
    118118 */
    119 int usb_kbd_repeat_fibril(void *arg)
     119errno_t usb_kbd_repeat_fibril(void *arg)
    120120{
    121121        usb_log_debug("Autorepeat fibril spawned.");

  • uspace/drv/hid/usbhid/kbd/kbdrepeat.h

    r132ab5d1 r5a6cc679  
    5959
    6060
    61 int usb_kbd_repeat_fibril(void *arg);
     61errno_t usb_kbd_repeat_fibril(void *arg);
    6262
    6363void usb_kbd_repeat_start(struct usb_kbd_t *kbd, unsigned int key);

  • uspace/drv/hid/usbhid/main.c

    r132ab5d1 r5a6cc679  
    5656 * @return Error code.
    5757 */
    58 static int usb_hid_device_add(usb_device_t *dev)
     58static errno_t usb_hid_device_add(usb_device_t *dev)
    5959{
    6060        usb_log_debug("%s", __FUNCTION__);
    … …  
    7777        }
    7878
    79         int rc = usb_hid_init(hid_dev, dev);
     79        errno_t rc = usb_hid_init(hid_dev, dev);
    8080        if (rc != EOK) {
    8181                usb_log_error("Failed to initialize USB/HID device.");
    … …  
    126126 * @return Error code.
    127127 */
    128 static int usb_hid_device_remove(usb_device_t *dev)
     128static errno_t usb_hid_device_remove(usb_device_t *dev)
    129129{
    130130        assert(dev);
    … …  
    142142 * @return Error code.
    143143 */
    144 static int usb_hid_device_gone(usb_device_t *dev)
     144static errno_t usb_hid_device_gone(usb_device_t *dev)
    145145{
    146146        assert(dev);

  • uspace/drv/hid/usbhid/mouse/mousedev.c

    r132ab5d1 r5a6cc679  
    228228                return;
    229229        }
    230         int ret =
     230        errno_t ret =
    231231           usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
    232232        if (ret != EOK) {
    … …  
    318318}
    319319
    320 static int mouse_dev_init(usb_mouse_t *mouse_dev, usb_hid_dev_t *hid_dev)
     320static errno_t mouse_dev_init(usb_mouse_t *mouse_dev, usb_hid_dev_t *hid_dev)
    321321{
    322322        // FIXME: This may not be optimal since stupid hardware vendor may
    … …  
    342342}
    343343
    344 int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
     344errno_t usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
    345345{
    346346        usb_log_debug("Initializing HID/Mouse structure...");
    … …  
    369369        }
    370370
    371         int ret = mouse_dev_init(mouse_dev, hid_dev);
     371        errno_t ret = mouse_dev_init(mouse_dev, hid_dev);
    372372        if (ret != EOK) {
    373373                usb_log_error("Failed to init HID mouse device structure.");
    … …  
    427427        /* Hangup session to the console */
    428428        if (mouse_dev->mouse_sess != NULL) {
    429                 const int ret = async_hangup(mouse_dev->mouse_sess);
     429                const errno_t ret = async_hangup(mouse_dev->mouse_sess);
    430430                if (ret != EOK)
    431431                        usb_log_warning("Failed to hang up mouse session: "
    … …  
    437437}
    438438
    439 int usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev)
    440 {
    441         int rc = usb_hid_parse_report_descriptor(
     439errno_t usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev)
     440{
     441        errno_t rc = usb_hid_parse_report_descriptor(
    442442            &hid_dev->report, USB_MOUSE_BOOT_REPORT_DESCRIPTOR,
    443443            sizeof(USB_MOUSE_BOOT_REPORT_DESCRIPTOR));

  • uspace/drv/hid/usbhid/mouse/mousedev.h

    r132ab5d1 r5a6cc679  
    5959extern const char *HID_MOUSE_CATEGORY;
    6060
    61 extern int usb_mouse_init(usb_hid_dev_t *, void **);
     61extern errno_t usb_mouse_init(usb_hid_dev_t *, void **);
    6262extern bool usb_mouse_polling_callback(usb_hid_dev_t *, void *);
    6363extern void usb_mouse_deinit(usb_hid_dev_t *, void *);
    64 extern int usb_mouse_set_boot_protocol(usb_hid_dev_t *);
     64extern errno_t usb_mouse_set_boot_protocol(usb_hid_dev_t *);
    6565
    6666#endif // USB_HID_MOUSEDEV_H_

  • uspace/drv/hid/usbhid/multimedia/multimedia.c

    r132ab5d1 r5a6cc679  
    153153}
    154154
    155 int usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data)
     155errno_t usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data)
    156156{
    157157        if (hid_dev == NULL || hid_dev->usb_dev == NULL) {
    … …  
    182182        //todo Autorepeat?
    183183
    184         int rc = ddf_fun_bind(fun);
     184        errno_t rc = ddf_fun_bind(fun);
    185185        if (rc != EOK) {
    186186                usb_log_error("Could not bind DDF function: %s.",
    … …  
    248248                return true; /* This might be a temporary failure. */
    249249
    250         int ret =
     250        errno_t ret =
    251251            usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0);
    252252        if (ret != EOK) {

  • uspace/drv/hid/usbhid/multimedia/multimedia.h

    r132ab5d1 r5a6cc679  
    4040#include "../usbhid.h"
    4141
    42 extern int usb_multimedia_init(usb_hid_dev_t *, void **);
     42extern errno_t usb_multimedia_init(usb_hid_dev_t *, void **);
    4343extern void usb_multimedia_deinit(usb_hid_dev_t *, void *);
    4444extern bool usb_multimedia_polling_callback(usb_hid_dev_t *, void *);

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

    r132ab5d1 r5a6cc679  
    6161};
    6262
    63 static int usb_hid_set_boot_kbd_subdriver(usb_hid_dev_t *hid_dev)
     63static errno_t usb_hid_set_boot_kbd_subdriver(usb_hid_dev_t *hid_dev)
    6464{
    6565        assert(hid_dev != NULL);
    … …  
    7777}
    7878
    79 static int usb_hid_set_boot_mouse_subdriver(usb_hid_dev_t *hid_dev)
     79static errno_t usb_hid_set_boot_mouse_subdriver(usb_hid_dev_t *hid_dev)
    8080{
    8181        assert(hid_dev != NULL);
    … …  
    9393}
    9494
    95 static int usb_hid_set_generic_hid_subdriver(usb_hid_dev_t *hid_dev)
     95static errno_t usb_hid_set_generic_hid_subdriver(usb_hid_dev_t *hid_dev)
    9696{
    9797        assert(hid_dev != NULL);
    … …  
    182182}
    183183
    184 static int usb_hid_save_subdrivers(usb_hid_dev_t *hid_dev,
     184static errno_t usb_hid_save_subdrivers(usb_hid_dev_t *hid_dev,
    185185    const usb_hid_subdriver_t **subdrivers, unsigned count)
    186186{
    … …  
    215215}
    216216
    217 static int usb_hid_find_subdrivers(usb_hid_dev_t *hid_dev)
     217static errno_t usb_hid_find_subdrivers(usb_hid_dev_t *hid_dev)
    218218{
    219219        assert(hid_dev != NULL);
    … …  
    267267}
    268268
    269 static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
     269static errno_t usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
    270270{
    271271        assert(hid_dev);
    … …  
    293293}
    294294
    295 static int usb_hid_init_report(usb_hid_dev_t *hid_dev)
     295static errno_t usb_hid_init_report(usb_hid_dev_t *hid_dev)
    296296{
    297297        assert(hid_dev != NULL);
    … …  
    414414 * @return Error code.
    415415 */
    416 int usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev)
     416errno_t usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev)
    417417{
    418418        assert(hid_dev);
    … …  
    427427        hid_dev->poll_pipe_mapping = NULL;
    428428
    429         int rc = usb_hid_check_pipes(hid_dev, dev);
     429        errno_t rc = usb_hid_check_pipes(hid_dev, dev);
    430430        if (rc != EOK) {
    431431                return rc;
    … …  
    492492                if (hid_dev->subdrivers[i].init != NULL) {
    493493                        usb_log_debug("Initializing subdriver %d.",i);
    494                         const int pret = hid_dev->subdrivers[i].init(hid_dev,
     494                        const errno_t pret = hid_dev->subdrivers[i].init(hid_dev,
    495495                            &hid_dev->subdrivers[i].data);
    496496                        if (pret != EOK) {

  • uspace/drv/hid/usbhid/usbhid.h

    r132ab5d1 r5a6cc679  
    5656 * @return Error code.
    5757 */
    58 typedef int (*usb_hid_driver_init_t)(usb_hid_dev_t *dev, void **data);
     58typedef errno_t (*usb_hid_driver_init_t)(usb_hid_dev_t *dev, void **data);
    5959
    6060/** Subdriver deinitialization callback.
    … …  
    138138extern const usb_endpoint_description_t *usb_hid_endpoints[];
    139139
    140 int usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev);
     140errno_t usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev);
    141141
    142142void usb_hid_deinit(usb_hid_dev_t *hid_dev);
Note: See TracChangeset for help on using the changeset viewer.