[ros-diffs] [hpoussin] 17300: Move usb controllers and cdrom classes parameters to their own .inf files. They would be regenerated during 2nd stage setup

Move usb controllers and cdrom classes parameters to their own .inf
files. They would be regenerated during 2nd stage setup
Fix a typo in mouse.inf
Modified: trunk/reactos/bootdata/hivesys.inf
Modified: trunk/reactos/bootdata/packages/reactos.dff
Added: trunk/reactos/media/inf/cdrom.inf
Modified: trunk/reactos/media/inf/inf.xml
Modified: trunk/reactos/media/inf/mouse.inf
Modified: trunk/reactos/media/inf/syssetup.inf
Added: trunk/reactos/media/inf/usbport.inf
  _____  

Modified: trunk/reactos/bootdata/hivesys.inf
--- trunk/reactos/bootdata/hivesys.inf	2005-08-11 19:52:33 UTC (rev
17299)
+++ trunk/reactos/bootdata/hivesys.inf	2005-08-11 20:13:06 UTC (rev
17300)
@@ -4,17 +4,6 @@

 [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-4
44553540000}",,0x00000000,"USB Controllers"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-4
44553540000}","Class",0x00000000,"USB"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-4
44553540000}","Icon",0x00000000,"-20"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{36FC9E60-C465-11CF-8056-4
44553540000}","NoInstallClass",0x00000000,"1"
-
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-0
8002BE10318}",,0x00000000,"DVD/CD-ROM drives"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-0
8002BE10318}","Class",0x00000000,"CDROM"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-0
8002BE10318}","EnumPropPages32",0x00000000,"MmSys.Cpl,MediaPropPageProvi
der"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-0
8002BE10318}","Icon",0x00000000,"-20"
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E965-E325-11CE-BFC1-0
8002BE10318}","NoInstallClass",0x00000000,"1"
-
 
HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08
002BE10318}",,0x00000000,"Network Client"
 
HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08
002BE10318}","Class",0x00000000,"NetClient"
 
HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E973-E325-11CE-BFC1-08
002BE10318}","Icon",0x00000000,"-7"
  _____  

Modified: trunk/reactos/bootdata/packages/reactos.dff
--- trunk/reactos/bootdata/packages/reactos.dff	2005-08-11 19:52:33 UTC
(rev 17299)
+++ trunk/reactos/bootdata/packages/reactos.dff	2005-08-11 20:13:06 UTC
(rev 17300)
@@ -268,9 +268,11 @@

 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
  _____  

Added: trunk/reactos/media/inf/cdrom.inf
--- trunk/reactos/media/inf/cdrom.inf	2005-08-11 19:52:33 UTC (rev
17299)
+++ trunk/reactos/media/inf/cdrom.inf	2005-08-11 20:13:06 UTC (rev
17300)
@@ -0,0 +1,30 @@

+; CDROM.INF
+
+; Installation of CDROMs
+
+[Version]
+Signature  = "$Windows NT$"
+;Signature  = "$ReactOS$"
+LayoutFile = layout.inf
+Class      = CDROM
+ClassGUID  = {4D36E965-E325-11CE-BFC1-08002BE10318}
+Provider   = %ReactOS%
+DriverVer  = 10/19/1999,5.00.2157.1
+
+[DestinationDirs]
+DefaultDestDir = 12
+
+[ClassInstall32.NT]
+AddReg = CDROMClass.NT.AddReg
+
+[CDROMClass.NT.AddReg]
+HKR, , ,               0, %CDROMClassName%
+HKR, , EnumPropPages32,0, "MmSys.Cpl,MediaPropPageProvider"
+HKR, , Icon,           0, "-51"
+HKR, , NoInstallClass, 0, 1
+
+;-------------------------------- STRINGS
-------------------------------
+
+[Strings]
+ReactOS = "ReactOS Team"
+CDROMClassName = "DVD/CD-ROM drives"
\ No newline at end of file
  _____  

Modified: trunk/reactos/media/inf/inf.xml
--- trunk/reactos/media/inf/inf.xml	2005-08-11 19:52:33 UTC (rev
17299)
+++ trunk/reactos/media/inf/inf.xml	2005-08-11 20:13:06 UTC (rev
17300)
@@ -1,3 +1,4 @@

+<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>
@@ -4,3 +5,4 @@
 <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
  _____  

Modified: trunk/reactos/media/inf/mouse.inf
--- trunk/reactos/media/inf/mouse.inf	2005-08-11 19:52:33 UTC (rev
17299)
+++ trunk/reactos/media/inf/mouse.inf	2005-08-11 20:13:06 UTC (rev
17300)
@@ -25,7 +25,7 @@

 
 [Manufacturer]
 %StdMfg% = StdMfg
-%LogMfg% = LogMsf
+%LogMfg% = LogMfg
 %MSMfg%  = MSMfg
 
 [StdMfg]
  _____  

Modified: trunk/reactos/media/inf/syssetup.inf
--- trunk/reactos/media/inf/syssetup.inf	2005-08-11 19:52:33 UTC
(rev 17299)
+++ trunk/reactos/media/inf/syssetup.inf	2005-08-11 20:13:06 UTC
(rev 17300)
@@ -14,7 +14,9 @@

 [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
  _____  

Added: trunk/reactos/media/inf/usbport.inf
--- trunk/reactos/media/inf/usbport.inf	2005-08-11 19:52:33 UTC (rev
17299)
+++ trunk/reactos/media/inf/usbport.inf	2005-08-11 20:13:06 UTC (rev
17300)
@@ -0,0 +1,126 @@

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