UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / Nt32Pkg / MiscSubClassPlatformDxe / MiscSubclassDriverEntryPoint.c

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 138ed7f439acef4d72e7ab5dce1b9d2dea8f8077..a08b6ef683722541280ae2fa182f5cc33f6a695b 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -148,8 +148,6 @@ Returns:
 {\r
   EFI_MISC_SUBCLASS_DRIVER_DATA     RecordData;\r
   EFI_DATA_HUB_PROTOCOL             *DataHub;\r
-  EFI_HII_PROTOCOL                  *Hii;\r
-  EFI_HII_PACKAGES                  *PackageList;\r
   EFI_HII_HANDLE                    HiiHandle;\r
   EFI_STATUS                        Status;\r
   UINTN                             Index;\r
@@ -180,23 +178,9 @@ Returns:
     return EFI_DEVICE_ERROR;\r
   }\r
   //\r
-  // Locate hii protocol.\r
-  //\r
-  Status = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);\r
-\r
-  if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Could not locate Hii protocol.  %r\n", Status));\r
-    return Status;\r
-  } else if (Hii == NULL) {\r
-    DEBUG ((EFI_D_ERROR, "LocateProtocol(Hii) returned NULL pointer!\n"));\r
-    return EFI_DEVICE_ERROR;\r
-  }\r
-  //\r
   // Add our default strings to the HII database. They will be modified later.\r
   //\r
-  PackageList = PreparePackages (1, &gEfiMiscSubClassGuid, MiscSubclassStrings);\r
-  Status   = Hii->NewPack (Hii, PackageList, &HiiHandle);\r
-  FreePool (PackageList);\r
+  HiiLibAddPackagesToHiiDatabase (1, &gEfiMiscSubClassGuid, NULL, &HiiHandle, MiscSubclassStrings);\r
 \r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "Could not log default strings to Hii.  %r\n", Status));\r