From 9226efe5ebb83ad0d5882e3eb7a54f3d63f81e9d Mon Sep 17 00:00:00 2001 From: qwang12 Date: Sat, 2 Feb 2008 13:15:44 +0000 Subject: 1) Cleanup HiiLib, IfrSupportLib. 2) Add ExtendedHiiLib and ExtendedIfrSupportLib which implement APIs that require the OPcode and Device Path which is specific to Intel's implementation. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4662 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 10 +++++----- MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 2 ++ MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf | 1 + MdeModulePkg/Universal/SetupBrowserDxe/Ui.c | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) (limited to 'MdeModulePkg/Universal/SetupBrowserDxe') diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index d14dac0373..4ec9e6ee2a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -568,7 +568,7 @@ InitializeSetup ( Status = HiiLibCreateHiiDriverHandle (&HiiDriverHandle); ASSERT_EFI_ERROR (Status); - PackageList = PreparePackageList (1, &gSetupBrowserGuid, SetupBrowserStrings); + PackageList = HiiLibPreparePackageList (1, &gSetupBrowserGuid, SetupBrowserStrings); ASSERT (PackageList != NULL); Status = mHiiDatabase->NewPackageList ( mHiiDatabase, @@ -631,7 +631,7 @@ NewString ( EFI_STATUS Status; StringId = 0; - Status = IfrLibNewString (HiiHandle, &StringId, String); + Status = HiiLibNewString (HiiHandle, &StringId, String); ASSERT_EFI_ERROR (Status); return StringId; @@ -656,7 +656,7 @@ DeleteString ( CHAR16 NullChar; NullChar = CHAR_NULL; - return IfrLibSetString (HiiHandle, StringId, &NullChar); + return HiiLibSetString (HiiHandle, StringId, &NullChar); } @@ -687,14 +687,14 @@ GetToken ( String = AllocateZeroPool (BufferLength); ASSERT (String != NULL); - Status = IfrLibGetString (HiiHandle, Token, String, &BufferLength); + Status = HiiLibGetString (HiiHandle, Token, String, &BufferLength); if (Status == EFI_BUFFER_TOO_SMALL) { gBS->FreePool (String); String = AllocateZeroPool (BufferLength); ASSERT (String != NULL); - Status = IfrLibGetString (HiiHandle, Token, String, &BufferLength); + Status = HiiLibGetString (HiiHandle, Token, String, &BufferLength); } ASSERT_EFI_ERROR (Status); diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h index 3ade4dac57..647c4488fc 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h @@ -50,7 +50,9 @@ Revision History #include #include #include +#include #include +#include #include "R8Lib.h" diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index 807076e8ad..c594749ddb 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf @@ -67,6 +67,7 @@ GraphicsLib IfrSupportLib HiiLib + ExtendedHiiLib [Protocols] gEfiPrintProtocolGuid # PROTOCOL ALWAYS_CONSUMED diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c index 34ec5260de..06479c7409 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c @@ -2259,7 +2259,7 @@ UiDisplayMenu ( DevicePath = AllocatePool (BufferSize); HexStringToBuffer ((UINT8 *) DevicePath, &BufferSize, StringPtr); - Selection->Handle = DevicePathToHiiHandle (mHiiDatabase, DevicePath); + Selection->Handle = HiiLibDevicePathToHiiHandle (DevicePath); if (Selection->Handle == NULL) { // // If target Hii Handle not found, exit -- cgit v1.2.3