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

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/xtkbd

Files:

• main.c (modified) (2 diffs)
• xtkbd.c (modified) (3 diffs)
• xtkbd.h (modified) (1 diff)

uspace/drv/hid/xtkbd/main.c

@@ -46 +46 @@
 #define NAME "xtkbd"
 
-static int xt_kbd_add(ddf_dev_t *device);
+static errno_t xt_kbd_add(ddf_dev_t *device);
 
 /** DDF driver ops. */
@@ -83 +83 @@
  *
  */
-static int xt_kbd_add(ddf_dev_t *device)
+static errno_t xt_kbd_add(ddf_dev_t *device)
 {
-        int rc;
+        errno_t rc;
 
         if (!device)

uspace/drv/hid/xtkbd/xtkbd.c

@@ -205 +205 @@
  *
  */
-static int polling(void *arg)
+static errno_t polling(void *arg)
 {
         xt_kbd_t *kbd = arg;
         size_t nread;
-        int rc;
+        errno_t rc;
         
         while (true) {
@@ -353 +353 @@
                 
                 size_t nwr;
-                int rc = chardev_write(kbd->chardev, &cmds[0], 1, &nwr);
+                errno_t rc = chardev_write(kbd->chardev, &cmds[0], 1, &nwr);
                 if (rc != EOK) {
                         async_answer_0(icallid, rc);
@@ -410 +410 @@
  *
  */
-int xt_kbd_init(xt_kbd_t *kbd, ddf_dev_t *dev)
+errno_t xt_kbd_init(xt_kbd_t *kbd, ddf_dev_t *dev)
 {
         async_sess_t *parent_sess;
         bool bound = false;
-        int rc;
+        errno_t rc;
         
         kbd->client_sess = NULL;

uspace/drv/hid/xtkbd/xtkbd.h

@@ -55 +55 @@
 } xt_kbd_t;
 
-extern int xt_kbd_init(xt_kbd_t *, ddf_dev_t *);
+extern errno_t xt_kbd_init(xt_kbd_t *, ddf_dev_t *);
 
 #endif