Changeset 5a6cc679 in mainline for uspace/drv/hid/adb-kbd


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/adb-kbd
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/hid/adb-kbd/adb-kbd.c

    r132ab5d1 r5a6cc679  
    4848
    4949/** Add ADB keyboard device */
    50 int adb_kbd_add(adb_kbd_t *kbd)
    51 {
    52         int rc;
     50errno_t adb_kbd_add(adb_kbd_t *kbd)
     51{
     52        errno_t rc;
    5353        bool bound = false;
    5454
    … …  
    119119
    120120/** Remove ADB keyboard device */
    121 int adb_kbd_remove(adb_kbd_t *con)
     121errno_t adb_kbd_remove(adb_kbd_t *con)
    122122{
    123123        return ENOTSUP;
    … …  
    125125
    126126/** ADB keyboard device gone */
    127 int adb_kbd_gone(adb_kbd_t *con)
     127errno_t adb_kbd_gone(adb_kbd_t *con)
    128128{
    129129        return ENOTSUP;
    … …  
    140140                ipc_callid_t callid = async_get_call(&call);
    141141
    142                 int retval = EOK;
     142                errno_t retval = EOK;
    143143
    144144                if (!IPC_GET_IMETHOD(call)) {
    … …  
    162162        kbd_event_type_t etype;
    163163        unsigned int key;
    164         int rc;
     164        errno_t rc;
    165165
    166166        rc = adb_kbd_key_translate(b, &etype, &key);

  • uspace/drv/hid/adb-kbd/adb-kbd.h

    r132ab5d1 r5a6cc679  
    4444} adb_kbd_t;
    4545
    46 extern int adb_kbd_add(adb_kbd_t *);
    47 extern int adb_kbd_remove(adb_kbd_t *);
    48 extern int adb_kbd_gone(adb_kbd_t *);
     46extern errno_t adb_kbd_add(adb_kbd_t *);
     47extern errno_t adb_kbd_remove(adb_kbd_t *);
     48extern errno_t adb_kbd_gone(adb_kbd_t *);
    4949
    5050#endif

  • uspace/drv/hid/adb-kbd/ctl.c

    r132ab5d1 r5a6cc679  
    179179 * @return EOK on success, ENOENT if no translation exists
    180180 */
    181 int adb_kbd_key_translate(sysarg_t scancode, kbd_event_type_t *rtype,
     181errno_t adb_kbd_key_translate(sysarg_t scancode, kbd_event_type_t *rtype,
    182182    unsigned int *rkey)
    183183{

  • uspace/drv/hid/adb-kbd/ctl.h

    r132ab5d1 r5a6cc679  
    3535#define CTL_H
    3636
    37 extern int adb_kbd_key_translate(sysarg_t, kbd_event_type_t *, unsigned int *);
     37extern errno_t adb_kbd_key_translate(sysarg_t, kbd_event_type_t *, unsigned int *);
    3838
    3939#endif

  • uspace/drv/hid/adb-kbd/main.c

    r132ab5d1 r5a6cc679  
    4242#define NAME  "adb-kbd"
    4343
    44 static int adb_kbd_dev_add(ddf_dev_t *dev);
    45 static int adb_kbd_dev_remove(ddf_dev_t *dev);
    46 static int adb_kbd_dev_gone(ddf_dev_t *dev);
    47 static int adb_kbd_fun_online(ddf_fun_t *fun);
    48 static int adb_kbd_fun_offline(ddf_fun_t *fun);
     44static errno_t adb_kbd_dev_add(ddf_dev_t *dev);
     45static errno_t adb_kbd_dev_remove(ddf_dev_t *dev);
     46static errno_t adb_kbd_dev_gone(ddf_dev_t *dev);
     47static errno_t adb_kbd_fun_online(ddf_fun_t *fun);
     48static errno_t adb_kbd_fun_offline(ddf_fun_t *fun);
    4949
    5050static driver_ops_t driver_ops = {
    … …  
    6161};
    6262
    63 static int adb_kbd_dev_add(ddf_dev_t *dev)
     63static errno_t adb_kbd_dev_add(ddf_dev_t *dev)
    6464{
    6565        adb_kbd_t *adb_kbd;
    … …  
    7777}
    7878
    79 static int adb_kbd_dev_remove(ddf_dev_t *dev)
     79static errno_t adb_kbd_dev_remove(ddf_dev_t *dev)
    8080{
    8181        adb_kbd_t *adb_kbd = (adb_kbd_t *)ddf_dev_data_get(dev);
    … …  
    8686}
    8787
    88 static int adb_kbd_dev_gone(ddf_dev_t *dev)
     88static errno_t adb_kbd_dev_gone(ddf_dev_t *dev)
    8989{
    9090        adb_kbd_t *adb_kbd = (adb_kbd_t *)ddf_dev_data_get(dev);
    … …  
    9595}
    9696
    97 static int adb_kbd_fun_online(ddf_fun_t *fun)
     97static errno_t adb_kbd_fun_online(ddf_fun_t *fun)
    9898{
    9999        ddf_msg(LVL_DEBUG, "adb_kbd_fun_online()");
    … …  
    101101}
    102102
    103 static int adb_kbd_fun_offline(ddf_fun_t *fun)
     103static errno_t adb_kbd_fun_offline(ddf_fun_t *fun)
    104104{
    105105        ddf_msg(LVL_DEBUG, "adb_kbd_fun_offline()");
Note: See TracChangeset for help on using the changeset viewer.