Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 02:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[I8042PRT]

Browse source 
- Discard extra ACK packets from the mouse during reset
- Fixes certain mice that send the ACK out of order

svn path=/trunk/; revision=54412
This commit is contained in:
Cameron Gutman 2011-11-17 21:19:32 +00:00
parent e4382eb7d6
commit 88f0deaa71
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
reactos/drivers/input/i8042prt/mouse.c
View file

@ -458,7 +458,7 @@ i8042MouInternalDeviceControl(
IoMarkIrpPending(Irp); IoMarkIrpPending(Irp);
DeviceExtension->MouseState = MouseResetting; DeviceExtension->MouseState = MouseResetting;
DeviceExtension->MouseResetState = 1100; DeviceExtension->MouseResetState = ExpectingReset;
DeviceExtension->MouseHook.IsrWritePort = i8042MouIsrWritePort; DeviceExtension->MouseHook.IsrWritePort = i8042MouIsrWritePort;
DeviceExtension->MouseHook.QueueMousePacket = i8042MouQueuePacket; DeviceExtension->MouseHook.QueueMousePacket = i8042MouQueuePacket;
DeviceExtension->MouseHook.CallContext = DeviceExtension; DeviceExtension->MouseHook.CallContext = DeviceExtension;
@ -640,10 +640,13 @@ i8042MouResetIsr(
switch ((ULONG)DeviceExtension->MouseResetState) switch ((ULONG)DeviceExtension->MouseResetState)
{ {
case 1100: /* the first ack, drop it. */
DeviceExtension->MouseResetState = ExpectingReset;
return TRUE;
case ExpectingReset: case ExpectingReset:
if (MOUSE_ACK == Value)
{
WARN_(I8042PRT, "Dropping extra ACK\n");
return TRUE;
}
/* First, 0xFF is sent. The mouse is supposed to say AA00 if ok, FC00 if not. */ /* First, 0xFF is sent. The mouse is supposed to say AA00 if ok, FC00 if not. */
if (0xAA == Value) if (0xAA == Value)
{ {
@ -657,6 +660,12 @@ i8042MouResetIsr(
} }
return TRUE; return TRUE;
case ExpectingResetId: case ExpectingResetId:
if (MOUSE_ACK == Value)
{
WARN_(I8042PRT, "Dropping extra ACK #2\n");
return TRUE;
}
if (0x00 == Value) if (0x00 == Value)
{ {
DeviceExtension->MouseResetState++; DeviceExtension->MouseResetState++;