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

diff --git a/DuetPkg/SmbiosGenDxe/SmbiosGen.c b/DuetPkg/SmbiosGenDxe/SmbiosGen.c
index 03e093639b64292701806c663fca15f3d402357a..393bb4d374e5f7d05f130e5a7b042481c94da227 100644 (file)
--- a/DuetPkg/SmbiosGenDxe/SmbiosGen.c
+++ b/DuetPkg/SmbiosGenDxe/SmbiosGen.c
@@ -18,7 +18,6 @@ Abstract:
 **/\r
 \r
 #include "SmbiosGen.h"\r
-EFI_HII_DATABASE_PROTOCOL   *gHiiDatabase;\r
 extern UINT8                SmbiosGenDxeStrings[];\r
 EFI_SMBIOS_PROTOCOL         *gSmbios;\r
 EFI_HII_HANDLE              gStringHandle;\r
@@ -211,16 +210,6 @@ SmbiosGenEntrypoint (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
-\r
-  Status = gBS->LocateProtocol (\r
-                  &gEfiHiiDatabaseProtocolGuid,\r
-                  NULL,\r
-                  (VOID**)&gHiiDatabase\r
-                  );\r
-\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
   \r
   gStringHandle = HiiAddPackages (\r
                     &gEfiCallerIdGuid,\r

diff --git a/DuetPkg/SmbiosGenDxe/SmbiosGen.h b/DuetPkg/SmbiosGenDxe/SmbiosGen.h
index 0474366b04c803d43218c4439e86215d7f17ad4c..3a42e22887c664a4b9e0a8abf4a94a751e2fbce9 100644 (file)
--- a/DuetPkg/SmbiosGenDxe/SmbiosGen.h
+++ b/DuetPkg/SmbiosGenDxe/SmbiosGen.h
@@ -39,6 +39,7 @@ Abstract:
 #include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiHiiServicesLib.h>\r
 \r
 #define   PRODUCT_NAME                  L"DUET"\r
 #define   PRODUCT_VERSION               L"Beta"\r

diff --git a/DuetPkg/SmbiosGenDxe/SmbiosGen.inf b/DuetPkg/SmbiosGenDxe/SmbiosGen.inf
index e413beb7f38d3d3aa6750b2f8774b1fe0a5c4804..c8568dabe47445b3b8e23b415f8fc50377134707 100644 (file)
--- a/DuetPkg/SmbiosGenDxe/SmbiosGen.inf
+++ b/DuetPkg/SmbiosGenDxe/SmbiosGen.inf
@@ -41,6 +41,7 @@
   UefiDriverEntryPoint\r
   BaseLib\r
   HiiLib\r
+  UefiHiiServicesLib\r
   \r
 [Sources]\r
   SmbiosGen.c\r