Changeset b7fd2a0 in mainline for uspace/srv/hid/input


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/srv/hid/input
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/input/ctl/kbdev.c

    r36f0738 rb7fd2a0  
    5151#include "../kbd_port.h"
    5252
    53 static int kbdev_ctl_init(kbd_dev_t *);
     53static errno_t kbdev_ctl_init(kbd_dev_t *);
    5454static void kbdev_ctl_set_ind(kbd_dev_t *, unsigned int);
    5555
    … …  
    9090}
    9191
    92 static int kbdev_ctl_init(kbd_dev_t *kdev)
     92static errno_t kbdev_ctl_init(kbd_dev_t *kdev)
    9393{
    9494        async_sess_t *sess = loc_service_connect(kdev->svc_id,
    … …  
    119119       
    120120        port_id_t port;
    121         int rc = async_create_callback_port(exch, INTERFACE_KBD_CB, 0, 0,
     121        errno_t rc = async_create_callback_port(exch, INTERFACE_KBD_CB, 0, 0,
    122122            kbdev_callback_conn, kbdev, &port);
    123123       
    … …  
    150150{
    151151        kbdev_t *kbdev;
    152         int retval;
     152        errno_t retval;
    153153        int type, key;
    154154

  • uspace/srv/hid/input/ctl/stty.c

    r36f0738 rb7fd2a0  
    4646
    4747static void stty_ctl_parse(sysarg_t);
    48 static int stty_ctl_init(kbd_dev_t *);
     48static errno_t stty_ctl_init(kbd_dev_t *);
    4949static void stty_ctl_set_ind(kbd_dev_t *, unsigned int);
    5050
    … …  
    237237};
    238238
    239 static int stty_ctl_init(kbd_dev_t *kdev)
     239static errno_t stty_ctl_init(kbd_dev_t *kdev)
    240240{
    241241        kbd_dev = kdev;

  • uspace/srv/hid/input/ctl/sun.c

    r36f0738 rb7fd2a0  
    4444
    4545static void sun_ctl_parse(sysarg_t);
    46 static int sun_ctl_init(kbd_dev_t *);
     46static errno_t sun_ctl_init(kbd_dev_t *);
    4747static void sun_ctl_set_ind(kbd_dev_t *, unsigned int);
    4848
    … …  
    6060static int scanmap_simple[];
    6161
    62 static int sun_ctl_init(kbd_dev_t *kdev)
     62static errno_t sun_ctl_init(kbd_dev_t *kdev)
    6363{
    6464        kbd_dev = kdev;

  • uspace/srv/hid/input/input.c

    r36f0738 rb7fd2a0  
    473473        kdev->ctl_ops = &kbdev_ctl;
    474474       
    475         int rc = loc_service_get_name(service_id, &kdev->svc_name);
     475        errno_t rc = loc_service_get_name(service_id, &kdev->svc_name);
    476476        if (rc != EOK) {
    477477                kdev->svc_name = NULL;
    … …  
    510510        mdev->proto_ops = &mousedev_proto;
    511511       
    512         int rc = loc_service_get_name(service_id, &mdev->svc_name);
     512        errno_t rc = loc_service_get_name(service_id, &mdev->svc_name);
    513513        if (rc != EOK) {
    514514                mdev->svc_name = NULL;
    … …  
    530530}
    531531
    532 static int serial_consumer(void *arg)
     532static errno_t serial_consumer(void *arg)
    533533{
    534534        serial_dev_t *sdev = (serial_dev_t *) arg;
    … …  
    554554{
    555555        bool match = false;
    556         int rc;
     556        errno_t rc;
    557557
    558558        serial_dev_t *sdev = serial_dev_new();
    … …  
    633633}
    634634
    635 static int dev_check_new_kbdevs(void)
     635static errno_t dev_check_new_kbdevs(void)
    636636{
    637637        category_id_t keyboard_cat;
    … …  
    639639        size_t count, i;
    640640        bool already_known;
    641         int rc;
     641        errno_t rc;
    642642       
    643643        rc = loc_category_get_id("keyboard", &keyboard_cat, IPC_FLAG_BLOCKING);
    … …  
    684684}
    685685
    686 static int dev_check_new_mousedevs(void)
     686static errno_t dev_check_new_mousedevs(void)
    687687{
    688688        category_id_t mouse_cat;
    … …  
    690690        size_t count, i;
    691691        bool already_known;
    692         int rc;
     692        errno_t rc;
    693693       
    694694        rc = loc_category_get_id("mouse", &mouse_cat, IPC_FLAG_BLOCKING);
    … …  
    735735}
    736736
    737 static int dev_check_new_serialdevs(void)
     737static errno_t dev_check_new_serialdevs(void)
    738738{
    739739        category_id_t serial_cat;
    … …  
    741741        size_t count, i;
    742742        bool already_known;
    743         int rc;
     743        errno_t rc;
    744744       
    745745        rc = loc_category_get_id("serial", &serial_cat, IPC_FLAG_BLOCKING);
    … …  
    786786}
    787787
    788 static int dev_check_new(void)
    789 {
    790         int rc;
     788static errno_t dev_check_new(void)
     789{
     790        errno_t rc;
    791791       
    792792        fibril_mutex_lock(&discovery_lock);
    … …  
    823823
    824824/** Start listening for new devices. */
    825 static int input_start_dev_discovery(void)
    826 {
    827         int rc = loc_register_cat_change_cb(cat_change_cb);
     825static errno_t input_start_dev_discovery(void)
     826{
     827        errno_t rc = loc_register_cat_change_cb(cat_change_cb);
    828828        if (rc != EOK) {
    829829                printf("%s: Failed registering callback for device discovery: "
    … …  
    842842int main(int argc, char **argv)
    843843{
    844         int rc;
     844        errno_t rc;
    845845
    846846        if (argc < 2) {

  • uspace/srv/hid/input/kbd_ctl.h

    r36f0738 rb7fd2a0  
    4444typedef struct kbd_ctl_ops {
    4545        void (*parse)(sysarg_t);
    46         int (*init)(struct kbd_dev *);
     46        errno_t (*init)(struct kbd_dev *);
    4747        void (*set_ind)(struct kbd_dev *, unsigned int);
    4848} kbd_ctl_ops_t;

  • uspace/srv/hid/input/kbd_port.h

    r36f0738 rb7fd2a0  
    4343
    4444typedef struct kbd_port_ops {
    45         int (*init)(struct kbd_dev *);
     45        errno_t (*init)(struct kbd_dev *);
    4646        void (*write)(uint8_t);
    4747} kbd_port_ops_t;

  • uspace/srv/hid/input/layout.h

    r36f0738 rb7fd2a0  
    5151/** Layout ops */
    5252typedef struct layout_ops {
    53         int (*create)(layout_t *);
     53        errno_t (*create)(layout_t *);
    5454        void (*destroy)(layout_t *);
    5555        wchar_t (*parse_ev)(layout_t *, kbd_event_t *);

  • uspace/srv/hid/input/layout/ar.c

    r36f0738 rb7fd2a0  
    3939#include "../kbd.h"
    4040
    41 static int ar_create(layout_t *);
     41static errno_t ar_create(layout_t *);
    4242static void ar_destroy(layout_t *);
    4343static wchar_t ar_parse_ev(layout_t *, kbd_event_t *ev);
    … …  
    200200}
    201201
    202 static int ar_create(layout_t *state)
     202static errno_t ar_create(layout_t *state)
    203203{
    204204        return EOK;

  • uspace/srv/hid/input/layout/cz.c

    r36f0738 rb7fd2a0  
    4040#include "../layout.h"
    4141
    42 static int cz_create(layout_t *);
     42static errno_t cz_create(layout_t *);
    4343static void cz_destroy(layout_t *);
    4444static wchar_t cz_parse_ev(layout_t *, kbd_event_t *ev);
    … …  
    385385}
    386386
    387 static int cz_create(layout_t *state)
     387static errno_t cz_create(layout_t *state)
    388388{
    389389        layout_cz_t *cz_state;

  • uspace/srv/hid/input/layout/us_dvorak.c

    r36f0738 rb7fd2a0  
    3838#include "../kbd.h"
    3939
    40 static int us_dvorak_create(layout_t *);
     40static errno_t us_dvorak_create(layout_t *);
    4141static void us_dvorak_destroy(layout_t *);
    4242static wchar_t us_dvorak_parse_ev(layout_t *, kbd_event_t *ev);
    … …  
    209209}
    210210
    211 static int us_dvorak_create(layout_t *state)
     211static errno_t us_dvorak_create(layout_t *state)
    212212{
    213213        return EOK;

  • uspace/srv/hid/input/layout/us_qwerty.c

    r36f0738 rb7fd2a0  
    3838#include "../kbd.h"
    3939
    40 static int us_qwerty_create(layout_t *);
     40static errno_t us_qwerty_create(layout_t *);
    4141static void us_qwerty_destroy(layout_t *);
    4242static wchar_t us_qwerty_parse_ev(layout_t *, kbd_event_t *ev);
    … …  
    203203}
    204204
    205 static int us_qwerty_create(layout_t *state)
     205static errno_t us_qwerty_create(layout_t *state)
    206206{
    207207        return EOK;

  • uspace/srv/hid/input/mouse_port.h

    r36f0738 rb7fd2a0  
    4343
    4444typedef struct mouse_port_ops {
    45         int (*init)(struct mouse_dev *);
     45        errno_t (*init)(struct mouse_dev *);
    4646        void (*write)(uint8_t);
    4747} mouse_port_ops_t;

  • uspace/srv/hid/input/mouse_proto.h

    r36f0738 rb7fd2a0  
    4444typedef struct mouse_proto_ops {
    4545        void (*parse)(sysarg_t);
    46         int (*init)(struct mouse_dev *);
     46        errno_t (*init)(struct mouse_dev *);
    4747} mouse_proto_ops_t;
    4848

  • uspace/srv/hid/input/port/chardev.c

    r36f0738 rb7fd2a0  
    4545#include "../kbd.h"
    4646
    47 static int kbd_port_fibril(void *);
     47static errno_t kbd_port_fibril(void *);
    4848
    49 static int chardev_port_init(kbd_dev_t *);
     49static errno_t chardev_port_init(kbd_dev_t *);
    5050static void chardev_port_write(uint8_t);
    5151
    … …  
    6969static const unsigned int num_devs = sizeof(in_devs) / sizeof(in_devs[0]);
    7070
    71 static int chardev_port_init(kbd_dev_t *kdev)
     71static errno_t chardev_port_init(kbd_dev_t *kdev)
    7272{
    7373        service_id_t service_id;
    7474        unsigned int i;
    7575        fid_t fid;
    76         int rc;
     76        errno_t rc;
    7777       
    7878        kbd_dev = kdev;
    … …  
    121121static void chardev_port_write(uint8_t data)
    122122{
    123         int rc;
     123        errno_t rc;
    124124        size_t nwr;
    125125
    … …  
    131131}
    132132
    133 static int kbd_port_fibril(void *arg)
     133static errno_t kbd_port_fibril(void *arg)
    134134{
    135         int rc;
     135        errno_t rc;
    136136        size_t nread;
    137137        uint8_t b;

  • uspace/srv/hid/input/proto/mousedev.c

    r36f0738 rb7fd2a0  
    8585                }
    8686               
    87                 int retval;
     87                errno_t retval;
    8888               
    8989                switch (IPC_GET_IMETHOD(call)) {
    … …  
    114114}
    115115
    116 static int mousedev_proto_init(mouse_dev_t *mdev)
     116static errno_t mousedev_proto_init(mouse_dev_t *mdev)
    117117{
    118118        async_sess_t *sess = loc_service_connect(mdev->svc_id, INTERFACE_DDF, 0);
    … …  
    141141       
    142142        port_id_t port;
    143         int rc = async_create_callback_port(exch, INTERFACE_MOUSE_CB, 0, 0,
     143        errno_t rc = async_create_callback_port(exch, INTERFACE_MOUSE_CB, 0, 0,
    144144            mousedev_callback_conn, mousedev, &port);
    145145       
Note: See TracChangeset for help on using the changeset viewer.