[ros-diffs] [hpoussin] 16632: Move serial ports and mice classes parameters to their own .inf files. They would be regenerated during 2nd stage setup

Move serial ports and mice classes parameters to their own .inf files.
They would be regenerated during 2nd stage setup
Modified: trunk/reactos/bootdata/hivesys.inf
Modified: trunk/reactos/bootdata/packages/reactos.dff
Modified: trunk/reactos/media/inf/inf.xml
Added: trunk/reactos/media/inf/mouse.inf
Added: trunk/reactos/media/inf/ports.inf
Modified: trunk/reactos/media/inf/syssetup.inf
  _____  

Modified: trunk/reactos/bootdata/hivesys.inf
--- trunk/reactos/bootdata/hivesys.inf	2005-07-18 07:17:53 UTC (rev
16631)
+++ trunk/reactos/bootdata/hivesys.inf	2005-07-18 11:57:16 UTC (rev
16632)
@@ -578,16 +578,14 @@

 
;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Type",0x00010001,0x000000
01
 
 ; i8042 port driver
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ErrorControl",0x0001
0001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Group",0x00000000,"K
eyboard Port"
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ImagePath",0x0002000
0,"system32\drivers\i8042prt.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Start",0x00010001,0x
00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Type",0x00010001,0x0
0000001
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x0001
0001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x
00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x0
0000001
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x0000
0000,"i8042prt"
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","ClassGUID",0x00
000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}"
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","Service",0x0000
0000,"i8042prt"
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","ClassGUID",0x00
000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}"
 
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","SampleRat
e",0x00010001,0x0000003c
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","BreakOnSy
sRq",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","MouseReso
lution",0x00010001,0x00000003
-
 ; Keyboard class driver
 
HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010
001,0x00000000
 
HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Ke
yboard Class"
@@ -596,19 +594,6 @@
 
HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00
000001
 
HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08
002BE10318}","UpperFilters",0x00010000,"kbdclass"
 
-; Serial port enumerator
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ErrorControl",0x00010
001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Group",0x00000000,"PN
P Filter"
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ImagePath",0x00020000
,"system32\drivers\serenum.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Start",0x00010001,0x0
0000003
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Type",0x00010001,0x00
000001
-;hard coded values
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","0",0x00000000,"A
CPI\PNP0501"
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","Count",0x0001000
1,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","NextInstance",0x
00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00
010000,"serenum"
-HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00
010000,"serenum"
-
 ; SB16 driver
 
HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Group",0x00000000,"Bas
e"
 
HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ServiceType",0x0001000
1,0x00000001
@@ -825,19 +810,12 @@
 
HKLM,"SYSTEM\CurrentControlSet\Services\Null","Type",0x00010001,0x000000
01
 
 ; Serial device driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ErrorControl",0x000100
01,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Group",0x00000000,"Ext
ended Base"
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ImagePath",0x00020000,
"system32\drivers\serial.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x00
000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Type",0x00010001,0x000
00001
-;hard coded values
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","0",0x00000000,"AC
PI\PNP0501"
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","Count",0x00010001
,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","NextInstance",0x0
0010001,0x00000001
 
HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","ClassGUID",0x000000
00,"{4D36E978-E325-11CE-BFC1-08002BE10318}"
 
HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","Service",0x00000000
,"serial"
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00
010000,"serenum"
 
HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","ClassGUID",0x000000
00,"{4D36E978-E325-11CE-BFC1-08002BE10318}"
 
HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","Service",0x00000000
,"serial"
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00
010000,"serenum"
 
 ; Packet driver
 
HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x0001000
1,0x00000001
  _____  

Modified: trunk/reactos/bootdata/packages/reactos.dff
--- trunk/reactos/bootdata/packages/reactos.dff	2005-07-18 07:17:53 UTC
(rev 16631)
+++ trunk/reactos/bootdata/packages/reactos.dff	2005-07-18 11:57:16 UTC
(rev 16632)
@@ -265,5 +265,7 @@

 media\drivers\etc\services              5
 media\inf\NET_NIC.inf                   6
 media\inf\layout.inf                    6
+media\inf\mouse.inf                     6
+media\inf\ports.inf                     6
 media\inf\scsi.inf                      6
 media\inf\syssetup.inf                  6
  _____  

Modified: trunk/reactos/media/inf/inf.xml
--- trunk/reactos/media/inf/inf.xml	2005-07-18 07:17:53 UTC (rev
16631)
+++ trunk/reactos/media/inf/inf.xml	2005-07-18 11:57:16 UTC (rev
16632)
@@ -1,4 +1,6 @@

 <installfile base="inf">layout.inf</installfile>
+<installfile base="inf">mouse.inf</installfile>
 <installfile base="inf">NET_NIC.inf</installfile>
