Re: [PATCH 3/2] Psmouse log and discard timed out bytes - addition

[Dmitry Torokhov <dtor_core@ameritech.net>]

Hi Gunter,

I have some additions to the last patch and I'd like you to give it a spin.
Also, could you please define DEBUG symbol in drivers/input/serio/i8042.c
and send me your dmesg with boot data and also when the touchpad loses
sync. I'd like to see it in all gory details :)

Thank you,

Dmitry


===================================================================


ChangeSet@1.1514, 2004-01-10 23:50:51-05:00, dtor_core@ameritech.net
  Input: Change the way timeouts/parity errors are handled:
         - Only complain about errors from keyboard controller if mouse
           is activated
         - Reset packet count to 0 as the next received byte will most
           likely be the first byte of a new packet
         - If expecting an ACK from the mouse set NACK condition


 psmouse-base.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)


===================================================================



diff -Nru a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/psmouse-base.c	Sat Jan 10 23:55:28 2004
+++ b/drivers/input/mouse/psmouse-base.c	Sat Jan 10 23:55:28 2004
@@ -122,9 +122,15 @@
 		goto out;
 
 	if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
-		printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
-			flags & SERIO_TIMEOUT ? " timeout" : "",
-			flags & SERIO_PARITY ? " bad parity" : "");
+		if (psmouse->state == PSMOUSE_ACTIVATED)
+			printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
+				flags & SERIO_TIMEOUT ? " timeout" : "",
+				flags & SERIO_PARITY ? " bad parity" : "");
+		if (psmouse->acking) {
+			psmouse->ack = -1;
+			psmouse->acking = 0;
+		}
+		psmouse->pktcnt = 0;
 		goto out;
 	}