diff options
| -rw-r--r-- | IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 1 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | 16 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h | 6 | ||||
| -rw-r--r-- | SecurityPkg/SecurityPkg.dsc | 1 |
4 files changed, 11 insertions, 13 deletions
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index 3fc3bcca69..83e43d2cc9 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -73,7 +73,6 @@ DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
- IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
PalLib|MdePkg/Library/BasePalLibNull/BasePalLibNull.inf
[LibraryClasses.common.PEIM]
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index 2448eac416..7cc71e2476 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c @@ -1250,7 +1250,7 @@ ParseIfrData ( //
// Numeric minimum value will be used as default value when no default is specified.
//
- DefaultData.Type = DEFAULT_VALUE_FROM_DEFAULT;
+ DefaultData.Type = DefaultValueFromDefault;
switch (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE) {
case EFI_IFR_NUMERIC_SIZE_1:
DefaultData.Value = (UINT64) IfrOneOf->data.u8.MinValue;
@@ -1404,13 +1404,13 @@ ParseIfrData ( //
// When flag is set, defautl value is TRUE.
//
- DefaultData.Type = DEFAULT_VALUE_FROM_FLAG;
+ DefaultData.Type = DefaultValueFromFlag;
DefaultData.Value = 1;
} else {
//
// When flag is not set, defautl value is FASLE.
//
- DefaultData.Type = DEFAULT_VALUE_FROM_DEFAULT;
+ DefaultData.Type = DefaultValueFromDefault;
DefaultData.Value = 0;
}
//
@@ -1430,13 +1430,13 @@ ParseIfrData ( //
// When flag is set, defautl value is TRUE.
//
- DefaultData.Type = DEFAULT_VALUE_FROM_FLAG;
+ DefaultData.Type = DefaultValueFromFlag;
DefaultData.Value = 1;
} else {
//
// When flag is not set, defautl value is FASLE.
//
- DefaultData.Type = DEFAULT_VALUE_FROM_DEFAULT;
+ DefaultData.Type = DefaultValueFromDefault;
DefaultData.Value = 0;
}
//
@@ -1664,7 +1664,7 @@ ParseIfrData ( // Prepare new DefaultValue
//
- DefaultData.Type = DEFAULT_VALUE_FROM_FLAG;
+ DefaultData.Type = DefaultValueFromFlag;
DefaultData.Value = IfrOneOfOption->Value.u64;
if ((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT) == EFI_IFR_OPTION_DEFAULT) {
DefaultData.DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;
@@ -1689,7 +1689,7 @@ ParseIfrData ( //
// Prepare new DefaultValue
//
- DefaultData.Type = DEFAULT_VALUE_FROM_DEFAULT;
+ DefaultData.Type = DefaultValueFromDefault;
DefaultData.Value = IfrOneOfOption->Value.u64;
for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {
DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);
@@ -1724,7 +1724,7 @@ ParseIfrData ( //
// Prepare new DefaultValue
//
- DefaultData.Type = DEFAULT_VALUE_FROM_OPCODE;
+ DefaultData.Type = DefaultValueFromOpcode;
DefaultData.DefaultId = VarDefaultId;
DefaultData.Value = IfrDefault->Value.u64;
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h index ccb9263923..b0944abb1b 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h @@ -84,9 +84,9 @@ typedef struct { // Get default value from IFR data.
//
typedef enum {
- DEFAULT_VALUE_FROM_DEFAULT = 0, // Get from the minimum or first one when not set default value.
- DEFAULT_VALUE_FROM_FLAG, // Get default value from the defalut flag.
- DEFAULT_VALUE_FROM_OPCODE // Get default value from default opcode, highest priority.
+ DefaultValueFromDefault = 0, // Get from the minimum or first one when not set default value.
+ DefaultValueFromFlag, // Get default value from the defalut flag.
+ DefaultValueFromOpcode // Get default value from default opcode, highest priority.
} DEFAULT_VALUE_TYPE;
typedef struct {
diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc index 7eda01eda2..f089e33088 100644 --- a/SecurityPkg/SecurityPkg.dsc +++ b/SecurityPkg/SecurityPkg.dsc @@ -65,7 +65,6 @@ [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_SAL_DRIVER,]
HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
- MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
[LibraryClasses.IPF.DXE_SAL_DRIVER]
|