tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refine the logic about initialize questions value

Browse Source 
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13443 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10 2012-06-12 03:27:45 +00:00
parent 856d643816
commit 3347d410cc
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
View File

@ -2974,6 +2974,7 @@ GetQuestionDefault (
@param Form Form data structure. @param Form Form data structure.
@param DefaultId The Class of the default. @param DefaultId The Class of the default.
@param SettingScope Setting Scope for Default action. @param SettingScope Setting Scope for Default action.
@param Storage Get default value only for this storage.
@retval EFI_SUCCESS The function completed successfully. @retval EFI_SUCCESS The function completed successfully.
@retval EFI_UNSUPPORTED Unsupport SettingScope. @retval EFI_UNSUPPORTED Unsupport SettingScope.
@ -2984,7 +2985,8 @@ ExtractDefault (
IN FORM_BROWSER_FORMSET *FormSet, IN FORM_BROWSER_FORMSET *FormSet,
IN FORM_BROWSER_FORM *Form, IN FORM_BROWSER_FORM *Form,
IN UINT16 DefaultId, IN UINT16 DefaultId,
IN BROWSER_SETTING_SCOPE SettingScope IN BROWSER_SETTING_SCOPE SettingScope,
IN FORMSET_STORAGE *Storage OPTIONAL
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
@ -3013,6 +3015,13 @@ ExtractDefault (
Question = FORM_BROWSER_STATEMENT_FROM_LINK (Link); Question = FORM_BROWSER_STATEMENT_FROM_LINK (Link);
Link = GetNextNode (&Form->StatementListHead, Link); Link = GetNextNode (&Form->StatementListHead, Link);
//
// If get default value only for this storage, check the storage first.
//
if ((Storage != NULL) && (Question->Storage != Storage)) {
continue;
}
// //
// If Question is disabled, don't reset it to default // If Question is disabled, don't reset it to default
// //
@ -3046,7 +3055,7 @@ ExtractDefault (
FormLink = GetFirstNode (&FormSet->FormListHead); FormLink = GetFirstNode (&FormSet->FormListHead);
while (!IsNull (&FormSet->FormListHead, FormLink)) { while (!IsNull (&FormSet->FormListHead, FormLink)) {
Form = FORM_BROWSER_FORM_FROM_LINK (FormLink); Form = FORM_BROWSER_FORM_FROM_LINK (FormLink);
ExtractDefault (FormSet, Form, DefaultId, FormLevel); ExtractDefault (FormSet, Form, DefaultId, FormLevel, Storage);
FormLink = GetNextNode (&FormSet->FormListHead, FormLink); FormLink = GetNextNode (&FormSet->FormListHead, FormLink);
} }
} else if (SettingScope == SystemLevel) { } else if (SettingScope == SystemLevel) {
@ -3117,7 +3126,7 @@ ExtractDefault (
Link = GetFirstNode (&gBrowserFormSetList); Link = GetFirstNode (&gBrowserFormSetList);
while (!IsNull (&gBrowserFormSetList, Link)) { while (!IsNull (&gBrowserFormSetList, Link)) {
LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link); LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link);
ExtractDefault (LocalFormSet, NULL, DefaultId, FormSetLevel); ExtractDefault (LocalFormSet, NULL, DefaultId, FormSetLevel, Storage);
Link = GetNextNode (&gBrowserFormSetList, Link); Link = GetNextNode (&gBrowserFormSetList, Link);
} }
} }
@ -3402,12 +3411,6 @@ InitializeCurrentSetting (
FORM_BROWSER_FORM *Form2; FORM_BROWSER_FORM *Form2;
EFI_STATUS Status; EFI_STATUS Status;
//
// Extract default from IFR binary
//
ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel);
UpdateNvInfoInForm (FormSet, FALSE);
// //
// Request current settings from Configuration Driver // Request current settings from Configuration Driver
// //
@ -3438,13 +3441,24 @@ InitializeCurrentSetting (
// Storage is not found in backup formset, request it from ConfigDriver // Storage is not found in backup formset, request it from ConfigDriver
// //
Status = LoadStorage (FormSet, Storage); Status = LoadStorage (FormSet, Storage);
if (EFI_ERROR (Status)) {
// //
// Now Edit Buffer is filled with default values(lower priority) and current // If get last time changed value failed, extract default from IFR binary
//
ExtractDefault (FormSet, NULL, EFI_HII_DEFAULT_CLASS_STANDARD, FormSetLevel, Storage);
//
// ExtractDefault will set the NV flag to TRUE, so need this function to clean the flag
// in current situation.
//
UpdateNvInfoInForm (FormSet, FALSE);
}
//
// Now Edit Buffer is filled with default values(lower priority) or current
// settings(higher priority), sychronize it to shadow Buffer // settings(higher priority), sychronize it to shadow Buffer
// //
if (!EFI_ERROR (Status)) {
SynchronizeStorage (Storage, TRUE); SynchronizeStorage (Storage, TRUE);
}
} else { } else {
// //
// Storage found in backup formset, use it // Storage found in backup formset, use it

4
MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
View File

@ -1067,6 +1067,7 @@ InitializeFormSet (
@param Form Form data structure. @param Form Form data structure.
@param DefaultId The Class of the default. @param DefaultId The Class of the default.
@param SettingScope Setting Scope for Default action. @param SettingScope Setting Scope for Default action.
@param Storage Get default value only for this storage.
@retval EFI_SUCCESS The function completed successfully. @retval EFI_SUCCESS The function completed successfully.
@retval EFI_UNSUPPORTED Unsupport SettingScope. @retval EFI_UNSUPPORTED Unsupport SettingScope.
@ -1077,7 +1078,8 @@ ExtractDefault (
IN FORM_BROWSER_FORMSET *FormSet, IN FORM_BROWSER_FORMSET *FormSet,
IN FORM_BROWSER_FORM *Form, IN FORM_BROWSER_FORM *Form,
IN UINT16 DefaultId, IN UINT16 DefaultId,
IN BROWSER_SETTING_SCOPE SettingScope IN BROWSER_SETTING_SCOPE SettingScope,
IN FORMSET_STORAGE *Storage OPTIONAL
); );
/** /**

4
MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
View File

@ -3787,7 +3787,7 @@ UiDisplayMenu (
// Reterieve default setting. After it. NV flag will be showed. // Reterieve default setting. After it. NV flag will be showed.
// //
if ((HotKey->Action & BROWSER_ACTION_DEFAULT) == BROWSER_ACTION_DEFAULT) { if ((HotKey->Action & BROWSER_ACTION_DEFAULT) == BROWSER_ACTION_DEFAULT) {
Status = ExtractDefault (Selection->FormSet, Selection->Form, HotKey->DefaultId, gBrowserSettingScope); Status = ExtractDefault (Selection->FormSet, Selection->Form, HotKey->DefaultId, gBrowserSettingScope, NULL);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
Selection->Action = UI_ACTION_REFRESH_FORM; Selection->Action = UI_ACTION_REFRESH_FORM;
Selection->Statement = NULL; Selection->Statement = NULL;
@ -3865,7 +3865,7 @@ UiDisplayMenu (
// //
// Reset to default value for all forms in the whole system. // Reset to default value for all forms in the whole system.
// //
Status = ExtractDefault (Selection->FormSet, NULL, DefaultId, FormSetLevel); Status = ExtractDefault (Selection->FormSet, NULL, DefaultId, FormSetLevel, NULL);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
Selection->Action = UI_ACTION_REFRESH_FORM; Selection->Action = UI_ACTION_REFRESH_FORM;