UEFI HII: Merge UEFI HII support changes from branch.

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

1 files changed, 1 insertions, 17 deletions

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
index 138ed7f439..a08b6ef683 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriverEntryPoint.c
@@ -148,8 +148,6 @@ Returns:
 {

   EFI_MISC_SUBCLASS_DRIVER_DATA     RecordData;

   EFI_DATA_HUB_PROTOCOL             *DataHub;

-  EFI_HII_PROTOCOL                  *Hii;

-  EFI_HII_PACKAGES                  *PackageList;

   EFI_HII_HANDLE                    HiiHandle;

   EFI_STATUS                        Status;

   UINTN                             Index;

@@ -180,23 +178,9 @@ Returns:
     return EFI_DEVICE_ERROR;

   }

   //

-  // Locate hii protocol.

-  //

-  Status = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);

-

-  if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "Could not locate Hii protocol.  %r\n", Status));

-    return Status;

-  } else if (Hii == NULL) {

-    DEBUG ((EFI_D_ERROR, "LocateProtocol(Hii) returned NULL pointer!\n"));

-    return EFI_DEVICE_ERROR;

-  }

-  //

   // Add our default strings to the HII database. They will be modified later.

   //

-  PackageList = PreparePackages (1, &gEfiMiscSubClassGuid, MiscSubclassStrings);

-  Status   = Hii->NewPack (Hii, PackageList, &HiiHandle);

-  FreePool (PackageList);

+  HiiLibAddPackagesToHiiDatabase (1, &gEfiMiscSubClassGuid, NULL, &HiiHandle, MiscSubclassStrings);

 

   if (EFI_ERROR (Status)) {

     DEBUG ((EFI_D_ERROR, "Could not log default strings to Hii.  %r\n", Status));