mirror of
https://github.com/reactos/reactos.git
synced 2024-09-13 22:31:34 +00:00
Fix "keyboard does not respond" bug. Thanks to Peter Krawies (breakoutbox /AT/ web /DOT/ de)
svn path=/trunk/; revision=25745
This commit is contained in:
parent
e6a2b315ca
commit
a840459c37
|
@ -1925,6 +1925,8 @@ DetectPS2AuxDevice(VOID)
|
||||||
{
|
{
|
||||||
UCHAR Scancode;
|
UCHAR Scancode;
|
||||||
UCHAR Status;
|
UCHAR Status;
|
||||||
|
ULONG Loops;
|
||||||
|
BOOLEAN Result = TRUE;
|
||||||
|
|
||||||
PS2ControllerWait();
|
PS2ControllerWait();
|
||||||
WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_CONTROL,
|
WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_CONTROL,
|
||||||
|
@ -1935,31 +1937,43 @@ DetectPS2AuxDevice(VOID)
|
||||||
WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA,
|
WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA,
|
||||||
0xF2);
|
0xF2);
|
||||||
|
|
||||||
StallExecutionProcessor(10000);
|
/* Wait for reply */
|
||||||
|
for (Loops = 0; Loops < 10; Loops++)
|
||||||
|
{
|
||||||
|
StallExecutionProcessor(10000);
|
||||||
|
Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS);
|
||||||
|
if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) != 0)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS);
|
Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS);
|
||||||
if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) == 0)
|
if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) == 0)
|
||||||
{
|
Result = FALSE;
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA);
|
Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA);
|
||||||
if (Scancode != 0xFA)
|
if (Scancode != 0xFA)
|
||||||
return FALSE;
|
Result = FALSE;
|
||||||
|
|
||||||
StallExecutionProcessor(10000);
|
StallExecutionProcessor(10000);
|
||||||
|
|
||||||
Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS);
|
Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS);
|
||||||
if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) == 0)
|
if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) == 0)
|
||||||
{
|
Result = FALSE;
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA);
|
Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA);
|
||||||
if (Scancode != 0x00)
|
if (Scancode != 0x00)
|
||||||
return FALSE;
|
Result = FALSE;
|
||||||
|
|
||||||
return TRUE;
|
/* Flush output buffer */
|
||||||
|
for (Loops = 0; Loops < 10; Loops++)
|
||||||
|
{
|
||||||
|
Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS);
|
||||||
|
if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0)
|
||||||
|
break;
|
||||||
|
StallExecutionProcessor(10000);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue