Changeset c657bd7 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2017-11-20T10:06:59Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

19ea61d

Parents:

5d50c419

git-author:

Jiri Svoboda <jiri@…> (2017-11-19 22:05:26)

git-committer:

Jiri Svoboda <jiri@…> (2017-11-20 10:06:59)

Message:

Less is sometimes more. Need chardev_read to be able to return less bytes than requested if less is available. Otherwise cannot read variable-sized packets except yte-by-byte.

File:

• uspace/drv/char/i8042/i8042.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -374 +374 @@
         i8042_t *i8042 = port->ctl;
         uint8_t *destp = (uint8_t *)dest;
+        int rc;
+        size_t i;
         
         buffer_t *buffer = (port == i8042->aux) ?
             &i8042->aux_buffer : &i8042->kbd_buffer;
         
-        for (size_t i = 0; i < size; ++i)
-                *destp++ = buffer_read(buffer);
-        
-        return size;
+        for (i = 0; i < size; ++i) {
+                rc = buffer_read(buffer, destp, i == 0);
+                if (rc != EOK)
+                        break;
+                ++destp;
+        }
+        
+        return i;
 }