Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/mouse
In directory usw-pr-cvs1:/tmp/cvs-serv29918
Modified Files:
psmouse.c sermouse.c
Log Message:
Use time_after() macros and HZ-based timeout for packet timeout in mouse drivers.
Index: psmouse.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/mouse/psmouse.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- psmouse.c 12 Feb 2002 09:34:34 -0000 1.17
+++ psmouse.c 13 Mar 2002 10:03:43 -0000 1.18
@@ -200,7 +200,7 @@
return;
}
- if (psmouse->pktcnt && jiffies - psmouse->last > 2) {
+ if (psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/20)) {
printk(KERN_WARNING "psmouse.c: Lost synchronization, throwing %d bytes away.\n", psmouse->pktcnt);
psmouse->pktcnt = 0;
}
Index: sermouse.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/mouse/sermouse.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- sermouse.c 22 Jan 2002 20:49:17 -0000 1.16
+++ sermouse.c 13 Mar 2002 10:03:43 -0000 1.17
@@ -200,7 +200,7 @@
{
struct sermouse *sermouse = serio->private;
- if (jiffies - sermouse->last > 2) sermouse->count = 0;
+ if (time_after(jiffies, sermouse->last + HZ/20)) sermouse->count = 0;
sermouse->last = jiffies;
if (sermouse->type > SERIO_SUN)
|