[ros-diffs] [greatlrd] 14982: tinus

tinus
implement MouseResolution setting

Me (Magnus Olsen)
remove old psuax drv from hiveinst.inf and add tinus mouse drv settings
add MouseResolution setting to reg
Modified: trunk/reactos/bootdata/hiveinst.inf
Modified: trunk/reactos/bootdata/hivesys.inf
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h
Modified: trunk/reactos/drivers/input/i8042prt/mouse.c
  _____  

Modified: trunk/reactos/bootdata/hiveinst.inf
--- trunk/reactos/bootdata/hiveinst.inf	2005-05-04 22:32:43 UTC (rev
14981)
+++ trunk/reactos/bootdata/hiveinst.inf	2005-05-04 23:06:15 UTC (rev
14982)
@@ -24,7 +24,8 @@

 ;
 
 ; PS/2 mouse port driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Start",0x00010001,0x000
00001
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Start",0x00010001,0x
00000001
 
+
 ; Serial mouse driver
 
;HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Start",0x00010001,0x
00000001
  _____  

Modified: trunk/reactos/bootdata/hivesys.inf
--- trunk/reactos/bootdata/hivesys.inf	2005-05-04 22:32:43 UTC (rev
14981)
+++ trunk/reactos/bootdata/hivesys.inf	2005-05-04 23:06:15 UTC (rev
14982)
@@ -583,6 +583,7 @@

 
 
HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","SampleRate
",0x00010001,0x00000060
 
HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","BreakOnSys
Rq",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","MouseReso
lution",0x00010001,0x00000003
 
 ; Keyboard class driver
 
HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010
001,0x00000000
  _____  

Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h
--- trunk/reactos/drivers/input/i8042prt/i8042prt.h	2005-05-04
22:32:43 UTC (rev 14981)
+++ trunk/reactos/drivers/input/i8042prt/i8042prt.h	2005-05-04
23:06:15 UTC (rev 14982)
@@ -87,7 +87,7 @@

 	DWORD OverrideKeyboardSubtype;
 	DWORD MouseResendStallTime;
 	DWORD MouseSynchIn100ns;
-	DWORD MouseResolution;
+	DWORD MouseResolution;        /* done */
 	DWORD NumberOfButtons;
 	DWORD EnableWheelDetection;
 } I8042_SETTINGS, *PI8042_SETTINGS;
  _____  

Modified: trunk/reactos/drivers/input/i8042prt/mouse.c
--- trunk/reactos/drivers/input/i8042prt/mouse.c	2005-05-04
22:32:43 UTC (rev 14981)
+++ trunk/reactos/drivers/input/i8042prt/mouse.c	2005-05-04
23:06:15 UTC (rev 14982)
@@ -299,7 +299,9 @@

 		DevExt->MouseResetState = ExpectingFinalResolutionACK;
 		return TRUE;
 	case ExpectingFinalResolutionACK:
-		I8042IsrWritePortMouse(DevExt, 0x03);
+		I8042IsrWritePortMouse(DevExt,
+		                       DevExt->Settings.MouseResolution
& 0xff);
+		DPRINT1("%x\n", DevExt->Settings.MouseResolution);
 		DevExt->MouseResetState =
ExpectingFinalResolutionValueACK;
 		return TRUE;
 	case ExpectingFinalResolutionValueACK: