From a5fd44c475ec83c1105dceed404ef537bc4fc58e Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Mon, 31 Mar 2008 15:52:30 +0000 Subject: [PATCH] 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. svn path=/trunk/; revision=32795 --- reactos/drivers/input/i8042prt/pnp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/reactos/drivers/input/i8042prt/pnp.c b/reactos/drivers/input/i8042prt/pnp.c index f767e676950..81f440b3d4b 100644 --- a/reactos/drivers/input/i8042prt/pnp.c +++ b/reactos/drivers/input/i8042prt/pnp.c @@ -413,12 +413,15 @@ StartProcedure( WARN_(I8042PRT, "i8042BasicDetect() failed with status 0x%08lx\n", Status); return STATUS_UNSUCCESSFUL; } - TRACE_(I8042PRT, "Detecting keyboard\n"); - i8042DetectKeyboard(DeviceExtension); + /* 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); + INFO_(I8042PRT, "Keyboard present: %s\n", DeviceExtension->Flags & KEYBOARD_PRESENT ? "YES" : "NO"); INFO_(I8042PRT, "Mouse present : %s\n", DeviceExtension->Flags & MOUSE_PRESENT ? "YES" : "NO"); }