Changes in uspace/drv/hid/ps2mouse/ps2mouse.c [c8ea6eca:fafb8e5] in mainline

File:

• uspace/drv/hid/ps2mouse/ps2mouse.c (modified) (7 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
 
@@ -77 +78 @@
         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));\
@@ -164 +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;
@@ -174 +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) {
@@ -183 +206 @@
         }
 
-        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 +254 @@
         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.");
@@ -407 +429 @@
 void default_connection_handler(ddf_fun_t *fun, ipc_call_t *icall)
 {
-        const sysarg_t method = IPC_GET_IMETHOD(*icall);
+        const sysarg_t method = ipc_get_imethod(icall);
         ps2_mouse_t *mouse = ddf_dev_data_get(ddf_fun_get_dev(fun));
         async_sess_t *sess;