Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[INPORT] Fix swapped buttons for the inport bus mouse

Browse source 
Also don't read the delta state when there is no mouse movement.
This commit is contained in:
Dmitry Borisov 2023-07-25 21:32:13 +06:00 committed by Stanislav Motylkov
parent 36a35ee203
commit a14019b219
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/input/inport/hardware.c
View file

@ -71,12 +71,13 @@
#define INPORT_MODE_IRQ 0x01 #define INPORT_MODE_IRQ 0x01
#define INPORT_MODE_BASE 0x10 #define INPORT_MODE_BASE 0x10
#define INPORT_MODE_HOLD 0x20 #define INPORT_MODE_HOLD 0x20
#define INPORT_HAS_MOVED 0x40
#define MS_INPORT_SIGNATURE 0x02 #define MS_INPORT_SIGNATURE 0x02
#define MS_BUTTON_MIDDLE 0x01 #define MS_BUTTON_RIGHT 0x01
#define MS_BUTTON_LEFT 0x02 #define MS_BUTTON_MIDDLE 0x02
#define MS_BUTTON_RIGHT 0x04 #define MS_BUTTON_LEFT 0x04
/* /*
* Logitech * Logitech
@ -270,14 +271,23 @@ InPortIsr(
WRITE_MOUSE(DeviceExtension, MS_INPORT_DATA, WRITE_MOUSE(DeviceExtension, MS_INPORT_DATA,
INPORT_MODE_HOLD | INPORT_MODE_IRQ | INPORT_MODE_BASE); INPORT_MODE_HOLD | INPORT_MODE_IRQ | INPORT_MODE_BASE);
WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_X);
DeltaX = READ_MOUSE(DeviceExtension, MS_INPORT_DATA);
WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_Y);
DeltaY = READ_MOUSE(DeviceExtension, MS_INPORT_DATA);
WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_BTNS); WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_BTNS);
Buttons = READ_MOUSE(DeviceExtension, MS_INPORT_DATA); Buttons = READ_MOUSE(DeviceExtension, MS_INPORT_DATA);
if (Buttons & INPORT_HAS_MOVED)
{
WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_X);
DeltaX = READ_MOUSE(DeviceExtension, MS_INPORT_DATA);
WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_Y);
DeltaY = READ_MOUSE(DeviceExtension, MS_INPORT_DATA);
}
else
{
DeltaX = 0;
DeltaY = 0;
}
Buttons &= (MS_BUTTON_MIDDLE | MS_BUTTON_LEFT | MS_BUTTON_RIGHT); Buttons &= (MS_BUTTON_MIDDLE | MS_BUTTON_LEFT | MS_BUTTON_RIGHT);
WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_MODE); WRITE_MOUSE(DeviceExtension, MS_INPORT_CONTROL, INPORT_REG_MODE);