diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-02-23 15:18:48 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-02-23 15:18:48 +0000 |
| commit | 5c526736370b475e85c59fafe3900101a95e93d3 (patch) | |
| tree | e207e4cd31cd230e43d460d34b39b20c3f9fbebc /MdeModulePkg/Universal/SetupBrowserDxe | |
| parent | 773194427588380d8eb41fc46de2bed43a46f872 (diff) | |
| download | edk2-platforms-5c526736370b475e85c59fafe3900101a95e93d3.tar.xz | |
Move MdeModuleHii.h into Include\Guid directory
Move Capsule.h into MdePkg\Include\Protocol directory because Capsule is defined in PI1.0a.
Merge WorkingBlockHeader.h into SystemNvDataGuid.h
Remove unused NvDataFvHob.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7606 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal/SetupBrowserDxe')
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c | 8 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 2 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c index 1f8ebf968d..094043f4ee 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c @@ -24,10 +24,6 @@ BOOLEAN mInScopeGrayOut; FORM_EXPRESSION *mSuppressExpression;
FORM_EXPRESSION *mGrayOutExpression;
-EFI_GUID gTianoHiiIfrGuid = EFI_IFR_TIANO_GUID;
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID mFrameworkHiiCompatibilityGuid = EFI_IFR_FRAMEWORK_GUID;
-
-
/**
Initialize Statement header members.
@@ -148,7 +144,7 @@ IsNextOpCodeGuidedVarEqName ( //
OpCodeData += ((EFI_IFR_OP_HEADER *) OpCodeData)->Length;
if (*OpCodeData == EFI_IFR_GUID_OP) {
- if (CompareGuid (&mFrameworkHiiCompatibilityGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) {
+ if (CompareGuid (&gEfiIfrFrameworkGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) {
//
// Specific GUIDed opcodes to support IFR generated from Framework HII VFR
//
@@ -1623,7 +1619,7 @@ ParseOpCodes ( // Vendor specific
//
case EFI_IFR_GUID_OP:
- if (CompareGuid (&gTianoHiiIfrGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) {
+ if (CompareGuid (&gEfiIfrTianoGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) {
//
// Tiano specific GUIDed opcodes
//
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h index b3912b7862..cbdcbd5a1d 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h @@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/HiiString.h>
#include <Protocol/ConsoleControl.h>
-#include <MdeModuleHii.h>
+#include <Guid/MdeModuleHii.h>
#include <Library/PrintLib.h>
#include <Library/DebugLib.h>
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index f808d66800..78a7a838a7 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf @@ -63,6 +63,10 @@ HiiLib
ExtendedHiiLib
+[Guids]
+ gEfiIfrTianoGuid ## CONSUMES ## GUID
+ gEfiIfrFrameworkGuid ## CONSUMES ## GUID
+
[Protocols]
gEfiHiiConfigAccessProtocolGuid ## CONSUMES
gEfiHiiStringProtocolGuid ## CONSUMES
|