Changeset f2d88f3 in mainline for uspace/drv/hid/ps2mouse/ps2mouse.c

Timestamp:

2019-01-04T21:22:17Z (6 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

File:

• uspace/drv/hid/ps2mouse/ps2mouse.c (modified) (3 diffs)

uspace/drv/hid/ps2mouse/ps2mouse.c

@@ -77 +77 @@
         uint8_t data = 0; \
         size_t nread; \
-        const errno_t rc = chardev_read((mouse)->chardev, &data, 1, &nread); \
+        const errno_t rc = chardev_read((mouse)->chardev, &data, 1, &nread, \
+            chardev_f_none); \
         if (rc != EOK) { \
                 ddf_msg(LVL_ERROR, "Failed reading byte: %s", str_error_name(rc));\
@@ -184 +185 @@
 
         size_t nread;
-        rc = chardev_read(mouse->chardev, &report, 1, &nread);
+        rc = chardev_read(mouse->chardev, &report, 1, &nread, chardev_f_none);
         if (rc != EOK || report != PS2_MOUSE_ACK) {
                 ddf_msg(LVL_ERROR, "Failed to confirm data reporting: %hhx.",
@@ -232 +233 @@
         while (pos < psize) {
                 rc = chardev_read(mouse->chardev, pbuf + pos, psize - pos,
-                    &nread);
+                    &nread, chardev_f_none);
                 if (rc != EOK) {
                         ddf_msg(LVL_WARN, "Error reading packet.");