tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enhance the logic when extract data from storage. 

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@13301 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10 2012-05-10 08:00:22 +00:00
parent 7ce960e712
commit 7412cb4d91
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
View File

@ -3,7 +3,7 @@
by HII Thunk Modules. These Config access Protocols are used to thunk UEFI Config by HII Thunk Modules. These Config access Protocols are used to thunk UEFI Config
Access Callback to Framework HII Callback and EFI Variable Set/Get operations. Access Callback to Framework HII Callback and EFI Variable Set/Get operations.
Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -74,9 +74,12 @@ GetFirstStorageOfFormSet (
StorageList = GetFirstNode (&FormSet->StorageListHead); StorageList = GetFirstNode (&FormSet->StorageListHead);
if (!IsNull (&FormSet->StorageListHead, StorageList)) { while (!IsNull (&FormSet->StorageListHead, StorageList)) {
Storage = FORMSET_STORAGE_FROM_LINK (StorageList); Storage = FORMSET_STORAGE_FROM_LINK (StorageList);
return Storage; if (Storage->Type == EFI_HII_VARSTORE_BUFFER) {
return Storage;
}
StorageList = GetNextNode (&FormSet->StorageListHead, StorageList);
} }
return NULL; return NULL;
@ -155,6 +158,10 @@ GetStorageFromConfigString (
while (!IsNull (&FormSet->StorageListHead, StorageList)) { while (!IsNull (&FormSet->StorageListHead, StorageList)) {
Storage = FORMSET_STORAGE_FROM_LINK (StorageList); Storage = FORMSET_STORAGE_FROM_LINK (StorageList);
StorageList = GetNextNode (&FormSet->StorageListHead, StorageList);
if (Storage->Type != EFI_HII_VARSTORE_BUFFER) {
continue;
}
if ((Storage->VarStoreId == FormSet->DefaultVarStoreId) && (FormSet->OriginalDefaultVarStoreName != NULL)) { if ((Storage->VarStoreId == FormSet->DefaultVarStoreId) && (FormSet->OriginalDefaultVarStoreName != NULL)) {
Name = FormSet->OriginalDefaultVarStoreName; Name = FormSet->OriginalDefaultVarStoreName;
@ -165,8 +172,6 @@ GetStorageFromConfigString (
if (HiiIsConfigHdrMatch (ConfigString, &Storage->Guid, Name)) { if (HiiIsConfigHdrMatch (ConfigString, &Storage->Guid, Name)) {
return Storage; return Storage;
} }
StorageList = GetNextNode (&FormSet->StorageListHead, StorageList);
} }
return NULL; return NULL;
@ -474,6 +479,12 @@ ThunkExtractConfig (
} }
BufferStorage = FORMSET_STORAGE_FROM_LINK (StorageList); BufferStorage = FORMSET_STORAGE_FROM_LINK (StorageList);
StorageList = GetNextNode (&FormSetContext->StorageListHead, StorageList); StorageList = GetNextNode (&FormSetContext->StorageListHead, StorageList);
if (BufferStorage->Type != EFI_HII_VARSTORE_BUFFER) {
//
// BufferStorage type should be EFI_HII_VARSTORE_BUFFER
//
continue;
}
} }
VarStoreName = NULL; VarStoreName = NULL;