[PROCESSR]

[reactos.git] / reactos / media / inf / cpu.inf

diff --git a/reactos/media/inf/cpu.inf b/reactos/media/inf/cpu.inf
index 0a63a9a..1e83841 100644 (file)
--- a/reactos/media/inf/cpu.inf
+++ b/reactos/media/inf/cpu.inf
@@ -29,74 +29,84 @@ HKR, , Icon,           0, "-28"
 %VIAMfg%=VIA\r
 \r
 [Standard]\r
-%Processor.DeviceDesc% = NO_DRV,ACPI\Processor\r
+%Processor.DeviceDesc% = Processr_Inst,ACPI\Processor\r
 \r
 [Cyrix]\r
-%CyrixProcessor.DeviceDesc% = NO_DRV,ACPI\CyrixInstead_-_x86\r
+%CyrixProcessor.DeviceDesc% = Processr_Inst,ACPI\CyrixInstead_-_x86\r
 \r
 [Intel]\r
-%IntelProcessor.DeviceDesc%       = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_1\r
-%IntelProcessor.DeviceDesc%       = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_2\r
-%IntelProcessor.DeviceDesc%       = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_3\r
-%IntelMMXProcessor.DeviceDesc%    = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_4\r
-%IntelMMXProcessor.DeviceDesc%    = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_7\r
-%IntelMMXProcessor.DeviceDesc%    = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_8\r
-%IntelPROProcessor.DeviceDesc%    = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_1\r
-%IntelP2Processor.DeviceDesc%     = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_3\r
-%IntelP2Processor.DeviceDesc%     = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_5\r
-%IntelP2Processor.DeviceDesc%     = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_6\r
-%IntelP3Processor.DeviceDesc%     = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_7\r
-%IntelP3Processor.DeviceDesc%     = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_8\r
-%IntelMProcessor.DeviceDesc%      = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_9\r
-%IntelP3Processor.DeviceDesc%     = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_10\r
-%IntelP3Processor.DeviceDesc%     = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_11\r
-%IntelMProcessor.DeviceDesc%      = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_13\r
-%IntelCoreProcessor.DeviceDesc%   = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_14\r
-%IntelCoreProcessor.DeviceDesc%   = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_15\r
-%IntelCoreProcessor.DeviceDesc%   = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_22\r
-%IntelCoreProcessor.DeviceDesc%   = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_23\r
-%IntelCoreiXProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_26\r
-%IntelAtomProcessor.DeviceDesc%   = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_28\r
-%IntelCoreiXProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_30\r
-%IntelCoreiXProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_37\r
-%IntelP4Processor.DeviceDesc%     = NO_DRV,ACPI\GenuineIntel_-_x86_Family_15\r
-%IntelProcessor.DeviceDesc%       = NO_DRV,ACPI\GenuineIntel_-_x86\r
+%IntelProcessor.DeviceDesc%       = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_1\r
+%IntelProcessor.DeviceDesc%       = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_2\r
+%IntelProcessor.DeviceDesc%       = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_3\r
+%IntelMMXProcessor.DeviceDesc%    = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_4\r
+%IntelMMXProcessor.DeviceDesc%    = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_7\r
+%IntelMMXProcessor.DeviceDesc%    = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_8\r
+%IntelPROProcessor.DeviceDesc%    = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_1\r
+%IntelP2Processor.DeviceDesc%     = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_3\r
+%IntelP2Processor.DeviceDesc%     = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_5\r
+%IntelP2Processor.DeviceDesc%     = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_6\r
+%IntelP3Processor.DeviceDesc%     = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_7\r
+%IntelP3Processor.DeviceDesc%     = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_8\r
+%IntelMProcessor.DeviceDesc%      = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_9\r
+%IntelP3Processor.DeviceDesc%     = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_10\r
+%IntelP3Processor.DeviceDesc%     = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_11\r
+%IntelMProcessor.DeviceDesc%      = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_13\r
+%IntelCoreProcessor.DeviceDesc%   = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_14\r
+%IntelCoreProcessor.DeviceDesc%   = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_15\r
+%IntelCoreProcessor.DeviceDesc%   = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_22\r
+%IntelCoreProcessor.DeviceDesc%   = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_23\r
+%IntelCoreiXProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_26\r
+%IntelAtomProcessor.DeviceDesc%   = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_28\r
+%IntelCoreiXProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_30\r
+%IntelCoreiXProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_37\r
+%IntelP4Processor.DeviceDesc%     = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_15\r
+%IntelProcessor.DeviceDesc%       = Processr_Inst,ACPI\GenuineIntel_-_x86\r
 \r
 [AMD]\r
