[SDL] HID and IMPS/2: Doh!

[Ryan C. Gordon]

Apparently /dev/psaux is confused if you try to set IMPS/2 mode on it. I'm
not sure if this applies to actual IMPS/2 devices on the PS/2 mouse port
as well, but in that case, you wouldn't need to set IMPS/2 mode in the
first place.

I guess it's a /dev/input/mice specific API, so here's a patch to move the
call to set_imps2_mode() out of detect_imps2() and into the
/dev/input/mice specific code.

Now both my PS/2-port touchpad and my HID mouse both work with fbcon.
Sorry to those of you who had broken mouses for the last 12 hours.  :)

(attached patch is against latest CVS, including the previous IMPS/2 patch
I sent.)

--ryan.


-------------- next part --------------
--- SDL_fbevents.c_original	Mon Jun 11 17:11:47 2001
+++ SDL_fbevents.c	Mon Jun 11 17:19:30 2001
@@ -444,9 +444,6 @@
 
 	imps2 = 0;
 
-	/* rcg06112001 Attempt to set IMPS/2 mode first, even with envr var... */
-	set_imps2_mode(fd);
-
 	if ( getenv("SDL_MOUSEDEV_IMPS2") ) {
 		imps2 = 1;
 	}
@@ -544,6 +541,9 @@
 				mouse_fd = open("/dev/input/mice", O_RDONLY, 0);
 			}
 			if (mouse_fd >= 0) {
+				/* rcg06112001 Attempt to set IMPS/2 mode first, even with envr var... */
+				set_imps2_mode(mouse_fd);
+
 				if (detect_imps2(mouse_fd)) {
 					mouse_drv = MOUSE_IMPS2;
 				} else {