Removed PCD entries for CPU properties as they should be defined in UNI file. Added some French translations to the MiscSubClass for things used on the front page.

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

6 files changed, 3 insertions, 18 deletions

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index f0e22a4c4b..2dff9024c9 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -424,7 +424,6 @@ Returns:
   EFI_HII_PROTOCOL            *Hii;

   EFI_HII_HANDLE              StringHandle;

   EFI_HII_PACKAGES            *PackageList;

-  STRING_REF                  Token;

 

 

   //

@@ -464,15 +463,9 @@ Returns:
 

   CopyMem (RecordBuffer.Raw, &mCpuDataRecordHeader, HeaderSize);

 

-  //

-  // Store processor version data record to data hub

-  //

-  Token = 0;

-  Status = Hii->NewString (Hii, NULL, StringHandle, &Token, (CHAR16 *)PcdGetPtr (PcdWinNtCpuModel));

-  ASSERT (!EFI_ERROR (Status));

 

   RecordBuffer.DataRecord->DataRecordHeader.RecordType      = ProcessorVersionRecordType;

-  RecordBuffer.DataRecord->VariableRecord.ProcessorVersion  = Token;

+  RecordBuffer.DataRecord->VariableRecord.ProcessorVersion  = STRING_TOKEN (STR_PROCESSOR_VERSION);

   TotalSize = HeaderSize + sizeof (EFI_PROCESSOR_VERSION_DATA);

 

   Status = DataHub->LogData (

@@ -485,10 +478,10 @@ Returns:
                       );

 

   //

-  // Store CPU frequency data record to data hub

+  // Store CPU frequency data record to data hub - It's an emulator so make up a value

   //

   RecordBuffer.DataRecord->DataRecordHeader.RecordType                    = ProcessorCoreFrequencyRecordType;

-  RecordBuffer.DataRecord->VariableRecord.ProcessorCoreFrequency.Value    = (UINT16) StrDecimalToUintn (PcdGetPtr (PcdWinNtCpuSpeed));

+  RecordBuffer.DataRecord->VariableRecord.ProcessorCoreFrequency.Value    = 1234;

   RecordBuffer.DataRecord->VariableRecord.ProcessorCoreFrequency.Exponent = 6;

   TotalSize = HeaderSize + sizeof (EFI_PROCESSOR_CORE_FREQUENCY_DATA);

 

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
index da623bc07b..e16c9af829 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf
@@ -63,9 +63,5 @@
   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED

   gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED

 

-[Pcd.common]

-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed

-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel

-

 [Depex]

   gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid

diff --git a/Nt32Pkg/CpuRuntimeDxe/Strings.uni b/Nt32Pkg/CpuRuntimeDxe/Strings.uni
index fd70fb9068..7a60266dbf 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Strings.uni
+++ b/Nt32Pkg/CpuRuntimeDxe/Strings.uni
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni
index 4355fe1a72..e6e1cb138f 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.uni
diff --git a/Nt32Pkg/Nt32Pkg.dec b/Nt32Pkg/Nt32Pkg.dec
index e23d288a7d..f54d7ea733 100644
--- a/Nt32Pkg/Nt32Pkg.dec
+++ b/Nt32Pkg/Nt32Pkg.dec
@@ -124,8 +124,6 @@
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga|L"UGA Window 1!UGA Window 2"|VOID*|0x00001003

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"|VOID*|0x00001004

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize|L"64!64"|VOID*|0x00001005

-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel|L"Intel(R) Processor Model"|VOID*|0x00001007

-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed|L"3000"|VOID*|0x00001008

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus Driver Console Window"|VOID*|0x0000100a

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA Window 1!UGA Window 2"|VOID*|0x0000100d

 

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
index ae7d2f7c8e..d9165139cf 100644
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
@@ -77,8 +77,6 @@
 

 [Pcd.common]

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize

-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuSpeed

-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtCpuModel

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtPhysicalDisk

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem