From 5c526736370b475e85c59fafe3900101a95e93d3 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Mon, 23 Feb 2009 15:18:48 +0000 Subject: 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 --- MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c | 12 ++++++++++-- .../Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h | 2 +- MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h | 2 +- .../Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h | 2 -- MdeModulePkg/Universal/PCD/Pei/Pcd.inf | 4 ++-- MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c | 8 ++------ MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 2 +- MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf | 4 ++++ 8 files changed, 21 insertions(+), 15 deletions(-) (limited to 'MdeModulePkg/Universal') diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c index 2d5411a607..14246b0669 100644 --- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c +++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c @@ -235,15 +235,23 @@ QueryCapsuleCapabilities ( if (!FeaturePcdGet(PcdSupportUpdateCapsuleReset)) { return EFI_UNSUPPORTED; } - *ResetType = EfiResetWarm; - *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizePopulateCapsule); + *ResetType = EfiResetWarm; } else { // // For non-reset capsule image. // *ResetType = EfiResetCold; + } + + // + // The support max capsule image size + // + if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0) { + *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizePopulateCapsule); + } else { *MaxiumCapsuleSize = FixedPcdGet32(PcdMaxSizeNonPopulateCapsule); } + return EFI_SUCCESS; } diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h index dc516f4f64..2922e17487 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h @@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include -#include +#include #include #include diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h index fb536f6351..d33740826c 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h @@ -32,7 +32,7 @@ Revision History #include #include -#include +#include #include #include #include diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h index dfc5b36ffa..c33e1798b2 100644 --- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h +++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h @@ -32,8 +32,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include -#include - // // Flash erase polarity is 1 // diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf index cebcf47c36..3770df8ba1 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf @@ -57,14 +57,14 @@ [FeaturePcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled + gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled [FixedPcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry + gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiPcdDatabaseCallbackOnSetEnabled [Depex] TRUE 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 #include -#include +#include #include #include 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 -- cgit v1.2.3