Small fixes in descriptions, fix typos, sort by alphabetical order

svn path=/trunk/; revision=18691

diff --git a/reactos/media/inf/machine.inf b/reactos/media/inf/machine.inf
index 4de8421..5714625 100644 (file)
--- a/reactos/media/inf/machine.inf
+++ b/reactos/media/inf/machine.inf
@@ -26,24 +26,24 @@ HKR, , Icon,           0, "-27"
 %IntelMfg% = IntelMfg\r
 \r
 [IntelMfg]\r
-%PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7190 ;Intel 440LX\r
-%PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7192 ;Intel 440BX\r
-%PCI\VEN_8086&DEV_7113.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7113\r
-\r
 ; DO NOT INSTALL ISAPNP -> FREEZES SYSTEM\r
 ;%PCI\VEN_8086&DEV_7110.DeviceDesc% = Intel_PCI_ISA_Inst, PCI\VEN_8086&DEV_7110\r
-%PCI\VEN_8086&DEV_7110.DeviceDesc% = INO_DRV, PCI\VEN_8086&DEV_7110\r
+%PCI\VEN_8086&DEV_7110.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7110\r
+%PCI\VEN_8086&DEV_7113.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7113\r
+%PCI\VEN_8086&DEV_7180.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7180\r
+%PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7190\r
+%PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV, PCI\VEN_8086&DEV_7192\r
 \r
 [GenericMfg]\r
-%*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03\r
+%*PNP0001.DeviceDesc% = NO_DRV_Inst, *PNP0001\r
 %*PNP0100.DeviceDesc% = NO_DRV_Inst, *PNP0100\r
 %*PNP0200.DeviceDesc% = NO_DRV_Inst, *PNP0200\r
 %*PNP0800.DeviceDesc% = NO_DRV_Inst, *PNP0800\r
+%*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03\r
 %*PNP0A05.DeviceDesc% = NO_DRV_Inst, *PNP0A05\r
 %*PNP0B00.DeviceDesc% = NO_DRV_Inst, *PNP0B00\r
 %*PNP0C02.DeviceDesc% = NO_DRV_Inst, *PNP0C02\r
-%*PNP0001.DeviceDesc% = NO_DRV_Inst, *PNP0001\r
-%ACPI\FixedButton.DeviceDesc% = NO_DRV_Inst, ACPI\FixedButton\r
+%ACPI\FixedButton.DeviceDesc% = NO_DRV, ACPI\FixedButton\r
 %PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604\r
 \r
 ;---------------------------- NO DRIVER REQ -----------------------------\r
@@ -53,16 +53,6 @@ HKR, , Icon,           0, "-27"
 [NO_DRV.Services]\r
 AddService = , 0x00000002\r
 \r
-[NO_DRV_Inst]\r
-AddReg = NO_DRV_Inst_REG\r
-\r
-[NO_DRV_Inst.Services]\r
-AddService = , 0x00000002\r
-\r
-[NO_DRV_Inst_REG]\r
-HKR,,ResourcePickerExceptions,0,"IO@0-0xFF:*;IO:HAL,MBRES;IRQ:HAL,*"\r
-HKR,,ResourcePickerTags,0,"MBRES"\r
-\r
 ;----------------------------- INTEL DRIVER -----------------------------\r
 \r
 [Intel_PCI_ISA_Inst]\r
@@ -106,21 +96,20 @@ ReactOS = "ReactOS Team"
 SystemClassName = "System devices"\r
 \r
 GenericMfg = "(Generic system devices)"\r
-IntelMfg = "Intel"\r
-\r
+*PNP0001.DeviceDesc = "EISA programmable interrupt controller"\r
 *PNP0A03.DeviceDesc = "PCI bus"\r
+*PNP0A05.DeviceDesc = "Generic ACPI bus"\r
+*PNP0B00.DeviceDesc = "AT real-time clock"\r
 *PNP0100.DeviceDesc = "System timer"\r
 *PNP0200.DeviceDesc = "DMA controller"\r
 *PNP0800.DeviceDesc = "System speaker"\r
-*PNP0A05.DeviceDesc = "Generic ACPI bus"\r
-*PNP0b00.DeviceDesc = "AT real-time clock"\r
 *PNP0C02.DeviceDesc = "Motherboard resources"\r
-*PNP0001.DeviceDesc = "EISA programmable interrupt controller"\r
-\r
-ACPI\FixedButton.DeviceDesc=" ACPI Fixed Feature Button"\r
+ACPI\FixedButton.DeviceDesc ="ACPI Fixed Feature Button"\r
 PCI\CC_0604.DeviceDesc = "Standard PCI to PCI bridge"\r
 \r
-PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX Pentium(R) II CPU to PCI-Bridge"\r
-PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX Pentium(R) II CPU to PCI-Bridge"\r
+IntelMfg = "Intel"\r
+PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II CPU to PCI-Bridge"\r
+PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge"\r
+PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge"\r
 PCI\VEN_8086&DEV_7113.DeviceDesc = "Intel 82371AB/EB Power Management Controller"\r
 PCI\VEN_8086&DEV_7110.DeviceDesc = "Intel 82371AB/EB PCI to ISA Bridge"
\ No newline at end of file