[Linuxconsole-commit]CVS: ruby/linux/drivers/input/mouse Config.help,NONE,1.1 psmouse.c,1.15,1.16

[Vojtech P. <vo...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/mouse
In directory usw-pr-cvs1:/tmp/cvs-serv15263/drivers/input/mouse

Modified Files:
	psmouse.c 
Added Files:
	Config.help 
Log Message:
psmouse: add a workaround for mice which don't send 0xfa to the ID command
hid-core: don't filter out-of-range values - they may be 'null' values
Config.help: add new style helpfiles


--- NEW FILE: Config.help ---
CONFIG_INPUT_MOUSE
  Say Y here, and a list of supported mice will be displayed.
  This option doesn't affect the kernel.

  If unsure, say Y.

CONFIG_MOUSE_PS2
  Say Y here if you have a PS/2 mouse connected to your system. This
  includes the standard 2 or 3-button PS/2 mouse, as well as PS/2
  mice with wheels and extra buttons, Microsoft, Logitech or Genius
  compatible.

  If unsure, say Y.

  This driver is also available as a module ( = code which can be
  inserted in and removed from the running kernel whenever you want).
  The module will be called psmouse.o. If you want to compile it as a
  module, say M here and read <file:Documentation/modules.txt>.

CONFIG_MOUSE_SERIAL
  Say Y here if you have a serial (RS-232, COM port) mouse connected
  to your system. This includes Sun, MouseSystems, Microsoft,
  Logitech and all other compatible serial mice.

  If unsure, say N.

  This driver is also available as a module ( = code which can be
  inserted in and removed from the running kernel whenever you want).
  The module will be called sermouse.o. If you want to compile it as a
  module, say M here and read <file:Documentation/modules.txt>.

CONFIG_MOUSE_GUNZE
  Say Y here if you have the Gunze AHL-51 touchscreen connected to
  your system.

  If unsure, say N.

  This driver is also available as a module ( = code which can be
  inserted in and removed from the running kernel whenever you want).
  The module will be called gunze.o. If you want to compile it as a
  module, say M here and read <file:Documentation/modules.txt>.

CONFIG_MOUSE_INPORT
  Say Y here if you have an InPort, Microsoft or ATI XL busmouse.
  They are rather rare these days.

  This driver is also available as a module ( = code which can be
  inserted in and removed from the running kernel whenever you want).
  The module will be called inport.o. If you want to compile it as a
  module, say M here and read <file.:Documentation/modules.txt>.

CONFIG_MOUSE_ATIXL
  Say Y here if your mouse is of the ATI XL variety.

CONFIG_MOUSE_LOGIBM
  Say Y here if you have a Logitech busmouse.
  They are rather rare these days.

  This driver is also available as a module ( = code which can be
  inserted in and removed from the running kernel whenever you want).
  The module will be called logibm.o. If you want to compile it as a
  module, say M here and read <file.:Documentation/modules.txt>.

CONFIG_MOUSE_PC110PAD
  Say Y if you have the IBM PC-110 micro-notebook and want its
  touchscreen supported.

  This driver is also available as a module ( = code which can be
  inserted in and removed from the running kernel whenever you want).
  The module will be called pc110pad.o. If you want to compile it as a
  module, say M here and read <file.:Documentation/modules.txt>.

CONFIG_MOUSE_MAPLE
  Say Y if you have a DreamCast console and a mouse attached to
  its Maple bus.

  This driver is also available as a module ( = code which can be
  inserted in and removed from the running kernel whenever you want).
  The module will be called maplemouse.o. If you want to compile it as a
  module, say M here and read <file.:Documentation/modules.txt>.

CONFIG_MOUSE_AMIGA
  Say Y here if you have an Amiga and want its native mouse
  supported by the kernel.

  This driver is also available as a module ( = code which can be
  inserted in and removed from the running kernel whenever you want).
  The module will be called amimouse.o. If you want to compile it as a
  module, say M here and read <file.:Documentation/modules.txt>.

CONFIG_MOUSE_ACORN
  Say Y here if you have the Acorn RiscPC computer and want its
  native mouse supported.

  This driver is also available as a module ( = code which can be
  inserted in and removed from the running kernel whenever you want).
  The module will be called rpcmouse.o. If you want to compile it as a
  module, say M here and read <file.:Documentation/modules.txt>.

Index: psmouse.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/mouse/psmouse.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- psmouse.c	2002/01/22 20:48:38	1.15
+++ psmouse.c	2002/01/26 19:20:36	1.16
@@ -185,6 +185,11 @@
 			case PSMOUSE_RET_NAK:
 				psmouse->ack = -1;
 				break;
+			default:
+				psmouse->ack = 1;	/* Workaround for mice which don't ACK the Get ID command */
+				if (psmouse->cmdcnt)
+					psmouse->cmdbuf[--psmouse->cmdcnt] = data;
+				break;
 		}
 		psmouse->acking = 0;
 		return;