Move usb controllers and cdrom classes parameters to their own .inf files. They would...

Fix a typo in mouse.inf

svn path=/trunk/; revision=17300

diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index 89d59d1..9e7ffa5 100644 (file)
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -4,17 +4,6 @@ Signature = "$ReactOS$"
 [AddReg]
 
 ; Device classes (this list is incomplete... and should be generated from .inf files during installation)
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}",,0x00000000,"USB Controllers"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}","Class",0x00000000,"USB"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}","Icon",0x00000000,"-20"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-444553540000}","NoInstallClass",0x00000000,"1"
-
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}",,0x00000000,"DVD/CD-ROM drives"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"CDROM"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}","EnumPropPages32",0x00000000,"MmSys.Cpl,MediaPropPageProvider"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-20"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-08002BE10318}","NoInstallClass",0x00000000,"1"
-
 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Client"
 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"NetClient"
 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-7"

diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index e933c89..f2820a7 100755 (executable)
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -268,9 +268,11 @@ media\nls\c_28597.nls                   1
 media\nls\c_28598.nls                   1
 media\nls\c_28599.nls                   1
 media\drivers\etc\services              5
+media\inf\cdrom.inf                     6
 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
+media\inf\usbport.inf                   6

diff --git a/reactos/media/inf/cdrom.inf b/reactos/media/inf/cdrom.inf
new file mode 100644 (file)
index 0000000..ebbc601
--- /dev/null
+++ b/reactos/media/inf/cdrom.inf
@@ -0,0 +1,30 @@
+; CDROM.INF\r
+\r
+; Installation of CDROMs\r
+\r
+[Version]\r
+Signature  = "$Windows NT$"\r
+;Signature  = "$ReactOS$"\r
+LayoutFile = layout.inf\r
+Class      = CDROM\r
+ClassGUID  = {4D36E965-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 = CDROMClass.NT.AddReg\r
+\r
+[CDROMClass.NT.AddReg]\r
+HKR, , ,               0, %CDROMClassName%\r
+HKR, , EnumPropPages32,0, "MmSys.Cpl,MediaPropPageProvider"\r
+HKR, , Icon,           0, "-51"
+HKR, , NoInstallClass, 0, 1\r
+\r
+;-------------------------------- STRINGS -------------------------------\r
+\r
+[Strings]\r
+ReactOS = "ReactOS Team"\r
+CDROMClassName = "DVD/CD-ROM drives"
\ No newline at end of file

diff --git a/reactos/media/inf/inf.xml b/reactos/media/inf/inf.xml
index 730ea3d..6a24daa 100644 (file)
--- a/reactos/media/inf/inf.xml
+++ b/reactos/media/inf/inf.xml
@@ -1,6 +1,8 @@
+<installfile base="inf">cdrom.inf</installfile>
 <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>
+<installfile base="inf">usbport.inf</installfile>
\ No newline at end of file

diff --git a/reactos/media/inf/mouse.inf b/reactos/media/inf/mouse.inf
index 6588fb9..30d8a41 100644 (file)
--- a/reactos/media/inf/mouse.inf
+++ b/reactos/media/inf/mouse.inf
@@ -25,7 +25,7 @@ HKR, , NoInstallClass, 0, 1
 \r
 [Manufacturer]\r
 %StdMfg% = StdMfg\r
-%LogMfg% = LogMsf\r
+%LogMfg% = LogMfg\r
 %MSMfg%  = MSMfg\r
 \r
 [StdMfg]\r

diff --git a/reactos/media/inf/syssetup.inf b/reactos/media/inf/syssetup.inf
index 9b82ef4..876e900 100644 (file)
--- a/reactos/media/inf/syssetup.inf
+++ b/reactos/media/inf/syssetup.inf
@@ -14,7 +14,9 @@ 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
+cdrom.inf
 mouse.inf
 NET_NIC.inf
 ports.inf
 scsi.inf
+usbport.inf
\ No newline at end of file

diff --git a/reactos/media/inf/usbport.inf b/reactos/media/inf/usbport.inf
new file mode 100644 (file)
index 0000000..420b1d4
--- /dev/null
+++ b/reactos/media/inf/usbport.inf
@@ -0,0 +1,126 @@
+; USBPORT.INF\r
+\r
+; Installation of USB controllers\r
+\r
+[Version]\r
+Signature  = "$Windows NT$"\r
+;Signature  = "$ReactOS$"\r
+LayoutFile = layout.inf\r
+Class      = USB\r
+ClassGUID  = {36FC9E60-C465-11CF-8056-444553540000}\r
+Provider   = %ReactOS%\r
+DriverVer  = 10/19/1999,5.00.2157.1\r
+\r
+[DestinationDirs]\r
+DefaultDestDir = 12\r
+\r
+[ClassInstall32.NT]\r
+AddReg = USBClass.NT.AddReg\r
+\r
+[USBClass.NT.AddReg]\r
+HKR, , ,               0, %USBClassName%\r
+HKR, , Icon,           0, "-20"\r
+HKR, , NoInstallClass, 0, 1\r
+\r
+[Manufacturer]\r
+%GenericMfg% = GenericMfg\r
+%IntelMfg% = IntelMfg\r
+\r
+[GenericMfg]\r
+%PCI\CC_0C0300.DeviceDesc%=UHCI_Inst,PCI\CC_0C0300\r
+%PCI\CC_0C0310.DeviceDesc%=OHCI_Inst,PCI\CC_0C0310\r
+%PCI\CC_0C0320.DeviceDesc%=EHCI_Inst,PCI\CC_0C0320\r
+%USB\ROOT_HUB.DeviceDesc%=RootHub_Inst,USB\ROOT_HUB\r
+\r
+[IntelMfg]\r
+%PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc%=UHCI_Inst,PCI\VEN_8086&DEV_7112&CC_0C0300\r
+\r
+;------------------------------ UHCI DRIVER -----------------------------\r
+\r
+[UHCI_Inst.NT]\r
+CopyFiles = UHCI_CopyFiles\r
+\r
+[UHCI_CopyFiles.NT]\r
+usbcore.sys\r
+usbuhci.sys\r
+\r
+[UHCI_Inst.NT.Services]\r
+AddService = usbuhci, 0x00000002, usbuhci_Service_Inst\r
+\r
+[usbuhci_Service_Inst]\r
+ServiceType   = 1\r
+StartType     = 3\r
+ErrorControl  = 1\r
+ServiceBinary = %12%\usbuhci.sys\r
+LoadOrderGroup = Base\r
+\r
+;------------------------------ OHCI DRIVER -----------------------------\r
+\r
+[OHCI_Inst.NT]\r
+CopyFiles = OHCI_CopyFiles\r
+\r
+[OHCI_CopyFiles.NT]\r
+usbcore.sys\r
+usbohci.sys\r
+\r
+[OHCI_Inst.NT.Services]\r
+AddService = usbohci, 0x00000002, usbohci_Service_Inst\r
+\r
+[usbohci_Service_Inst]\r
+ServiceType   = 1\r
+StartType     = 3\r
+ErrorControl  = 1\r
+ServiceBinary = %12%\usbohci.sys\r
+LoadOrderGroup = Base\r
+\r
+;------------------------------ EHCI DRIVER -----------------------------\r
+\r
+[EHCI_Inst.NT]\r
+CopyFiles = EHCI_CopyFiles\r
+\r
+[EHCI_CopyFiles.NT]\r
+usbcore.sys\r
+usbehci.sys\r
+\r
+[EHCI_Inst.NT.Services]\r
+AddService = usbehci, 0x00000002, usbehci_Service_Inst\r
+\r
+[usbehci_Service_Inst]\r
+ServiceType   = 1\r
+StartType     = 3\r
+ErrorControl  = 1\r
+ServiceBinary = %12%\usbehci.sys\r
+LoadOrderGroup = Base\r
+\r
+;---------------------------- ROOT HUB DRIVER ---------------------------\r
+\r
+[RootHub_Inst.NT]\r
+CopyFiles = RootHub_CopyFiles\r
+\r
+[RootHub_CopyFiles.NT]\r
+usbhub.sys\r
+\r
+[RootHub_Inst.NT.Services]\r
+AddService = usbhub, 0x00000002, usbhub_Service_Inst\r
+\r
+[usbhub_Service_Inst]\r
+ServiceType   = 1\r
+StartType     = 3\r
+ErrorControl  = 1\r
+ServiceBinary = %12%\usbhub.sys\r
+LoadOrderGroup = Base\r
+\r
+;-------------------------------- STRINGS -------------------------------\r
+\r
+[Strings]\r
+ReactOS = "ReactOS Team"\r
+USBClassName = "USB Controllers"\r
+\r
+GenericMfg = "(Generic USB devices)"\r
+PCI\CC_0C0300.DeviceDesc = "UHCI USB controller"\r
+PCI\CC_0C0310.DeviceDesc = "OHCI USB controller"\r
+PCI\CC_0C0320.DeviceDesc = "EHCI USB controller"\r
+USB\ROOT_HUB.DeviceDesc = "Root hub"\r
+\r
+IntelMfg = "Intel"\r
+PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Intel 82371AB/EB/MB PIIX4 USB controller"
\ No newline at end of file