Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[i8042prt]

Browse source 
- Fix Ctrl-Scroll key combination, by ignoring ACK codes and not relying on a 0xe0 sequence code, which is not being sent at least on VBox.
- Fix Tab-K handling at high irql, by moving it out of the DPC routine into the ISR.

svn path=/trunk/; revision=44743
This commit is contained in:
Timo Kreuzer 2009-12-23 18:43:27 +00:00
parent 0567d77694
commit cba6f25d3d
1 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
reactos/drivers/input/i8042prt/keyboard.c
View file

@ -15,7 +15,6 @@
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
static IO_WORKITEM_ROUTINE i8042DebugWorkItem;
static IO_WORKITEM_ROUTINE i8042PowerWorkItem; static IO_WORKITEM_ROUTINE i8042PowerWorkItem;
/* This structure starts with the same layout as KEYBOARD_INDICATOR_TRANSLATION */ /* This structure starts with the same layout as KEYBOARD_INDICATOR_TRANSLATION */
@ -31,23 +30,6 @@ static LOCAL_KEYBOARD_INDICATOR_TRANSLATION IndicatorTranslation = { 3, {
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
static VOID NTAPI
i8042DebugWorkItem(
IN PDEVICE_OBJECT DeviceObject,
IN PVOID Key)
{
UNREFERENCED_PARAMETER(DeviceObject);
INFO_(I8042PRT, "Debug key: p\n", Key);
if (!Key)
return;
/* We hope kernel would understand this. If
* that's not the case, nothing would happen.
*/
KdSystemDebugControl(' soR', Key, 0, NULL, 0, NULL, KernelMode);
}
/* /*
* These functions are callbacks for filter driver custom interrupt * These functions are callbacks for filter driver custom interrupt
* service routines. * service routines.
@ -367,26 +349,6 @@ i8042KbdDpcRoutine(
KeReleaseInterruptSpinLock(PortDeviceExtension->HighestDIRQLInterrupt, Irql); KeReleaseInterruptSpinLock(PortDeviceExtension->HighestDIRQLInterrupt, Irql);
if (PortDeviceExtension->Settings.CrashOnCtrlScroll)
{
PKEYBOARD_INPUT_DATA InputData;
InputData = DeviceExtension->KeyboardBuffer + KeysInBufferCopy - 1;
/* Test for TAB + key combination */
if (InputData->MakeCode == 0x0F)
DeviceExtension->TabPressed = !(InputData->Flags & KEY_BREAK);
else if (DeviceExtension->TabPressed)
{
DeviceExtension->TabPressed = FALSE;
IoQueueWorkItem(
DeviceExtension->DebugWorkItem,
&i8042DebugWorkItem,
DelayedWorkQueue,
(PVOID)(ULONG_PTR)InputData->MakeCode);
}
}
TRACE_(I8042PRT, "Send a key\n"); TRACE_(I8042PRT, "Send a key\n");
if (!DeviceExtension->KeyboardData.ClassService) if (!DeviceExtension->KeyboardData.ClassService)
@ -827,7 +789,7 @@ i8042KbdInterruptService(
if (PortDeviceExtension->Settings.CrashOnCtrlScroll) if (PortDeviceExtension->Settings.CrashOnCtrlScroll)
{ {
/* Test for CTRL + SCROLL LOCK twice */ /* Test for CTRL + SCROLL LOCK twice */
static const UCHAR ScanCodes[] = { 0xe0, 0x1d, 0x46, 0xc6, 0x46, 0 }; static const UCHAR ScanCodes[] = { 0x1d, 0x46, 0xc6, 0x46, 0 };
if (Output == ScanCodes[DeviceExtension->ComboPosition]) if (Output == ScanCodes[DeviceExtension->ComboPosition])
{ {
@ -835,10 +797,32 @@ i8042KbdInterruptService(
if (ScanCodes[DeviceExtension->ComboPosition] == 0) if (ScanCodes[DeviceExtension->ComboPosition] == 0)
KeBugCheck(MANUALLY_INITIATED_CRASH); KeBugCheck(MANUALLY_INITIATED_CRASH);
} }
else if (Output == 0xfa)
{
/* Ignore ACK */
}
else if (Output == ScanCodes[0]) else if (Output == ScanCodes[0])
DeviceExtension->ComboPosition = 1; DeviceExtension->ComboPosition = 1;
else else
DeviceExtension->ComboPosition = 0; DeviceExtension->ComboPosition = 0;
/* Test for TAB + key combination */
if (InputData->MakeCode == 0x0F)
DeviceExtension->TabPressed = !(InputData->Flags & KEY_BREAK);
else if (DeviceExtension->TabPressed)
{
DeviceExtension->TabPressed = FALSE;
/* Send request to the kernel debugger.
* Unknown requests will be ignored. */
KdSystemDebugControl(' soR',
(PVOID)(ULONG_PTR)InputData->MakeCode,
0,
NULL,
0,
NULL,
KernelMode);
}
} }
if (i8042KbdCallIsrHook(DeviceExtension, PortStatus, Output, &ToReturn)) if (i8042KbdCallIsrHook(DeviceExtension, PortStatus, Output, &ToReturn))