UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / Nt32Pkg / CpuRuntimeDxe / Cpu.c

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index 2dff9024c97d4c3d4c202299055be3053f604984..48e12ecc1c058c01f2ec6e7329f9e11b9fcc14a7 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -421,10 +421,7 @@ Returns:
   UINT32                      HeaderSize;\r
   UINT32                      TotalSize;\r
   EFI_DATA_HUB_PROTOCOL       *DataHub;\r
-  EFI_HII_PROTOCOL            *Hii;\r
-  EFI_HII_HANDLE              StringHandle;\r
-  EFI_HII_PACKAGES            *PackageList;\r
-\r
+  EFI_HII_HANDLE              HiiHandle;\r
 \r
   //\r
   // Locate DataHub protocol.\r
@@ -434,14 +431,6 @@ Returns:
     return;\r
   }\r
 \r
-  //\r
-  // Locate DataHub protocol.\r
-  //\r
-  Status = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);\r
-  if (EFI_ERROR (Status)) {\r
-    return;\r
-  }\r
-\r
   //\r
   // Initialize data record header\r
   //\r
@@ -456,10 +445,8 @@ Returns:
   //\r
   // Initialize strings to HII database\r
   //\r
-  PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, CpuStrings);\r
-  Status      = Hii->NewPack (Hii, PackageList, &StringHandle);\r
-  ASSERT (!EFI_ERROR (Status));\r
-  FreePool (PackageList);\r
+  HiiLibAddPackagesToHiiDatabase (1, &gEfiProcessorProducerGuid, NULL, &HiiHandle, CpuStrings);\r
+  \r
 \r
   CopyMem (RecordBuffer.Raw, &mCpuDataRecordHeader, HeaderSize);\r
 \r