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

Timestamp:

2019-01-06T09:34:14Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

063a3647

Parents:

f2d88f3

Message:

ps2mouse needs to deal with pre-enabled reporting

Grub 2 enables ps2 mouse reporting which can get in the way of
ps2 mouse initialization where we expect a certain response.
What we need to do is first disable reporting, then drain the
input buffer, then initialize the mouse.

File:

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

uspace/drv/hid/ps2mouse/ps2mouse.c

@@ -49 +49 @@
 #define PS2_MOUSE_SET_SAMPLE_RATE   0xf3
 #define PS2_MOUSE_ENABLE_DATA_REPORT   0xf4
+#define PS2_MOUSE_DISABLE_DATA_REPORT   0xf5
 #define PS2_MOUSE_ACK   0xfa
 
@@ -165 +166 @@
         }
 
+        /* Disable mouse data reporting. */
+        uint8_t report = PS2_MOUSE_ENABLE_DATA_REPORT;
+        size_t nwr;
+        rc = chardev_write(mouse->chardev, &report, 1, &nwr);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed to enable data reporting.");
+                rc = EIO;
+                goto error;
+        }
+
+        /* Drain input buffer */
+        size_t nread;
+        uint8_t b;
+        do {
+                rc = chardev_read(mouse->chardev, &b, 1, &nread, chardev_f_nonblock);
+                if (rc != EOK) {
+                        ddf_msg(LVL_ERROR, "Failed to drain input buffer.\n");
+                        rc = EIO;
+                        goto error;
+                }
+        } while (nread > 0);
+
         /* Probe IntelliMouse extensions. */
         errno_t (*polling_f)(void *) = polling_ps2;
@@ -175 +198 @@
 
         /* Enable mouse data reporting. */
-        uint8_t report = PS2_MOUSE_ENABLE_DATA_REPORT;
-        size_t nwr;
+        report = PS2_MOUSE_ENABLE_DATA_REPORT;
         rc = chardev_write(mouse->chardev, &report, 1, &nwr);
         if (rc != EOK) {
@@ -184 +206 @@
         }
 
-        size_t nread;
         rc = chardev_read(mouse->chardev, &report, 1, &nread, chardev_f_none);
         if (rc != EOK || report != PS2_MOUSE_ACK) {