-%AMDK6Processor.DeviceDesc%   = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_5_Model_7\r
-%AMDK62Processor.DeviceDesc%  = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_5_Model_8\r
-%AMDK63Processor.DeviceDesc%  = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_5_Model_9\r
-%AMDK63Processor.DeviceDesc%  = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_5_Model_10\r
-%AMDK63Processor.DeviceDesc%  = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_5_Model_13\r
-%AMDK7Processor.DeviceDesc%   = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_6\r
-%AMDK8Processor.DeviceDesc%   = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_15\r
-%AMDPHENProcessor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_16\r
-%AMDQProcessor.DeviceDesc%    = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_17\r
-%AMDProcessor.DeviceDesc%     = NO_DRV,ACPI\AuthenticAMD_-_x86\r
+%AMDK6Processor.DeviceDesc%   = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_7\r
+%AMDK62Processor.DeviceDesc%  = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_8\r
+%AMDK63Processor.DeviceDesc%  = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_9\r
+%AMDK63Processor.DeviceDesc%  = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_10\r
+%AMDK63Processor.DeviceDesc%  = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_13\r
+%AMDK7Processor.DeviceDesc%   = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_6\r
+%AMDK8Processor.DeviceDesc%   = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_15\r
+%AMDPHENProcessor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_16\r
+%AMDQProcessor.DeviceDesc%    = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_17\r
+%AMDProcessor.DeviceDesc%     = Processr_Inst,ACPI\AuthenticAMD_-_x86\r
 \r
 [Transmeta]\r
-%TransmetaProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineTMx86_-_x86\r
+%TransmetaProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineTMx86_-_x86\r
 \r
 [VIA]\r
-%ViaNEHProcessor.DeviceDesc%  = NO_DRV,ACPI\CentaurHauls_-_x86_Family_6_Model_9\r
-%ViaESTProcessor.DeviceDesc%  = NO_DRV,ACPI\CentaurHauls_-_x86_Family_6_Model_10\r
-%ViaC7Processor.DeviceDesc%   = NO_DRV,ACPI\CentaurHauls_-_x86_Family_6_Model_13\r
-%ViaNANOProcessor.DeviceDesc% = NO_DRV,ACPI\CentaurHauls_-_x86_Family_6_Model_15\r
-%ViaProcessor.DeviceDesc%     = NO_DRV,ACPI\CentaurHauls_-_x86\r
+%ViaNEHProcessor.DeviceDesc%  = Processr_Inst,ACPI\CentaurHauls_-_x86_Family_6_Model_9\r
+%ViaESTProcessor.DeviceDesc%  = Processr_Inst,ACPI\CentaurHauls_-_x86_Family_6_Model_10\r
+%ViaC7Processor.DeviceDesc%   = Processr_Inst,ACPI\CentaurHauls_-_x86_Family_6_Model_13\r
+%ViaNANOProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_x86_Family_6_Model_15\r
+%ViaProcessor.DeviceDesc%     = Processr_Inst,ACPI\CentaurHauls_-_x86\r
 \r
-;---------------------------- NO DRIVER REQ -----------------------------\r
+;---------------------------- Processr Driver ---------------------------\r
 \r
