Set NULL driver for LPT ports

Add more PnP IDs in machine.inf

svn path=/trunk/; revision=18733

diff --git a/reactos/media/inf/machine.inf b/reactos/media/inf/machine.inf
index d77aabe..40fc8df 100644 (file)
--- a/reactos/media/inf/machine.inf
+++ b/reactos/media/inf/machine.inf
@@ -25,27 +25,28 @@ HKR, , Icon,           0, "-27"
 %GenericMfg% = GenericMfg\r
 %IntelMfg% = IntelMfg\r
 \r
-[IntelMfg]\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% = 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
-%*PNP0001.DeviceDesc% = NO_DRV,   *PNP0001\r
-%*PNP0100.DeviceDesc% = NO_DRV,   *PNP0100\r
-%*PNP0200.DeviceDesc% = NO_DRV,   *PNP0200\r
-%*PNP0800.DeviceDesc% = NO_DRV,   *PNP0800\r
-%*PNP0A03.DeviceDesc% = PCI_Inst, *PNP0A03\r
-%*PNP0A05.DeviceDesc% = NO_DRV,   *PNP0A05\r
-%*PNP0B00.DeviceDesc% = NO_DRV,   *PNP0B00\r
-%*PNP0C02.DeviceDesc% = NO_DRV,   *PNP0C02\r
-%*PNP0C0F.DeviceDesc% = NO_DRV,   *PNP0C0F\r
-%ACPI\FixedButton.DeviceDesc% = NO_DRV, ACPI\FixedButton\r
-%PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604\r
+%*PNP0001.DeviceDesc% = NO_DRV,*PNP0001\r
+%*PNP0100.DeviceDesc% = NO_DRV,*PNP0100\r
+%*PNP0200.DeviceDesc% = NO_DRV,*PNP0200\r
+%*PNP0800.DeviceDesc% = NO_DRV,*PNP0800\r
+%*PNP0A00.DeviceDesc% = PCI_ISA_Inst,*PNP0A00\r
+%*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03\r
+%*PNP0A05.DeviceDesc% = NO_DRV,*PNP0A05\r
+%*PNP0B00.DeviceDesc% = NO_DRV,*PNP0B00\r
+%*PNP0C02.DeviceDesc% = NO_DRV,*PNP0C02\r
+%ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton\r
+%PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600\r
+%PCI\CC_0601.DeviceDesc% = PCI_Inst,PCI\CC_0604\r
+%PCI\CC_0604.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0604\r
+\r
+[IntelMfg]\r
+%PCI\VEN_8086&DEV_7110.DeviceDesc% = PCI_ISA_Inst,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
 ;---------------------------- NO DRIVER REQ -----------------------------\r
 \r
@@ -54,16 +55,18 @@ HKR, , Icon,           0, "-27"
 [NO_DRV.Services]\r
 AddService = , 0x00000002\r
 \r
-;----------------------------- INTEL DRIVER -----------------------------\r
+;-------------------------- PCI-ISA BUS DRIVER --------------------------\r
 \r
-[Intel_PCI_ISA_Inst]\r
-CopyFiles = Intel_PCI_ISA_CopyFiles.NT\r
+[PCI_ISA_Inst.NT]\r
+CopyFiles = PCI_ISA_CopyFiles.NT\r
 \r
-[Intel_PCI_ISA_CopyFiles.NT]\r
+[PCI_ISA_CopyFiles.NT]\r
 isapnp.sys\r
 \r
-[Intel_PCI_ISA_Inst.NT.Services]\r
-AddService = isapnp, 0x00000002, isapnp_Service_Inst\r
+[PCI_ISA_Inst.NT.Services]\r
+;DO NOT INSTALL ISAPNP -> FREEZES SYSTEM\r
+;AddService = isapnp, 0x00000002, isapnp_Service_Inst\r
+AddService = , 0x00000002\r
 \r
 [isapnp_Service_Inst]\r
 ServiceType   = 1\r
@@ -107,11 +110,13 @@ GenericMfg = "(Generic system devices)"
 *PNP0C02.DeviceDesc = "Motherboard resources"\r
 *PNP0C0F.DeviceDesc = "PCI interrupt link device"\r
 ACPI\FixedButton.DeviceDesc ="ACPI Fixed Feature Button"\r
+PCI\CC_0600.DeviceDesc = "Standard CPU to PCI bridge"\r
+PCI\CC_0601.DeviceDesc = "Standard PCI to ISA bridge"\r
 PCI\CC_0604.DeviceDesc = "Standard PCI to PCI bridge"\r
 \r
 IntelMfg = "Intel"\r
+PCI\VEN_8086&DEV_7110.DeviceDesc = "Intel 82371AB/EB PCI to ISA Bridge"\r
+PCI\VEN_8086&DEV_7113.DeviceDesc = "Intel 82371AB/EB Power Management Controller"\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

diff --git a/reactos/media/inf/ports.inf b/reactos/media/inf/ports.inf
index c91f286..507800e 100644 (file)
--- a/reactos/media/inf/ports.inf
+++ b/reactos/media/inf/ports.inf
@@ -34,9 +34,9 @@ HKR, , Icon,           0, "-23"
 ;---------------------------- LPT PORT DRIVER ---------------------------\r
 \r
 [LptPort_Inst.NT]\r
-CopyFiles = LptPort_CopyFiles.NT\r
 \r
-[LptPort_CopyFiles.NT]\r
+[LptPort_Inst.NT.Services]\r
+AddService = , 0x00000002\r
 \r
 ;---------------------------- COM PORT DRIVER ---------------------------\r
 \r