Input: psmouse - attempt to re-synchronize mouse every 5 seconds

This should help driver to deal vith KVMs that reset mice when
switching between boxes.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index 7c4192bd1279..4d9107fba6a1 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -7,7 +7,7 @@
 #define PSMOUSE_CMD_GETINFO     0x03e9
 #define PSMOUSE_CMD_SETSTREAM   0x00ea
 #define PSMOUSE_CMD_SETPOLL     0x00f0
-#define PSMOUSE_CMD_POLL        0x03eb
+#define PSMOUSE_CMD_POLL        0x00eb  /* caller sets number of bytes to receive */
 #define PSMOUSE_CMD_GETID       0x02f2
 #define PSMOUSE_CMD_SETRATE     0x10f3
 #define PSMOUSE_CMD_ENABLE      0x00f4
@@ -23,6 +23,7 @@
 enum psmouse_state {
         PSMOUSE_IGNORE,
         PSMOUSE_INITIALIZING,
+        PSMOUSE_RESYNCING,
         PSMOUSE_CMD_MODE,
         PSMOUSE_ACTIVATED,
 };
@@ -38,15 +39,19 @@ struct psmouse {
         void *private;
         struct input_dev *dev;
         struct ps2dev ps2dev;
+        struct work_struct resync_work;
         char *vendor;
         char *name;
         unsigned char packet[8];
+        unsigned char badbyte;
         unsigned char pktcnt;
         unsigned char pktsize;
         unsigned char type;
+        unsigned char acks_disable_command;
         unsigned int model;
         unsigned long last;
         unsigned long out_of_sync;
+        unsigned long num_resyncs;
         enum psmouse_state state;
         char devname[64];
         char phys[32];
@@ -54,6 +59,7 @@ struct psmouse {
         unsigned int rate;
         unsigned int resolution;
         unsigned int resetafter;
+        unsigned int resync_time;
         unsigned int smartscroll;       /* Logitech only */
 
         psmouse_ret_t (*protocol_handler)(struct psmouse *psmouse, struct pt_regs *regs);
@@ -62,6 +68,7 @@ struct psmouse {
 
         int (*reconnect)(struct psmouse *psmouse);
         void (*disconnect)(struct psmouse *psmouse);
+        int (*poll)(struct psmouse *psmouse);
 
         void (*pt_activate)(struct psmouse *psmouse);
         void (*pt_deactivate)(struct psmouse *psmouse);