MdeModulePkg: Remove gZeroGuid definition in SetupBrowserDxe

MdeModulePkg has defined gZeroGuid in 'Guid/ZeroGuid.h', therefore, the
gZeroGuid defined in SetupBrowserDxe is redundant.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17839 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index c209db8bc76a59b09f9e68613fce74976c558995..fb707f0d2965156e6a5e527d951a932c63d77986 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -68,8 +68,6 @@ FORM_BROWSER_FORMSET  *mSystemLevelFormSet;
 CHAR16            *gEmptyString;\r
 CHAR16            *mUnknownString = L"!";\r
 \r
-EFI_GUID  gZeroGuid = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}};\r
-\r
 extern EFI_GUID        mCurrentFormSetGuid;\r
 extern EFI_HII_HANDLE  mCurrentHiiHandle;\r
 extern UINT16          mCurrentFormId;\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 82bc23bbf17539976e5ac2b3b77fe1d1332e541d..cfd81334d97bf74f8e3bbe24c0152d3730cca528 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -37,6 +37,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/MdeModuleHii.h>\r
 #include <Guid/HiiPlatformSetupFormset.h>\r
 #include <Guid/HiiFormMapMethodGuid.h>\r
+#include <Guid/ZeroGuid.h>\r
 \r
 #include <Library/PrintLib.h>\r
 #include <Library/DebugLib.h>\r
@@ -584,8 +585,6 @@ extern SETUP_DRIVER_PRIVATE_DATA mPrivateData;
 //\r
 extern CHAR16            *gEmptyString;\r
 \r
-extern EFI_GUID          gZeroGuid;\r
-\r
 extern UI_MENU_SELECTION  *gCurrentSelection;\r
 \r
 //\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 08f71f3e59c070973fa62b8ac7c6fcd9c001d97e..6aa728db03493156bfbeac3f823d9a8a40c1fac4 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -61,6 +61,7 @@
   gEfiIfrFrameworkGuid                          ## SOMETIMES_CONSUMES  ## GUID\r
   gEfiHiiPlatformSetupFormsetGuid               ## SOMETIMES_CONSUMES  ## GUID\r
   gEfiHiiStandardFormGuid                       ## SOMETIMES_CONSUMES  ## GUID\r
+  gZeroGuid                                     ## SOMETIMES_CONSUMES  ## GUID\r
 \r
 [Protocols]\r
   gEfiHiiConfigAccessProtocolGuid               ## SOMETIMES_CONSUMES\r