* [patch 1/2] MdeModulePkg/HiiDB: Share default if some default value are not specified
2016-08-05 2:13 [patch 0/2] Share default value if some default value are not specified Dandan Bi
@ 2016-08-05 2:13 ` Dandan Bi
2016-08-05 2:13 ` [patch 2/2] MdeModulePkg/Browser: " Dandan Bi
1 sibling, 0 replies; 4+ messages in thread
From: Dandan Bi @ 2016-08-05 2:13 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao, Eric Dong
Add a new implementation policy of getting default in HiiDatabase.
The new policy is only for the situation that a question has default
value but doesn't have default value for all supported default type.
In this case, we will choose the smallest default id from the existing
defaults, and share its value to other default id which has no
default value.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
---
.../Universal/HiiDatabaseDxe/ConfigRouting.c | 115 ++++++++++++++++++---
.../Universal/HiiDatabaseDxe/HiiDatabase.h | 2 +
2 files changed, 101 insertions(+), 16 deletions(-)
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 0578352..0a5ea83 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -1150,11 +1150,11 @@ InsertDefaultValue (
DefaultValueArray = BASE_CR (Link, IFR_DEFAULT_DATA, Entry);
if (DefaultValueArray->DefaultId == DefaultValueData->DefaultId) {
//
// DEFAULT_VALUE_FROM_OPCODE has high priority, DEFAULT_VALUE_FROM_DEFAULT has low priority.
//
- if (DefaultValueData->Type > DefaultValueArray->Type) {
+ if (DefaultValueData->Type >= DefaultValueArray->Type) {
//
// Update the default value array in BlockData.
//
CopyMem (&DefaultValueArray->Value, &DefaultValueData->Value, sizeof (EFI_IFR_TYPE_VALUE));
DefaultValueArray->Type = DefaultValueData->Type;
@@ -2099,19 +2099,22 @@ ParseIfrData (
LIST_ENTRY *LinkData;
LIST_ENTRY *LinkDefault;
EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore;
EFI_HII_PACKAGE_HEADER *PackageHeader;
EFI_VARSTORE_ID VarStoreId;
+ UINT16 SmallestDefaultId;
+ UINT16 SmallestIdFromFlag;
Status = EFI_SUCCESS;
BlockData = NULL;
DefaultDataPtr = NULL;
FirstOneOfOption = FALSE;
VarStoreId = 0;
FirstOrderedList = FALSE;
VarStoreName = NULL;
ZeroMem (&DefaultData, sizeof (IFR_DEFAULT_DATA));
+ SmallestDefaultId = 0xFFFF;
//
// Go through the form package to parse OpCode one by one.
//
PackageOffset = sizeof (EFI_HII_PACKAGE_HEADER);
@@ -2473,10 +2476,12 @@ ParseIfrData (
//
//when go to there,BlockData can't be NULLL.
//
ASSERT (BlockData != NULL);
+ SmallestIdFromFlag = FALSE;
+
//
// Add default value for standard ID by CheckBox Flag
//
VarDefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;
//
@@ -2487,21 +2492,20 @@ ParseIfrData (
//
// When flag is set, defautl value is TRUE.
//
DefaultData.Type = DefaultValueFromFlag;
DefaultData.Value.b = TRUE;
- } else {
- //
- // When flag is not set, defautl value is FASLE.
- //
- DefaultData.Type = DefaultValueFromDefault;
- DefaultData.Value.b = FALSE;
+ InsertDefaultValue (BlockData, &DefaultData);
+
+ if (SmallestDefaultId > EFI_HII_DEFAULT_CLASS_STANDARD) {
+ //
+ // Record the SmallestDefaultId and update the SmallestIdFromFlag.
+ //
+ SmallestDefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;
+ SmallestIdFromFlag = TRUE;
+ }
}
- //
- // Add DefaultValue into current BlockData
- //
- InsertDefaultValue (BlockData, &DefaultData);
//
// Add default value for Manufacture ID by CheckBox Flag
//
VarDefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;
@@ -2513,21 +2517,49 @@ ParseIfrData (
//
// When flag is set, defautl value is TRUE.
//
DefaultData.Type = DefaultValueFromFlag;
DefaultData.Value.b = TRUE;
+ InsertDefaultValue (BlockData, &DefaultData);
+
+ if (SmallestDefaultId > EFI_HII_DEFAULT_CLASS_MANUFACTURING) {
+ //
+ // Record the SmallestDefaultId and update the SmallestIdFromFlag.
+ //
+ SmallestDefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;
+ SmallestIdFromFlag = TRUE;
+ }
+ }
+ if (SmallestIdFromFlag) {
+ //
+ // When smallest default Id is given by the flag of CheckBox, set defaut value with TRUE for other default Id in the DefaultId list.
+ //
+ DefaultData.Type = DefaultValueFromOtherDefault;
+ DefaultData.Value.b = TRUE;
+ //
+ // Set default value for all the default id in the DefaultId list.
+ //
+ for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {
+ DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);
+ DefaultData.DefaultId = DefaultDataPtr->DefaultId;
+ InsertDefaultValue (BlockData, &DefaultData);
+ }
} else {
//
// When flag is not set, defautl value is FASLE.
//
DefaultData.Type = DefaultValueFromDefault;
DefaultData.Value.b = FALSE;
+ //
+ // Set default value for all the default id in the DefaultId list.
+ //
+ for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {
+ DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);
+ DefaultData.DefaultId = DefaultDataPtr->DefaultId;
+ InsertDefaultValue (BlockData, &DefaultData);
+ }
}
- //
- // Add DefaultValue into current BlockData
- //
- InsertDefaultValue (BlockData, &DefaultData);
break;
case EFI_IFR_DATE_OP:
//
// offset by question header
@@ -2777,30 +2809,62 @@ ParseIfrData (
break;
}
//
// 1. Set default value for OneOf option when flag field has default attribute.
+ // And set the default value with the smallest default id for other default id in the DefaultId list.
//
if (((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT) == EFI_IFR_OPTION_DEFAULT) ||
((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT_MFG) == EFI_IFR_OPTION_DEFAULT_MFG)) {
//
// This flag is used to specify whether this option is the first. Set it to FALSE for the following options.
// The first oneof option value will be used as default value when no default value is specified.
//
FirstOneOfOption = FALSE;
+
+ SmallestIdFromFlag = FALSE;
// Prepare new DefaultValue
//
DefaultData.Type = DefaultValueFromFlag;
CopyMem (&DefaultData.Value, &IfrOneOfOption->Value, IfrOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));
if ((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT) == EFI_IFR_OPTION_DEFAULT) {
DefaultData.DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;
InsertDefaultValue (BlockData, &DefaultData);
- }
+ if (SmallestDefaultId > EFI_HII_DEFAULT_CLASS_STANDARD) {
+ //
+ // Record the SmallestDefaultId and update the SmallestIdFromFlag.
+ //
+ SmallestDefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;
+ SmallestIdFromFlag = TRUE;
+ }
+ }
if ((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT_MFG) == EFI_IFR_OPTION_DEFAULT_MFG) {
DefaultData.DefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;
InsertDefaultValue (BlockData, &DefaultData);
+ if (SmallestDefaultId > EFI_HII_DEFAULT_CLASS_MANUFACTURING) {
+ //
+ // Record the SmallestDefaultId and update the SmallestIdFromFlag.
+ //
+ SmallestDefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;
+ SmallestIdFromFlag = TRUE;
+ }
+ }
+
+ if (SmallestIdFromFlag) {
+ //
+ // When smallest default Id is given by the flag of oneofOption, set this option value for other default Id in the DefaultId list.
+ //
+ DefaultData.Type = DefaultValueFromOtherDefault;
+ //
+ // Set default value for other default id in the DefaultId list.
+ //
+ for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {
+ DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);
+ DefaultData.DefaultId = DefaultDataPtr->DefaultId;
+ InsertDefaultValue (BlockData, &DefaultData);
+ }
}
}
//
// 2. Set as the default value when this is the first option.
@@ -2854,10 +2918,25 @@ ParseIfrData (
// Add DefaultValue into current BlockData
//
InsertDefaultValue (BlockData, &DefaultData);
//
+ // Set default value for other default id in the DefaultId list.
+ //
+ if (SmallestDefaultId >= VarDefaultId) {
+ SmallestDefaultId = VarDefaultId;
+ for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {
+ DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry);
+ if (DefaultDataPtr->DefaultId != DefaultData.DefaultId){
+ DefaultData.Type = DefaultValueFromOtherDefault;
+ DefaultData.DefaultId = DefaultDataPtr->DefaultId;
+ InsertDefaultValue (BlockData, &DefaultData);
+ }
+ }
+ }
+
+ //
// After insert the default value, reset the cleaned value for next
// time used. If not set here, need to set the value before everytime
// use it.
//
DefaultData.Cleaned = FALSE;
@@ -2871,10 +2950,14 @@ ParseIfrData (
if (BlockData->Scope > 0) {
BlockData->Scope--;
}
if (BlockData->Scope == 0) {
BlockData = NULL;
+ //
+ // when finishing parsing a question, clean the SmallestDefaultId of the question.
+ //
+ SmallestDefaultId = 0xFFFF;
}
}
break;
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index d90bc02..d85a804 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -85,10 +85,12 @@ typedef struct {
//
// Get default value from IFR data.
//
typedef enum {
DefaultValueFromDefault = 0, // Get from the minimum or first one when not set default value.
+ DefaultValueFromOtherDefault, // Get default vale from other default when no default(When other
+ // defaults are more than one, use the default with smallest default id).
DefaultValueFromFlag, // Get default value from the defalut flag.
DefaultValueFromOpcode // Get default value from default opcode, highest priority.
} DEFAULT_VALUE_TYPE;
typedef struct {
--
1.9.5.msysgit.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [patch 2/2] MdeModulePkg/Browser: Share default if some default value are not specified
2016-08-05 2:13 [patch 0/2] Share default value if some default value are not specified Dandan Bi
2016-08-05 2:13 ` [patch 1/2] MdeModulePkg/HiiDB: Share default " Dandan Bi
@ 2016-08-05 2:13 ` Dandan Bi
2016-08-08 4:57 ` Gao, Liming
1 sibling, 1 reply; 4+ messages in thread
From: Dandan Bi @ 2016-08-05 2:13 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao, Eric Dong
Add a new implementation policy of getting default in SetupBrowser.
The new policy is only for the situation that a question has default
value but doesn't have default value for all supported default type.
In this case, we will choose the smallest default id from the existing
defaults, and share its value to other default id which has no
default value.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
---
MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 66 +++++++++++++++++++++++++-
MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 5 ++
2 files changed, 70 insertions(+), 1 deletion(-)
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 6b38547..9473eb1 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -4016,10 +4016,50 @@ ValueToOption (
}
return NULL;
}
+/**
+ This function is to get the default Id array, the default ids are in ascending order in the array.
+
+ @param FormSet The form set.
+ @param DefaultIdArray Point to the default Id Array.
+
+ @retval DefaultIdCount Return the default Id number in the array.
+
+**/
+UINT16
+GetDefaultIdArray (
+ IN FORM_BROWSER_FORMSET *FormSet,
+ IN OUT UINT16 *DefaultIdArray
+ )
+{
+ FORMSET_DEFAULTSTORE *DefaultStore;
+ LIST_ENTRY *DefaultLink;
+ UINT16 DefaultIdCount;
+ UINT16 Index;
+
+ DefaultIdCount = 0;
+
+ DefaultLink = GetFirstNode (&FormSet->DefaultStoreListHead);
+ while (!IsNull (&FormSet->DefaultStoreListHead, DefaultLink)) {
+ DefaultStore = FORMSET_DEFAULTSTORE_FROM_LINK(DefaultLink);
+ Index = DefaultIdCount;
+ //
+ // Insert the DefaultId to the Array with ascending order.
+ //
+ while (Index > 0 && DefaultStore->DefaultId < DefaultIdArray[Index - 1]) {
+ DefaultIdArray[Index] = DefaultIdArray[Index -1];
+ Index--;
+ }
+ DefaultIdArray[Index] = DefaultStore->DefaultId;
+ DefaultLink = GetNextNode (&FormSet->DefaultStoreListHead, DefaultLink);
+ DefaultIdCount++;
+ }
+
+ return DefaultIdCount;
+}
/**
Reset Question to its default value.
@param FormSet The form set.
@@ -4048,29 +4088,38 @@ GetQuestionDefault (
EFI_HII_CONFIG_ACCESS_PROTOCOL *ConfigAccess;
EFI_BROWSER_ACTION_REQUEST ActionRequest;
INTN Action;
CHAR16 *NewString;
EFI_IFR_TYPE_VALUE *TypeValue;
+ UINT16 DefaultIdNumber;
+ UINT16 DefaultIdArray[EFI_HII_MAX_SUPPORT_DEFAULT_TYPE];
+ UINT16 ReGetCount;
+ UINT16 OriginalDefaultId;
Status = EFI_NOT_FOUND;
StrValue = NULL;
+ ReGetCount = 0;
+ OriginalDefaultId = DefaultId;
//
// Statement don't have storage, skip them
//
if (Question->QuestionId == 0) {
return Status;
}
+ DefaultIdNumber = GetDefaultIdArray (FormSet, DefaultIdArray);
+
//
// There are Five ways to specify default value for a Question:
// 1, use call back function (highest priority)
// 2, use ExtractConfig function
// 3, use nested EFI_IFR_DEFAULT
// 4, set flags of EFI_ONE_OF_OPTION (provide Standard and Manufacturing default)
// 5, set flags of EFI_IFR_CHECKBOX (provide Standard and Manufacturing default) (lowest priority)
//
+ReGetDefault:
HiiValue = &Question->HiiValue;
TypeValue = &HiiValue->Value;
if (HiiValue->Type == EFI_IFR_TYPE_BUFFER) {
//
// For orderedlist, need to pass the BufferValue to Callback function.
@@ -4233,11 +4282,26 @@ GetQuestionDefault (
return EFI_SUCCESS;
}
}
//
- // For Questions without default
+ // For question without default value for current default Id, we try to re-get the default value form other default id in the DefaultIdArray.
+ // If get, will exit the function, if not, will choose next default id in the DefaultIdArray.
+ // The default id in DefaultIdArray are in ascending order to make sure choose the smallest default id every time.
+ //
+ while (ReGetCount < DefaultIdNumber) {
+ DefaultId = DefaultIdArray[ReGetCount];
+ if (DefaultId == OriginalDefaultId) {
+ ReGetCount ++;
+ continue;
+ }
+ ReGetCount ++;
+ goto ReGetDefault;
+ }
+
+ //
+ // For Questions without default value for all the default id in the DefaultIdArray.
//
Status = EFI_NOT_FOUND;
switch (Question->Operand) {
case EFI_IFR_NUMERIC_OP:
//
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index cbc5401..21f392c 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -61,10 +61,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define UI_ACTION_REFRESH_FORM 1
#define UI_ACTION_REFRESH_FORMSET 2
#define UI_ACTION_EXIT 3
//
+// The maximum number of default type
+//
+#define EFI_HII_MAX_SUPPORT_DEFAULT_TYPE 0x08
+
+//
//
// Time definitions
//
#define ONE_SECOND 10000000
--
1.9.5.msysgit.1
^ permalink raw reply related [flat|nested] 4+ messages in thread