Removed PCD entries for CPU properties as they should be defined in UNI file. Added...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3762 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index f0e22a4c4bb8a0543566815ab9eb757382be2295..2dff9024c97d4c3d4c202299055be3053f604984 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -424,7 +424,6 @@ Returns:
   EFI_HII_PROTOCOL            *Hii;\r
   EFI_HII_HANDLE              StringHandle;\r
   EFI_HII_PACKAGES            *PackageList;\r
   EFI_HII_PROTOCOL            *Hii;\r
   EFI_HII_HANDLE              StringHandle;\r
   EFI_HII_PACKAGES            *PackageList;\r

-  STRING_REF                  Token;\r

 \r
 \r
   //\r
 \r
 \r
   //\r


@@ -464,15 +463,9 @@ Returns:
 \r
   CopyMem (RecordBuffer.Raw, &mCpuDataRecordHeader, HeaderSize);\r
 \r
 \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
 \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
   TotalSize = HeaderSize + sizeof (EFI_PROCESSOR_VERSION_DATA);\r
 \r
   Status = DataHub->LogData (\r


@@ -485,10 +478,10 @@ Returns:
                       );\r
 \r
   //\r
                       );\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
   //\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
   RecordBuffer.DataRecord->VariableRecord.ProcessorCoreFrequency.Exponent = 6;\r
   TotalSize = HeaderSize + sizeof (EFI_PROCESSOR_CORE_FREQUENCY_DATA);\r
 \r

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
index da623bc07bf80388d1e852afa525c3447707b6a5..e16c9af8294c6bde4361aaf47192a978aeb75133 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
@@ -63,9 +63,5 @@
   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED\r
   gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED\r
 \r
   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
 [Depex]\r
   gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid\r

diff --git a/Nt32Pkg/CpuRuntimeDxe/Strings.uni b/Nt32Pkg/CpuRuntimeDxe/Strings.uni
index fd70fb906819c800344ee31e9373ce50fdef24ae..7a60266dbfbfbbe621c6f745bb44d874983ce133 100644 (file)
Binary files a/Nt32Pkg/CpuRuntimeDxe/Strings.uni and b/Nt32Pkg/CpuRuntimeDxe/Strings.uni differ

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni
index 4355fe1a72605c14c360434fbc5c775d699c9d04..e6e1cb138f78bcbe55f9e528a31457b9b17208bb 100644 (file)
Binary files a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni and b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni differ

diff --git a/Nt32Pkg/Nt32Pkg.dec b/Nt32Pkg/Nt32Pkg.dec
index e23d288a7d5838148dc1ca24db72c7abe7e10160..f54d7ea733b121f969907cae12bc06ba6ad457a2 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dec
+++ b/Nt32Pkg/Nt32Pkg.dec
@@ -124,8 +124,6 @@
   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.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
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus Driver Console Window"|VOID*|0x0000100a\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA Window 1!UGA Window 2"|VOID*|0x0000100d\r
 \r

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
index ae7d2f7c8e5abf6ec4a35a3b1c8bb377b6a09f33..d9165139cf9153e86d5e604c118713575f0ef8b1 100644 (file)
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
@@ -77,8 +77,6 @@
 \r
 [Pcd.common]\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize\r
 \r
 [Pcd.common]\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize\r

-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed\r
-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel\r

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtPhysicalDisk\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtPhysicalDisk\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem\r