edk2[19356] DuetPkg: Fix GCC error to avoid the duplicated global variable in SmbiosGenDxe

[vanjeff]

Revision: 19356
          http://sourceforge.net/p/edk2/code/19356
Author:   vanjeff
Date:     2015-12-18 05:45:52 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
DuetPkg: Fix GCC error to avoid the duplicated global variable in SmbiosGenDxe

Update SmbiosGenDxe to use UefiHiiServicesLib.

(Sync patch r19339 from main trunk.)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming....@intel.com>
Reviewed-by: Jeff Fan <jeff....@intel.com>

Revision Links:
--------------
    http://sourceforge.net/p/edk2/code/19339

Modified Paths:
--------------
    branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.c
    branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.h
    branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.inf

Modified: branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.c
===================================================================
--- branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.c   2015-12-18 05:45:12 UTC 
(rev 19355)
+++ branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.c   2015-12-18 05:45:52 UTC 
(rev 19356)
@@ -18,7 +18,6 @@
 **/
 
 #include "SmbiosGen.h"
-EFI_HII_DATABASE_PROTOCOL   *gHiiDatabase;
 extern UINT8                SmbiosGenDxeStrings[];
 EFI_SMBIOS_PROTOCOL         *gSmbios;
 EFI_HII_HANDLE              gStringHandle;
@@ -211,16 +210,6 @@
   if (EFI_ERROR (Status)) {
     return Status;
   }
-
-  Status = gBS->LocateProtocol (
-                  &gEfiHiiDatabaseProtocolGuid,
-                  NULL,
-                  (VOID**)&gHiiDatabase
-                  );
-
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
   
   gStringHandle = HiiAddPackages (
                     &gEfiCallerIdGuid,

Modified: branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.h
===================================================================
--- branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.h   2015-12-18 05:45:12 UTC 
(rev 19355)
+++ branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.h   2015-12-18 05:45:52 UTC 
(rev 19356)
@@ -39,6 +39,7 @@
 #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"

Modified: branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.inf
===================================================================
--- branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.inf 2015-12-18 05:45:12 UTC 
(rev 19355)
+++ branches/UDK2015/DuetPkg/SmbiosGenDxe/SmbiosGen.inf 2015-12-18 05:45:52 UTC 
(rev 19356)
@@ -41,6 +41,7 @@
   UefiDriverEntryPoint
   BaseLib
   HiiLib
+  UefiHiiServicesLib
   
 [Sources]
   SmbiosGen.c


------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
edk2-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-commits