Move serial ports and mice classes parameters to their own .inf files. They would...

svn path=/trunk/; revision=16632

diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index e81eea0..06ee0b3 100644 (file)
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -578,15 +578,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008
 ;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Type",0x00010001,0x00000001
 
 ; i8042 port driver
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Group",0x00000000,"Keyboard Port"
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ImagePath",0x00020000,"system32\drivers\i8042prt.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Type",0x00010001,0x00000001
-
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","SampleRate",0x00010001,0x0000003c
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","BreakOnSysRq",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt\Parameters","MouseResolution",0x00010001,0x00000003
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x00000000,"i8042prt"
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","ClassGUID",0x00000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}"
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","Service",0x00000000,"i8042prt"
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0F13\0000","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}"
 
 ; Keyboard class driver
 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000
@@ -596,19 +594,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass"
 
-; Serial port enumerator
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ErrorControl",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Group",0x00000000,"PNP Filter"
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ImagePath",0x00020000,"system32\drivers\serenum.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Start",0x00010001,0x00000003
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Type",0x00010001,0x00000001
-;hard coded values
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","0",0x00000000,"ACPI\PNP0501"
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","Count",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","NextInstance",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00010000,"serenum"
-HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00010000,"serenum"
-
 ; SB16 driver
 HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Group",0x00000000,"Base"
 HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ServiceType",0x00010001,0x00000001
@@ -825,19 +810,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Null","Start",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\Null","Type",0x00010001,0x00000001
 
 ; Serial device driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Group",0x00000000,"Extended Base"
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ImagePath",0x00020000,"system32\drivers\serial.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Type",0x00010001,0x00000001
-;hard coded values
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","0",0x00000000,"ACPI\PNP0501"
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","Count",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","NextInstance",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","ClassGUID",0x00000000,"{4D36E978-E325-11CE-BFC1-08002BE10318}"
 HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","Service",0x00000000,"serial"
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00010000,"serenum"
 HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","ClassGUID",0x00000000,"{4D36E978-E325-11CE-BFC1-08002BE10318}"
 HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","Service",0x00000000,"serial"
+HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00010000,"serenum"
 
 ; Packet driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x00010001,0x00000001

diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index 70d80b8..bdf36d0 100755 (executable)
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -265,5 +265,7 @@ media\nls\c_28599.nls                   1
 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

diff --git a/reactos/media/inf/inf.xml b/reactos/media/inf/inf.xml
index da0cd00..683fb9c 100644 (file)
--- a/reactos/media/inf/inf.xml
+++ b/reactos/media/inf/inf.xml
@@ -1,4 +1,6 @@
 <installfile base="inf">layout.inf</installfile>\r
+<installfile base="inf">mouse.inf</installfile>\r
 <installfile base="inf">NET_NIC.inf</installfile>\r
+<installfile base="inf">ports.inf</installfile>\r
 <installfile base="inf">scsi.inf</installfile>\r
 <installfile base="inf">syssetup.inf</installfile>\r

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

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

diff --git a/reactos/media/inf/syssetup.inf b/reactos/media/inf/syssetup.inf
index 54089ef..9b82ef4 100644 (file)
--- a/reactos/media/inf/syssetup.inf
+++ b/reactos/media/inf/syssetup.inf
@@ -14,5 +14,7 @@ ClassGUID={00000000-0000-0000-0000-000000000000}
 [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