diff options
| author | Liming Gao <liming.gao@intel.com> | 2015-12-18 02:29:12 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@Edk2> | 2015-12-18 02:29:12 +0000 |
| commit | bd6bb560a4aac215133c76c4915f4724c39b0844 (patch) | |
| tree | 95cd708e2820cb7cb3b3737232ca2c99dbbb16d1 | |
| parent | 031950dfdc7b1c190e4fbb32fc147b3d51f40266 (diff) | |
| download | edk2-bd6bb560a4aac215133c76c4915f4724c39b0844.tar.gz edk2-bd6bb560a4aac215133c76c4915f4724c39b0844.tar.bz2 edk2-bd6bb560a4aac215133c76c4915f4724c39b0844.zip | |
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.gao@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19339 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | DuetPkg/SmbiosGenDxe/SmbiosGen.c | 11 | ||||
| -rw-r--r-- | DuetPkg/SmbiosGenDxe/SmbiosGen.h | 1 | ||||
| -rw-r--r-- | 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 03e093639b..393bb4d374 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 0474366b04..3a42e22887 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 e413beb7f3..c8568dabe4 100644 --- a/DuetPkg/SmbiosGenDxe/SmbiosGen.inf +++ b/DuetPkg/SmbiosGenDxe/SmbiosGen.inf @@ -41,6 +41,7 @@ UefiDriverEntryPoint
BaseLib
HiiLib
+ UefiHiiServicesLib
[Sources]
SmbiosGen.c
|