Changeset 5d50c419 in mainline for uspace/drv/hid/xtkbd/xtkbd.c

Timestamp:

2017-11-19T21:14:19Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c657bd7

Parents:

75fcf9b

Message:

Chardev API should separate error code from number of bytes transferred. This is cleaner, allows the code to be more independent of Exxx sign and allows for partial success (some bytes successfully transferred and then an error occurred.)

File:

• uspace/drv/hid/xtkbd/xtkbd.c (modified) (13 diffs)

uspace/drv/hid/xtkbd/xtkbd.c

@@ -208 +208 @@
 {
         xt_kbd_t *kbd = arg;
+        size_t nread;
+        int rc;
         
         while (true) {
@@ -214 +216 @@
                 
                 uint8_t code = 0;
-                ssize_t size = chardev_read(kbd->chardev, &code, 1);
-                if (size != 1)
+                rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                if (rc != EOK)
                         return EIO;
                 
@@ -227 +229 @@
                         map_size = sizeof(scanmap_e0) / sizeof(unsigned int);
                         
-                        size = chardev_read(kbd->chardev, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
                                 return EIO;
                         
@@ -234 +236 @@
                         
                         if (code == 0x2a) {  /* Print Screen */
-                                size = chardev_read(kbd->chardev, &code, 1);
-                                if (size != 1)
+                                rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                                if (rc != EOK)
                                         return EIO;
                                 
@@ -241 +243 @@
                                         continue;
                                 
-                                size = chardev_read(kbd->chardev, &code, 1);
-                                if (size != 1)
+                                rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                                if (rc != EOK)
                                         return EIO;
                                 
@@ -252 +254 @@
                         
                         if (code == 0x46) {  /* Break */
-                                size = chardev_read(kbd->chardev, &code, 1);
-                                if (size != 1)
+                                rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                                if (rc != EOK)
                                         return EIO;
                                 
@@ -259 +261 @@
                                         continue;
                                 
-                                size = chardev_read(kbd->chardev, &code, 1);
-                                if (size != 1)
+                                rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                                if (rc != EOK)
                                         return EIO;
                                 
@@ -272 +274 @@
                 /* Extended special set */
                 if (code == KBD_SCANCODE_SET_EXTENDED_SPECIAL) {
-                        size = chardev_read(kbd->chardev, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
                                 return EIO;
                         
@@ -279 +281 @@
                                 continue;
                         
-                        size = chardev_read(kbd->chardev, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
                                 return EIO;
                         
@@ -286 +288 @@
                                 continue;
                         
-                        size = chardev_read(kbd->chardev, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
                                 return EIO;
                         
@@ -293 +295 @@
                                 continue;
                         
-                        size = chardev_read(kbd->chardev, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
                                 return EIO;
                         
@@ -300 +302 @@
                                 continue;
                         
-                        size = chardev_read(kbd->chardev, &code, 1);
-                        if (size != 1)
+                        rc = chardev_read(kbd->chardev, &code, 1, &nread);
+                        if (rc != EOK)
                                 return EIO;
                         
@@ -350 +352 @@
                 uint8_t cmds[] = { KBD_CMD_SET_LEDS, status };
                 
-                ssize_t size = chardev_write(kbd->chardev, cmds, sizeof(cmds));
-                
-                async_answer_0(icallid, size < 0 ? size : EOK);
+                size_t nwr;
+                int rc = chardev_write(kbd->chardev, cmds, sizeof(cmds), &nwr);
+                if (nwr != sizeof(cmds))
+                        rc = EIO;
+
+                async_answer_0(icallid, rc);
                 break;
         }