Removed PCD entries for CPU properties as they should be defined in UNI file. Added...
authorAJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524>
Sat, 1 Sep 2007 16:01:35 +0000 (16:01 +0000)
committerAJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524>
Sat, 1 Sep 2007 16:01:35 +0000 (16:01 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3762 6f19259b-4bc3-4df7-8a09-765794883524

Nt32Pkg/CpuRuntimeDxe/Cpu.c
Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
Nt32Pkg/CpuRuntimeDxe/Strings.uni
Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni
Nt32Pkg/Nt32Pkg.dec
Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf

index f0e22a4..2dff902 100644 (file)
@@ -424,7 +424,6 @@ Returns:
   EFI_HII_PROTOCOL            *Hii;\r
   EFI_HII_HANDLE              StringHandle;\r
   EFI_HII_PACKAGES            *PackageList;\r
-  STRING_REF                  Token;\r
 \r
 \r
   //\r
@@ -464,15 +463,9 @@ Returns:
 \r
   CopyMem (RecordBuffer.Raw, &mCpuDataRecordHeader, HeaderSize);\r
 \r
-  //\r
-  // Store processor version data record to data hub\r
-  //\r
-  Token = 0;\r
-  Status = Hii->NewString (Hii, NULL, StringHandle, &Token, (CHAR16 *)PcdGetPtr (PcdWinNtCpuModel));\r
-  ASSERT (!EFI_ERROR (Status));\r
 \r
   RecordBuffer.DataRecord->DataRecordHeader.RecordType      = ProcessorVersionRecordType;\r
-  RecordBuffer.DataRecord->VariableRecord.ProcessorVersion  = Token;\r
+  RecordBuffer.DataRecord->VariableRecord.ProcessorVersion  = STRING_TOKEN (STR_PROCESSOR_VERSION);\r
   TotalSize = HeaderSize + sizeof (EFI_PROCESSOR_VERSION_DATA);\r
 \r
   Status = DataHub->LogData (\r
@@ -485,10 +478,10 @@ Returns:
                       );\r
 \r
   //\r
-  // Store CPU frequency data record to data hub\r
+  // Store CPU frequency data record to data hub - It's an emulator so make up a value\r
   //\r
   RecordBuffer.DataRecord->DataRecordHeader.RecordType                    = ProcessorCoreFrequencyRecordType;\r
-  RecordBuffer.DataRecord->VariableRecord.ProcessorCoreFrequency.Value    = (UINT16) StrDecimalToUintn (PcdGetPtr (PcdWinNtCpuSpeed));\r
+  RecordBuffer.DataRecord->VariableRecord.ProcessorCoreFrequency.Value    = 1234;\r
   RecordBuffer.DataRecord->VariableRecord.ProcessorCoreFrequency.Exponent = 6;\r
   TotalSize = HeaderSize + sizeof (EFI_PROCESSOR_CORE_FREQUENCY_DATA);\r
 \r
index da623bc..e16c9af 100644 (file)
@@ -63,9 +63,5 @@
   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED\r
   gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED\r
 \r
-[Pcd.common]\r
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed\r
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel\r
-\r
 [Depex]\r
   gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid\r
index fd70fb9..7a60266 100644 (file)
Binary files a/Nt32Pkg/CpuRuntimeDxe/Strings.uni and b/Nt32Pkg/CpuRuntimeDxe/Strings.uni differ
index 4355fe1..e6e1cb1 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni differ
index e23d288..f54d7ea 100644 (file)
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga|L"UGA Window 1!UGA Window 2"|VOID*|0x00001003\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"|VOID*|0x00001004\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize|L"64!64"|VOID*|0x00001005\r
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel|L"Intel(R) Processor Model"|VOID*|0x00001007\r
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed|L"3000"|VOID*|0x00001008\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus Driver Console Window"|VOID*|0x0000100a\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA Window 1!UGA Window 2"|VOID*|0x0000100d\r
 \r
index ae7d2f7..d916513 100644 (file)
@@ -77,8 +77,6 @@
 \r
 [Pcd.common]\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize\r
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed\r
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtPhysicalDisk\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem\r