-[NO_DRV]\r
-AddReg=NO_DRV.AddReg\r
+[Processr_Inst.NT]\r
+CopyFiles = Processr_Inst.CopyFiles.NT\r
+AddReg = Processr_Inst.AddReg.NT\r
 \r
-[NO_DRV.Services]\r
-AddService = , 0x00000002\r
+[Processr_Inst.CopyFiles.NT]\r
+processr.sys\r
 \r
-[NO_DRV.HW]\r
-\r
-[NO_DRV.AddReg]\r
+[Processr_Inst.AddReg.NT]\r
 HKR,,EnumPropPages32,,"devcpux.dll,PropSheetExtProc"\r
 \r
+[Processr_Inst.NT.Services]\r
+AddService = Processor, 0x00000002, Processr_Service_Inst\r
+\r
+[Processr_Service_Inst]\r
+DisplayName    = %Processor.ServiceDesc%\r
+ServiceType    = 1\r
+StartType      = 1\r
+ErrorControl   = 1\r
+ServiceBinary  = %12%\processr.sys\r
+LoadOrderGroup = Extended Base\r
+\r
 ;-------------------------------- STRINGS -------------------------------\r
 \r
 [Strings]\r
@@ -110,6 +120,7 @@ AMDMfg = "Advanced Micro Devices"
 TransmetaMfg = "Transmeta"\r
 VIAMfg = "VIA"\r
 Processor.DeviceDesc = "Processor"\r
+Processor.ServiceDesc = "Processor driver"\r
 CyrixProcessor.DeviceDesc = "Cyrix 6x86 Processor"\r
 IntelProcessor.DeviceDesc = "Intel Pentium Processor"\r
 IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX Processor"\r
@@ -139,6 +150,7 @@ ViaProcessor.DeviceDesc = "VIA Processor"
 \r
 [Strings.0405]\r
 Processor.DeviceDesc = "Procesor"\r
+Processor.ServiceDesc = "Processor driver"\r
 CyrixProcessor.DeviceDesc = "Procesor Cyrix 6x86"\r
 IntelProcessor.DeviceDesc = "Procesor Intel Pentium"\r
 IntelMMXProcessor.DeviceDesc = "Procesor Intel Pentium MMX"\r
@@ -169,6 +181,7 @@ ViaProcessor.DeviceDesc = "Procesor VIA"
 [Strings.0407]\r
 ProcessorClassName = "Prozessoren"\r
 Processor.DeviceDesc = "Prozessor"\r
+Processor.ServiceDesc = "Prozessortreiber"\r
 CyrixProcessor.DeviceDesc = "Cyrix 6x86 Prozessor"\r
 IntelProcessor.DeviceDesc = "Intel Pentium Prozessor"\r
 IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX Prozessor"\r
@@ -198,23 +211,27 @@ ViaProcessor.DeviceDesc = "VIA Prozessor"
 \r
 [Strings.0408]\r
 Processor.DeviceDesc = "Επεξεργαστής"\r
+Processor.ServiceDesc = "Processor driver"\r
 IntelProcessor.DeviceDesc = "Επεξεργαστής Intel"\r
 Standard = "Πρότυπος επεξεργαστής"\r
 \r
 [Strings.0a]\r
 ReactOS = "Equipo de ReactOS"\r
 Processor.DeviceDesc = "Procesador"\r
+Processor.ServiceDesc = "Processor driver"\r
 IntelProcessor.DeviceDesc = "Procesador Intel"\r
 AMDProcessor.DeviceDesc = "Procesador AMD"\r
 Standard = "Procesador estándar"\r
 \r
 [Strings.040C]\r
 Processor.DeviceDesc = "Processeur"\r
+Processor.ServiceDesc = "Processor driver"\r
 IntelProcessor.DeviceDesc = "Processeur Intel"\r
 Standard = "Processeur standard"\r
 \r
 [Strings.0411]\r
 Processor.DeviceDesc = "プロセッサ"\r
