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...@intel.com> Reviewed-by: Liming Gao <liming....@intel.com> Reviewed-by: Jaben Carsey <jaben.car...@intel.com> --- MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 2 -- MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 3 +-- MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index b153dd4..8368e15 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -68,8 +68,6 @@ FORM_BROWSER_FORMSET *mSystemLevelFormSet; CHAR16 *gEmptyString; CHAR16 *mUnknownString = L"!"; -EFI_GUID gZeroGuid = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}}; - extern EFI_GUID mCurrentFormSetGuid; extern EFI_HII_HANDLE mCurrentHiiHandle; extern UINT16 mCurrentFormId; diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h index 82bc23b..cfd8133 100644 --- 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> #include <Guid/HiiPlatformSetupFormset.h> #include <Guid/HiiFormMapMethodGuid.h> +#include <Guid/ZeroGuid.h> #include <Library/PrintLib.h> #include <Library/DebugLib.h> @@ -584,8 +585,6 @@ extern SETUP_DRIVER_PRIVATE_DATA mPrivateData; // extern CHAR16 *gEmptyString; -extern EFI_GUID gZeroGuid; - extern UI_MENU_SELECTION *gCurrentSelection; // diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index 08f71f3..6aa728d 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf @@ -61,6 +61,7 @@ gEfiIfrFrameworkGuid ## SOMETIMES_CONSUMES ## GUID gEfiHiiPlatformSetupFormsetGuid ## SOMETIMES_CONSUMES ## GUID gEfiHiiStandardFormGuid ## SOMETIMES_CONSUMES ## GUID + gZeroGuid ## SOMETIMES_CONSUMES ## GUID [Protocols] gEfiHiiConfigAccessProtocolGuid ## SOMETIMES_CONSUMES -- 1.9.5.msysgit.0 ------------------------------------------------------------------------------ Monitor 25 network devices or servers for free with OpManager! OpManager is web-based network management software that monitors network devices and physical & virtual servers, alerts via email & sms for fault. Monitor 25 devices for free with no restriction. Download now http://ad.doubleclick.net/ddm/clk/292181274;119417398;o _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel