[cfinck] 32795: First detect the mouse and then the keyboard as it was done in the old i8042prt driver. If we do it the other way round, some systems throw away settings like the keyboard translation, when detecting the mouse. All known keyboard and mouse detection problems should be fixed now! :-) See issue #2790 for more details.

Author: cfinck
Date: Mon Mar 31 10:52:30 2008
New Revision: 32795

URL: http://svn.reactos.org/svn/reactos?rev=32795&view=rev
Log:
First detect the mouse and then the keyboard as it was done in the old i8042prt driver.
If we do it the other way round, some systems throw away settings like the keyboard
translation, when detecting the mouse.

All known keyboard and mouse detection problems should be fixed now! :-)

See issue #2790 for more details.

Modified:
    trunk/reactos/drivers/input/i8042prt/pnp.c

Modified: trunk/reactos/drivers/input/i8042prt/pnp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp…
==============================================================================
--- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Mon Mar 31 10:52:30 2008
@@ -413,11 +413,14 @@
 			WARN_(I8042PRT, "i8042BasicDetect() failed with status 0x%08lx\n", Status);
 			return STATUS_UNSUCCESSFUL;
 		}
+
+		/* First detect the mouse and then the keyboard!
+		   If we do it the other way round, some systems throw away settings like the keyboard
translation, when detecting the mouse. */
+		TRACE_(I8042PRT, "Detecting mouse\n");
+		i8042DetectMouse(DeviceExtension);
+
 		TRACE_(I8042PRT, "Detecting keyboard\n");
 		i8042DetectKeyboard(DeviceExtension);
-
-		TRACE_(I8042PRT, "Detecting mouse\n");
-		i8042DetectMouse(DeviceExtension);
 
 		INFO_(I8042PRT, "Keyboard present: %s\n", DeviceExtension->Flags &
KEYBOARD_PRESENT ? "YES" : "NO");
 		INFO_(I8042PRT, "Mouse present   : %s\n", DeviceExtension->Flags &
MOUSE_PRESENT ? "YES" : "NO");