+Processor.ServiceDesc = "Processor driver"\r
 IntelProcessor.DeviceDesc = "Intel プロセッサ"\r
 Standard = "スタンダードプロセッサ"\r
 \r
@@ -228,6 +245,7 @@ AMDMfg = "Advanced Micro Devices"
 TransmetaMfg = "Transmeta"\r
 VIAMfg = "VIA"\r
 Processor.DeviceDesc = "Procesor"\r
+Processor.ServiceDesc = "Processor driver"\r
 CyrixProcessor.DeviceDesc = "Procesor Cyrix 6x86"\r
 IntelProcessor.DeviceDesc = "Procesor Intel Pentium"\r
 IntelMMXProcessor.DeviceDesc = "Procesor Intel Pentium MMX"\r
@@ -257,6 +275,7 @@ ViaProcessor.DeviceDesc = "Procesor VIA"
 \r
 [Strings.0416]\r
 Processor.DeviceDesc = "Processadores"\r
+Processor.ServiceDesc = "Processor driver"\r
 IntelProcessor.DeviceDesc = "Procesador Intel"\r
 Standard = "Processador padrão"\r
 \r
@@ -264,6 +283,7 @@ Standard = "Processador padrão"
 ReactOS = "Fundația ReactOS"\r
 ProcessorClassName = "Procesoare"\r
 Processor.DeviceDesc = "Procesor"\r
+Processor.ServiceDesc = "Processor driver"\r
 CyrixProcessor.DeviceDesc = "Procesor Cyrix 6x86"\r
 IntelProcessor.DeviceDesc = "Procesor Intel Pentium"\r
 IntelMMXProcessor.DeviceDesc = "Procesor Intel Pentium MMX"\r
@@ -297,6 +317,7 @@ ReactOS = "Фонд ReactOS"
 ProcessorClassName = "Процессоры"\r
 \r
 Processor.DeviceDesc = "Процессор"\r
+Processor.ServiceDesc = "Processor driver"\r
 CyrixProcessor.DeviceDesc = "Cyrix 6x86 процессор"\r
 IntelProcessor.DeviceDesc = "Intel Pentium процессор"\r
 IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX процессор"\r
@@ -326,6 +347,7 @@ ViaProcessor.DeviceDesc = "VIA процессор"
 \r
 [Strings.041B]\r
 Processor.DeviceDesc = "Procesor"\r
+Processor.ServiceDesc = "Processor driver"\r
 IntelProcessor.DeviceDesc = "Intel procesor"\r
 Standard = "Štandardný procesor"\r
 \r
@@ -339,6 +361,7 @@ AMDMfg = "Advanced Micro Devices"
 TransmetaMfg = "Transmeta"\r
 VIAMfg = "VIA"\r
 Processor.DeviceDesc = "İşlemci"\r
+Processor.ServiceDesc = "Processor driver"\r
 CyrixProcessor.DeviceDesc = "Cyrix 6x86 İşlemci"\r
 IntelProcessor.DeviceDesc = "Intel Pentium İşlemci"\r
 IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX İşlemci"\r
@@ -370,6 +393,7 @@ ViaProcessor.DeviceDesc = "VIA İşlemci"
 ReactOS = "Фонд ReactOS"\r
 ProcessorClassName = "Процесори"\r
 Processor.DeviceDesc = "Процесор"\r
+Processor.ServiceDesc = "Processor driver"\r
 CyrixProcessor.DeviceDesc = "Процесор Cyrix 6x86"\r
 IntelProcessor.DeviceDesc = "Процесор Intel Pentium"\r
 IntelMMXProcessor.DeviceDesc = "Процесор Intel Pentium MMX"\r
@@ -399,5 +423,6 @@ ViaProcessor.DeviceDesc = "Процесор VIA"
 \r
 [Strings.0427]\r
 Processor.DeviceDesc = "Procesorius"\r
+Processor.ServiceDesc = "Processor driver"\r
 IntelProcessor.DeviceDesc = "Intel procesorius"\r
 Standard = "Standartinis procesorius"\r