Reviewed-by: Jeff Fan <jeff....@intel.com>
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming
Gao
Sent: Wednesday, December 16, 2015 6:18 PM
To: edk2-devel@lists.01.org
Subject: [edk2] [Patch 2/3] DuetPkg: Fix GCC error to avoid the duplicated
global variable in SmbiosGenDxe
Update SmbiosGenDxe to use UefiHiiServicesLib.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming....@intel.com>
---
DuetPkg/SmbiosGenDxe/SmbiosGen.c | 11 -----------
DuetPkg/SmbiosGenDxe/SmbiosGen.h | 1 +
DuetPkg/SmbiosGenDxe/SmbiosGen.inf | 1 +
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/DuetPkg/SmbiosGenDxe/SmbiosGen.c b/DuetPkg/SmbiosGenDxe/SmbiosGen.c
index 03e0936..393bb4d 100644
--- a/DuetPkg/SmbiosGenDxe/SmbiosGen.c
+++ b/DuetPkg/SmbiosGenDxe/SmbiosGen.c
@@ -18,7 +18,6 @@ Abstract:
**/
#include "SmbiosGen.h"
-EFI_HII_DATABASE_PROTOCOL *gHiiDatabase;
extern UINT8 SmbiosGenDxeStrings[];
EFI_SMBIOS_PROTOCOL *gSmbios;
EFI_HII_HANDLE gStringHandle;
@@ -211,16 +210,6 @@ SmbiosGenEntrypoint (
if (EFI_ERROR (Status)) {
return Status;
}
-
- Status = gBS->LocateProtocol (
- &gEfiHiiDatabaseProtocolGuid,
- NULL,
- (VOID**)&gHiiDatabase
- );
-
- if (EFI_ERROR (Status)) {
- return Status;
- }
gStringHandle = HiiAddPackages (
&gEfiCallerIdGuid,
diff --git a/DuetPkg/SmbiosGenDxe/SmbiosGen.h b/DuetPkg/SmbiosGenDxe/SmbiosGen.h
index 0474366..3a42e22 100644
--- a/DuetPkg/SmbiosGenDxe/SmbiosGen.h
+++ b/DuetPkg/SmbiosGenDxe/SmbiosGen.h
@@ -39,6 +39,7 @@ Abstract:
#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiHiiServicesLib.h>
#define PRODUCT_NAME L"DUET"
#define PRODUCT_VERSION L"Beta"
diff --git a/DuetPkg/SmbiosGenDxe/SmbiosGen.inf
b/DuetPkg/SmbiosGenDxe/SmbiosGen.inf
index e413beb..c8568da 100644
--- a/DuetPkg/SmbiosGenDxe/SmbiosGen.inf
+++ b/DuetPkg/SmbiosGenDxe/SmbiosGen.inf
@@ -41,6 +41,7 @@
UefiDriverEntryPoint
BaseLib
HiiLib
+ UefiHiiServicesLib
[Sources]
SmbiosGen.c
--
1.9.5.msysgit.0
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
