Changeset db9ef0c in mainline for uspace/drv/char/ps2mouse/ps2mouse.c

Timestamp:

2011-12-31T12:16:21Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c637571

Parents:

3fac882d

Message:

ps2mouse: Fix movement parsing.

It is reported as 9bit values.

File:

• uspace/drv/char/ps2mouse/ps2mouse.c (modified) (2 diffs)

uspace/drv/char/ps2mouse/ps2mouse.c

@@ -176 +176 @@
                         continue;
                 }
+
                 /* Buttons */
                 for (unsigned i = 0; i < BUTTON_COUNT; ++i) {
@@ -184 +185 @@
                         }
                 }
+
                 /* Movement */
-                const int move_x = ((packet[0] & X_SIGN)
-                    ? (int)(int8_t)packet[1] : (int)packet[1]);
-                const int move_y = -((packet[0] & Y_SIGN)
-                    ? (int)(int8_t)packet[2] : (int)packet[2]);
+                const int16_t move_x =
+                    ((packet[0] & X_SIGN) ? 0xff00 : 0) | packet[1];
+                const int16_t move_y =
+                    (((packet[0] & Y_SIGN) ? 0xff00 : 0) | packet[2]);
+                //TODO: Consider overflow bit
                 if (move_x != 0 || move_y != 0) {
-                        async_msg_2(exch, MOUSEEV_MOVE_EVENT, move_x, move_y);
+                        async_msg_2(exch, MOUSEEV_MOVE_EVENT, move_x, -move_y);
                 }
                 async_exchange_end(exch);