[Squeak-Commits] squeak/platforms/unix/vm-display-fbdev sqUnixFBDevMousePS2.c,1.2,1.3

[Ian P. <piu...@us...>]

Update of /cvsroot/squeak/squeak/platforms/unix/vm-display-fbdev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25082

Modified Files:
	sqUnixFBDevMousePS2.c 
Log Message:
Increase all timeouts to 100ms.  Work around broken PS/2 protocol emulation in /dev/input/mice.


Index: sqUnixFBDevMousePS2.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/vm-display-fbdev/sqUnixFBDevMousePS2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sqUnixFBDevMousePS2.c	21 Aug 2003 00:55:49 -0000	1.2
--- sqUnixFBDevMousePS2.c	2 Apr 2004 01:12:54 -0000	1.3
***************
*** 3,7 ****
   * Author: Ian...@IN...
   * 
!  * Last edited: 2003-08-21 01:40:38 by piumarta on felina.inria.fr
   */
  
--- 3,7 ----
   * Author: Ian...@IN...
   * 
!  * Last edited: 2003-10-31 11:42:56 by piumarta on emilia.inria.fr
   */
  
***************
*** 41,49 ****
   */
  
! #define PS2_DISABLE_DELAY    10*1000
  #define PS2_RESET_DELAY	   1500*1000
! #define PS2_FLUSH_DELAY	     10*1000
! #define PS2_READ_DELAY	     10*1000
! #define PS2_SEND_DELAY	     10*1000
  
  #define	PS2_RESET		0xff
--- 41,49 ----
   */
  
! #define PS2_DISABLE_DELAY   100*1000
  #define PS2_RESET_DELAY	   1500*1000
! #define PS2_FLUSH_DELAY	    100*1000
! #define PS2_READ_DELAY	    100*1000
! #define PS2_SEND_DELAY	    100*1000
  
  #define	PS2_RESET		0xff
***************
*** 126,129 ****
--- 126,130 ----
  	{
  	case PS2_OK:
+ 	case PS2_SELFTEST_OK:	/* /dev/input/mice emulation is broken */
  	  break;
  	case PS2_ERROR:
***************
*** 184,187 ****
--- 185,192 ----
  	}
      }
+   /* /dev/input/mice emulation returns PS2_SELFTEST_OK where send()
+      expects PS2_OK, causing control to fall through to here.  we pick
+      up the mouse id immediately in the flush(), so the only harm done
+      is a misleading "reset failed" message while debugging.  */
    ms_ps2_flush(self);
    dprintf("%s: reset failed\n", self->msName);