diff options
author | Hao Wu <hao.a.wu@intel.com> | 2015-07-07 02:55:34 +0000 |
---|---|---|
committer | hwu1225 <hwu1225@Edk2> | 2015-07-07 02:55:34 +0000 |
commit | 32eabfd593d0e53f01b9180494a8d494b5ec595f (patch) | |
tree | fe24b1c019f71ba8b544772e0b61e6e9f5ccc41b | |
parent | 6692e0a89e3f4e6ffb101060e811990ac2815be5 (diff) | |
download | edk2-32eabfd593d0e53f01b9180494a8d494b5ec595f.zip edk2-32eabfd593d0e53f01b9180494a8d494b5ec595f.tar.gz edk2-32eabfd593d0e53f01b9180494a8d494b5ec595f.tar.bz2 |
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
-rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 2 | ||||
-rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 3 | ||||
-rw-r--r-- | 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 c209db8..fb707f0 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
|