Changeset f2d88f3 in mainline for uspace/srv/hid

Timestamp:

2019-01-04T21:22:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

af7b85b

Parents:

06412ba

Message:

Add forgotten changes to enable non-blocking chardev read

Location:

uspace/srv/hid

Files:

• input/input.c (modified) (1 diff)
• input/port/chardev.c (modified) (1 diff)
• isdv4_tablet/isdv4.c (modified) (1 diff)

uspace/srv/hid/input/input.c

@@ -539 +539 @@
                 size_t nread;
 
-                chardev_read(sdev->chardev, &data, sizeof(data), &nread);
+                chardev_read(sdev->chardev, &data, sizeof(data), &nread,
+                    chardev_f_none);
                 /* XXX Handle error */
                 kbd_push_data(sdev->kdev, data);

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

@@ -138 +138 @@
 
         while (true) {
-                rc = chardev_read(chardev, &b, sizeof(b), &nread);
+                rc = chardev_read(chardev, &b, sizeof(b), &nread,
+                    chardev_f_none);
                 if (rc != EOK || nread != sizeof(b)) {
                         printf("%s: Error reading data", NAME);

uspace/srv/hid/isdv4_tablet/isdv4.c

@@ -293 +293 @@
 
                 rc = chardev_read(state->chardev, state->buf + state->buf_end,
-                    state->buf_size - state->buf_end, &nread);
+                    state->buf_size - state->buf_end, &nread, chardev_f_none);
                 if (rc != EOK && nread == 0)
                         return EIO;