+<installfile base="inf">ports.inf</installfile>
 <installfile base="inf">scsi.inf</installfile>
 <installfile base="inf">syssetup.inf</installfile>
  _____  

Added: trunk/reactos/media/inf/mouse.inf
--- trunk/reactos/media/inf/mouse.inf	2005-07-18 07:17:53 UTC (rev
16631)
+++ trunk/reactos/media/inf/mouse.inf	2005-07-18 11:57:16 UTC (rev
16632)
@@ -0,0 +1,127 @@

+; MOUSE.INF
+
+; Installation file for mouse devices
+
+[Version]
+Signature  = "$Windows NT$"
+;Signature  = "$ReactOS$"
+LayoutFile = layout.inf
+Class      = Mouse
+ClassGUID  = {4D36E96F-E325-11CE-BFC1-08002BE10318}
+Provider   = %ReactOS%
+DriverVer  = 10/19/1999,5.00.2157.1
+
+[DestinationDirs]
+DefaultDestDir = 12
+
+[ClassInstall32.NT]
+AddReg = MouseClass.NT.AddReg
+
+[MouseClass.NT.AddReg]
+HKR, , ,               0, %MouseClassName%
+HKR, , Icon,           0, "-2"
+HKR, , Installer32,    0, "syssetup.dll,MouseClassInstaller"
+HKR, , NoInstallClass, 0, 1
+
+[Manufacturer]
+%StdMfg% = StdMfg
+%LogMfg  = LogMsf
+%MSMfg%  = MSMfg
+
+[StdMfg]
+%SERIAL_MOUSE.DeviceDesc% =
Serial_Inst,*PNP0F0C,SERENUM\PNP0F0C,*PNP0F17,SERENUM\PNP0F17,SERIAL_MOU
SE
+%PS2_MOUSE.DeviceDesc% = PS2_Inst,*PNP0F0E,*PNP0F19,PS2_MOUSE
+
+[LogMfg]
+%*PNP0F08.DeviceDesc% = Serial_Inst,*PNP0F08,SERENUM\PNP0F08
+%*PNP0F12.DeviceDesc% = PS2_Inst,*PNP0F12
+
+[MSMfg]
+%*PNP0F01.DeviceDesc% = Serial_Inst,*PNP0F01,SERENUM\PNP0F01
+%*PNP0F03.DeviceDesc% = PS2_Inst,*PNP0F03
+%*PNP0F13.DeviceDesc" = PS2_Inst,*PNP0F13
+
+;---------------------------- MOUCLASS DRIVER
---------------------------
+
+[Mouclass_CopyFiles.NT]
+mouclass.sys
+
+[mouclass_Service_Inst]
+ServiceType   = 1
+StartType     = 3
+ErrorControl  = 1
+ServiceBinary = %12%\mouclass.sys
+LoadOrderGroup = Pointer Class
+
+;----------------------------- SERIAL DRIVER
----------------------------
+
+[Serial_Inst.NT]
+CopyFiles = Serial_CopyFiles, Mouclass_CopyFiles
+
+[Serial_CopyFiles.NT]
+sermouse.sys
+
+[Serial_Inst.NT.Services]
+AddService = sermouse, 0x00000002, sermouse_Service_Inst
+AddService = mouclass, , mouclass_Service_Inst
+
+[sermouse_Service_Inst]
+ServiceType   = 1
+StartType     = 1
+ErrorControl  = 1
+ServiceBinary = %12%\sermouse.sys
+LoadOrderGroup = Pointer Port
+
+;------------------------------ PS/2 DRIVER
-----------------------------
+
+[PS2_Inst.NT]
+CopyFiles = PS2_CopyFiles, Mouclass_CopyFiles
+AddReg = PS2_AddReg
+
+[PS2_CopyFiles.NT]
+i8042prt.sys
+
+[PS2_Inst.NT.Services]
+AddService = i8042prt, 0x00000002, i8042prt_Service_Inst
+AddService = mouclass, , mouclass_Service_Inst
+
+[i8042prt_Service_Inst]
+ServiceType   = 1
+StartType     = 1
+ErrorControl  = 1
+ServiceBinary = %12%\i8042prt.sys
+LoadOrderGroup = Keyboard Port
+
+[PS2_AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","SampleRat
e",0x00010001,0x0000003c
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSy
sRq",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","MouseReso
lution",0x00010001,0x00000003
+
+;-------------------------------- STRINGS
-------------------------------
+
+[Strings]
+ReactOS = "ReactOS Team"
+MouseClassName = "Mice and other pointing devices"
+StdMfg = "(Standard mice)"
+LogMfg = "Logitech"
+MSMfg  = "Microsoft"
+
+*PNP0F01.DeviceDesc = "Microsoft Serial Mouse"
+*PNP0F03.DeviceDesc = "Microsoft PS/2-style Mouse"
+*PNP0F08.DeviceDesc = "Logitech Serial Mouse"
+*PNP0F12.DeviceDesc = "Logitech PS/2-style Mouse"
+*PNP0F13.DeviceDesc = "PS/2 port for PS/2-style mice"
+SERIAL_MOUSE.DeviceDesc = "Standard Serial Mouse"
+PS2_MOUSE.DeviceDesc = "Standard PS/2 Mouse"
+
+[String.040c]
+MouseClassName = "Souris et autres dispositifs de pointage"
+StdMfg = "(Souris standard)"
+
+*PNP0F01.DeviceDesc = "Souris Microsoft sur port sÚrie"
+*PNP0F03.DeviceDesc = "Souris Microsoft sur port PS/2"
+*PNP0F08.DeviceDesc = "Souris Logitech sur port sÚrie"
+*PNP0F12.DeviceDesc = "Souris Logitech sur port PS/2"
+*PNP0F13.DeviceDesc = "Souris compatible PS/2"
+SERIAL_MOUSE.DeviceDesc = "Souris standard sur port sÚrie"
+PS2_MOUSE.DeviceDesc = "Souris standard sur port PS/2"
\ No newline at end of file
  _____  

Added: trunk/reactos/media/inf/ports.inf
--- trunk/reactos/media/inf/ports.inf	2005-07-18 07:17:53 UTC (rev
16631)
+++ trunk/reactos/media/inf/ports.inf	2005-07-18 11:57:16 UTC (rev
16632)
@@ -0,0 +1,74 @@

+; PORTS.INF
+
+; Installation file for communication ports
+
+[Version]
+Signature  = "$Windows NT$"
+;Signature  = "$ReactOS$"
+LayoutFile = layout.inf
+Class      = Ports
+ClassGUID  = {4D36E978-E325-11CE-BFC1-08002BE10318}
+Provider   = %ReactOS%
+DriverVer  = 10/19/1999,5.00.2157.1
+
+[DestinationDirs]
+DefaultDestDir = 12
+
+[ClassInstall32.NT]
+AddReg = PortsClass.NT.AddReg
+
+[PortsClass.NT.AddReg]
+HKR, , ,               0, %PortsClassName%
+HKR, , Icon,           0, "-23"
+HKR, , Installer32,    0, "msports.dll,PortsClassInstaller"
+
+[Manufacturer]
+%StdMfg% = StdMfg
+
+[StdMfg]
+%*PNP0500.DeviceDesc% = ComPort_Inst,*PNP0500,*PNP0501
+%*PNP0501.DeviceDesc% = ComPort_Inst,*PNP0501
+
+;---------------------------- COM PORT DRIVER
---------------------------
+
+[ComPort_Inst.NT]
+CopyFiles = ComPort_CopyFiles.NT
+
+[ComPort_CopyFiles.NT]
+serial.sys
+serenum.sys
+
+[ComPort_Inst.NT.Services]
+AddService = serial, 0x00000002, serial_Service_Inst
+AddService = serenum, , serenum_Service_Inst
+
+[serial_Service_Inst]
+ServiceType   = 1
+StartType     = 1
+ErrorControl  = 0
+ServiceBinary = %12%\serial.sys
+LoadOrderGroup = Extended base
+
+[serenum_Service_Inst]
+ServiceType   = 1
+StartType     = 3
+ErrorControl  = 1
+ServiceBinary = %12%\serenum.sys
+LoadOrderGroup = PNP Filter
+
+;-------------------------------- STRINGS
-------------------------------
+
+[Strings]
+ReactOS = "ReactOS Team"
+PortsClassName = "Serial and parallel ports"
+StdMfg = "(Standard ports)"
+
+*PNP0500.DeviceDesc = "Serial communication port"
+*PNP0501.DeviceDesc = "Serial communication port"
+
+[String.040c]
+PortsClassName = "Ports (SÚrie et parallÞle)"
+StdMfg = "(Ports standard)"
+
+*PNP0500.DeviceDesc = "Port de communication sÚrie"
+*PNP0501.DeviceDesc = "Port de communication sÚrie"
\ No newline at end of file
  _____  

Modified: trunk/reactos/media/inf/syssetup.inf
--- trunk/reactos/media/inf/syssetup.inf	2005-07-18 07:17:53 UTC
(rev 16631)
+++ trunk/reactos/media/inf/syssetup.inf	2005-07-18 11:57:16 UTC
(rev 16632)
@@ -14,5 +14,7 @@

 [DeviceInfsToInstall]
 ; MS uses netnovel.inf as class-installer INF for NICs
 ; we use a separate one to keep things clean
+mouse.inf
 NET_NIC.inf
+ports.inf
 scsi.inf