\r
#include "Setup.h"\r
\r
-UINTN mStatementIndex;\r
-UINTN mExpressionOpCodeIndex;\r
-EFI_QUESTION_ID mUsedQuestionId;\r
-extern LIST_ENTRY gBrowserStorageList;\r
+UINTN mStatementIndex;\r
+UINTN mExpressionOpCodeIndex;\r
+EFI_QUESTION_ID mUsedQuestionId;\r
+extern LIST_ENTRY gBrowserStorageList;\r
+\r
/**\r
Initialize Statement header members.\r
\r
**/\r
FORM_BROWSER_STATEMENT *\r
CreateStatement (\r
- IN UINT8 *OpCodeData,\r
- IN OUT FORM_BROWSER_FORMSET *FormSet,\r
- IN OUT FORM_BROWSER_FORM *Form\r
+ IN UINT8 *OpCodeData,\r
+ IN OUT FORM_BROWSER_FORMSET *FormSet,\r
+ IN OUT FORM_BROWSER_FORM *Form\r
)\r
{\r
FORM_BROWSER_STATEMENT *Statement;\r
//\r
// Only guid op may out side the form level.\r
//\r
- ASSERT (((EFI_IFR_OP_HEADER *) OpCodeData)->OpCode == EFI_IFR_GUID_OP);\r
+ ASSERT (((EFI_IFR_OP_HEADER *)OpCodeData)->OpCode == EFI_IFR_GUID_OP);\r
}\r
\r
Statement = &FormSet->StatementBuffer[mStatementIndex];\r
\r
Statement->Signature = FORM_BROWSER_STATEMENT_SIGNATURE;\r
\r
- Statement->Operand = ((EFI_IFR_OP_HEADER *) OpCodeData)->OpCode;\r
- Statement->OpCode = (EFI_IFR_OP_HEADER *) OpCodeData;\r
+ Statement->Operand = ((EFI_IFR_OP_HEADER *)OpCodeData)->OpCode;\r
+ Statement->OpCode = (EFI_IFR_OP_HEADER *)OpCodeData;\r
Statement->QuestionReferToBitField = FALSE;\r
\r
- StatementHdr = (EFI_IFR_STATEMENT_HEADER *) (OpCodeData + sizeof (EFI_IFR_OP_HEADER));\r
+ StatementHdr = (EFI_IFR_STATEMENT_HEADER *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER));\r
CopyMem (&Statement->Prompt, &StatementHdr->Prompt, sizeof (EFI_STRING_ID));\r
CopyMem (&Statement->Help, &StatementHdr->Help, sizeof (EFI_STRING_ID));\r
\r
- ConditionalExprCount = GetConditionalExpressionCount(ExpressStatement);\r
+ ConditionalExprCount = GetConditionalExpressionCount (ExpressStatement);\r
if (ConditionalExprCount > 0) {\r
//\r
// Form is inside of suppressif\r
//\r
\r
- Statement->Expression = (FORM_EXPRESSION_LIST *) AllocatePool(\r
- (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
+ Statement->Expression = (FORM_EXPRESSION_LIST *)AllocatePool (\r
+ (UINTN)(sizeof (FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof (FORM_EXPRESSION *)))\r
+ );\r
ASSERT (Statement->Expression != NULL);\r
- Statement->Expression->Count = (UINTN) ConditionalExprCount;\r
+ Statement->Expression->Count = (UINTN)ConditionalExprCount;\r
Statement->Expression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
- CopyMem (Statement->Expression->Expression, GetConditionalExpressionList(ExpressStatement), (UINTN) (sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
+ CopyMem (Statement->Expression->Expression, GetConditionalExpressionList (ExpressStatement), (UINTN)(sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
}\r
\r
//\r
} else {\r
InsertTailList (&Form->StatementListHead, &Statement->Link);\r
}\r
+\r
return Statement;\r
}\r
\r
**/\r
FORM_BROWSER_STATEMENT *\r
CreateQuestion (\r
- IN UINT8 *OpCodeData,\r
- IN OUT FORM_BROWSER_FORMSET *FormSet,\r
- IN OUT FORM_BROWSER_FORM *Form\r
+ IN UINT8 *OpCodeData,\r
+ IN OUT FORM_BROWSER_FORMSET *FormSet,\r
+ IN OUT FORM_BROWSER_FORM *Form\r
)\r
{\r
FORM_BROWSER_STATEMENT *Statement;\r
return NULL;\r
}\r
\r
- QuestionHdr = (EFI_IFR_QUESTION_HEADER *) (OpCodeData + sizeof (EFI_IFR_OP_HEADER));\r
+ QuestionHdr = (EFI_IFR_QUESTION_HEADER *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER));\r
CopyMem (&Statement->QuestionId, &QuestionHdr->QuestionId, sizeof (EFI_QUESTION_ID));\r
CopyMem (&Statement->VarStoreId, &QuestionHdr->VarStoreId, sizeof (EFI_VARSTORE_ID));\r
CopyMem (&Statement->VarStoreInfo.VarOffset, &QuestionHdr->VarStoreInfo.VarOffset, sizeof (UINT16));\r
\r
Link = GetNextNode (&FormSet->StorageListHead, Link);\r
}\r
+\r
ASSERT (Statement->Storage != NULL);\r
\r
//\r
// Initialilze varname for Name/Value or EFI Variable\r
//\r
if ((Statement->Storage->Type == EFI_HII_VARSTORE_NAME_VALUE) ||\r
- (Statement->Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE)) {\r
+ (Statement->Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE))\r
+ {\r
Statement->VariableName = GetToken (Statement->VarStoreInfo.VarName, FormSet->HiiHandle);\r
ASSERT (Statement->VariableName != NULL);\r
\r
// Check whether old string node already exist.\r
//\r
Find = FALSE;\r
- if (!IsListEmpty(&Statement->Storage->NameValueListHead)) {\r
+ if (!IsListEmpty (&Statement->Storage->NameValueListHead)) {\r
Link = GetFirstNode (&Statement->Storage->NameValueListHead);\r
while (!IsNull (&Statement->Storage->NameValueListHead, Link)) {\r
NameValueNode = NAME_VALUE_NODE_FROM_LINK (Link);\r
NameValueNode = AllocateZeroPool (sizeof (NAME_VALUE_NODE));\r
ASSERT (NameValueNode != NULL);\r
NameValueNode->Signature = NAME_VALUE_NODE_SIGNATURE;\r
- NameValueNode->Name = AllocateCopyPool (StrSize (Statement->VariableName), Statement->VariableName);\r
+ NameValueNode->Name = AllocateCopyPool (StrSize (Statement->VariableName), Statement->VariableName);\r
ASSERT (NameValueNode->Name != NULL);\r
NameValueNode->Value = AllocateZeroPool (0x10);\r
ASSERT (NameValueNode->Value != NULL);\r
return Statement;\r
}\r
\r
-\r
/**\r
Allocate a FORM_EXPRESSION node.\r
\r
**/\r
FORM_EXPRESSION *\r
CreateExpression (\r
- IN OUT FORM_BROWSER_FORM *Form,\r
- IN UINT8 *OpCode\r
+ IN OUT FORM_BROWSER_FORM *Form,\r
+ IN UINT8 *OpCode\r
)\r
{\r
FORM_EXPRESSION *Expression;\r
ASSERT (Expression != NULL);\r
Expression->Signature = FORM_EXPRESSION_SIGNATURE;\r
InitializeListHead (&Expression->OpCodeListHead);\r
- Expression->OpCode = (EFI_IFR_OP_HEADER *) OpCode;\r
+ Expression->OpCode = (EFI_IFR_OP_HEADER *)OpCode;\r
\r
return Expression;\r
}\r
IN OUT FORMSET_STORAGE *Storage\r
)\r
{\r
- CHAR16 *Name;\r
+ CHAR16 *Name;\r
\r
- if (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER ||\r
- Storage->BrowserStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
+ if ((Storage->BrowserStorage->Type == EFI_HII_VARSTORE_BUFFER) ||\r
+ (Storage->BrowserStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER))\r
+ {\r
Name = Storage->BrowserStorage->Name;\r
} else {\r
Name = NULL;\r
**/\r
BROWSER_STORAGE *\r
FindStorageInList (\r
- IN UINT8 StorageType,\r
- IN EFI_GUID *StorageGuid,\r
- IN CHAR16 *StorageName,\r
- IN EFI_HII_HANDLE HiiHandle\r
+ IN UINT8 StorageType,\r
+ IN EFI_GUID *StorageGuid,\r
+ IN CHAR16 *StorageName,\r
+ IN EFI_HII_HANDLE HiiHandle\r
)\r
{\r
LIST_ENTRY *Link;\r
BROWSER_STORAGE *BrowserStorage;\r
\r
- Link = GetFirstNode (&gBrowserStorageList);\r
+ Link = GetFirstNode (&gBrowserStorageList);\r
while (!IsNull (&gBrowserStorageList, Link)) {\r
BrowserStorage = BROWSER_STORAGE_FROM_LINK (Link);\r
- Link = GetNextNode (&gBrowserStorageList, Link);\r
+ Link = GetNextNode (&gBrowserStorageList, Link);\r
\r
if ((BrowserStorage->Type == StorageType) && CompareGuid (&BrowserStorage->Guid, StorageGuid)) {\r
if (StorageType == EFI_HII_VARSTORE_NAME_VALUE) {\r
\r
ASSERT (StorageName != NULL);\r
if (StrCmp (BrowserStorage->Name, StorageName) == 0) {\r
- if (StorageType == EFI_HII_VARSTORE_EFI_VARIABLE || StorageType == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
+ if ((StorageType == EFI_HII_VARSTORE_EFI_VARIABLE) || (StorageType == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER)) {\r
return BrowserStorage;\r
- } else if (StorageType == EFI_HII_VARSTORE_BUFFER && BrowserStorage->HiiHandle == HiiHandle) {\r
+ } else if ((StorageType == EFI_HII_VARSTORE_BUFFER) && (BrowserStorage->HiiHandle == HiiHandle)) {\r
return BrowserStorage;\r
}\r
}\r
**/\r
VOID\r
IntializeBrowserStorage (\r
- IN BROWSER_STORAGE *BrowserStorage,\r
- IN UINT8 StorageType,\r
- IN UINT8 *OpCodeData\r
+ IN BROWSER_STORAGE *BrowserStorage,\r
+ IN UINT8 StorageType,\r
+ IN UINT8 *OpCodeData\r
)\r
{\r
switch (StorageType) {\r
case EFI_HII_VARSTORE_BUFFER:\r
- CopyMem (&BrowserStorage->Guid, &((EFI_IFR_VARSTORE *) OpCodeData)->Guid, sizeof (EFI_GUID));\r
- CopyMem (&BrowserStorage->Size, &((EFI_IFR_VARSTORE *) OpCodeData)->Size, sizeof (UINT16));\r
+ CopyMem (&BrowserStorage->Guid, &((EFI_IFR_VARSTORE *)OpCodeData)->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&BrowserStorage->Size, &((EFI_IFR_VARSTORE *)OpCodeData)->Size, sizeof (UINT16));\r
\r
BrowserStorage->Buffer = AllocateZeroPool (BrowserStorage->Size);\r
BrowserStorage->EditBuffer = AllocateZeroPool (BrowserStorage->Size);\r
\r
case EFI_HII_VARSTORE_EFI_VARIABLE:\r
case EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER:\r
- CopyMem (&BrowserStorage->Guid, &((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Guid, sizeof (EFI_GUID));\r
- CopyMem (&BrowserStorage->Attributes, &((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Attributes, sizeof (UINT32));\r
- CopyMem (&BrowserStorage->Size, &((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Size, sizeof (UINT16));\r
+ CopyMem (&BrowserStorage->Guid, &((EFI_IFR_VARSTORE_EFI *)OpCodeData)->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&BrowserStorage->Attributes, &((EFI_IFR_VARSTORE_EFI *)OpCodeData)->Attributes, sizeof (UINT32));\r
+ CopyMem (&BrowserStorage->Size, &((EFI_IFR_VARSTORE_EFI *)OpCodeData)->Size, sizeof (UINT16));\r
\r
if (StorageType == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
BrowserStorage->Buffer = AllocateZeroPool (BrowserStorage->Size);\r
BrowserStorage->EditBuffer = AllocateZeroPool (BrowserStorage->Size);\r
}\r
+\r
break;\r
\r
case EFI_HII_VARSTORE_NAME_VALUE:\r
- CopyMem (&BrowserStorage->Guid, &((EFI_IFR_VARSTORE_NAME_VALUE *) OpCodeData)->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&BrowserStorage->Guid, &((EFI_IFR_VARSTORE_NAME_VALUE *)OpCodeData)->Guid, sizeof (EFI_GUID));\r
\r
InitializeListHead (&BrowserStorage->NameValueListHead);\r
break;\r
}\r
}\r
\r
-\r
/**\r
Allocate a FORMSET_STORAGE data structure and insert to FormSet Storage List.\r
\r
IN UINT8 *OpCodeData\r
)\r
{\r
- FORMSET_STORAGE *Storage;\r
- CHAR16 *UnicodeString;\r
- UINT16 Index;\r
- BROWSER_STORAGE *BrowserStorage;\r
- EFI_GUID *StorageGuid;\r
- CHAR8 *StorageName;\r
+ FORMSET_STORAGE *Storage;\r
+ CHAR16 *UnicodeString;\r
+ UINT16 Index;\r
+ BROWSER_STORAGE *BrowserStorage;\r
+ EFI_GUID *StorageGuid;\r
+ CHAR8 *StorageName;\r
\r
UnicodeString = NULL;\r
StorageName = NULL;\r
switch (StorageType) {\r
case EFI_HII_VARSTORE_BUFFER:\r
- StorageGuid = (EFI_GUID *) (CHAR8*) &((EFI_IFR_VARSTORE *) OpCodeData)->Guid;\r
- StorageName = (CHAR8 *) ((EFI_IFR_VARSTORE *) OpCodeData)->Name;\r
+ StorageGuid = (EFI_GUID *)(CHAR8 *)&((EFI_IFR_VARSTORE *)OpCodeData)->Guid;\r
+ StorageName = (CHAR8 *)((EFI_IFR_VARSTORE *)OpCodeData)->Name;\r
break;\r
\r
case EFI_HII_VARSTORE_EFI_VARIABLE:\r
case EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER:\r
- StorageGuid = (EFI_GUID *) (CHAR8*) &((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Guid;\r
- StorageName = (CHAR8 *) ((EFI_IFR_VARSTORE_EFI *) OpCodeData)->Name;\r
+ StorageGuid = (EFI_GUID *)(CHAR8 *)&((EFI_IFR_VARSTORE_EFI *)OpCodeData)->Guid;\r
+ StorageName = (CHAR8 *)((EFI_IFR_VARSTORE_EFI *)OpCodeData)->Name;\r
break;\r
\r
default:\r
ASSERT (StorageType == EFI_HII_VARSTORE_NAME_VALUE);\r
- StorageGuid = &((EFI_IFR_VARSTORE_NAME_VALUE *) OpCodeData)->Guid;\r
+ StorageGuid = &((EFI_IFR_VARSTORE_NAME_VALUE *)OpCodeData)->Guid;\r
break;\r
}\r
\r
UnicodeString = AllocateZeroPool (AsciiStrSize (StorageName) * 2);\r
ASSERT (UnicodeString != NULL);\r
for (Index = 0; StorageName[Index] != 0; Index++) {\r
- UnicodeString[Index] = (CHAR16) StorageName[Index];\r
+ UnicodeString[Index] = (CHAR16)StorageName[Index];\r
}\r
}\r
\r
Storage->Signature = FORMSET_STORAGE_SIGNATURE;\r
InsertTailList (&FormSet->StorageListHead, &Storage->Link);\r
\r
- BrowserStorage = FindStorageInList(StorageType, StorageGuid, UnicodeString, FormSet->HiiHandle);\r
+ BrowserStorage = FindStorageInList (StorageType, StorageGuid, UnicodeString, FormSet->HiiHandle);\r
if (BrowserStorage == NULL) {\r
BrowserStorage = AllocateZeroPool (sizeof (BROWSER_STORAGE));\r
ASSERT (BrowserStorage != NULL);\r
Storage->BrowserStorage = BrowserStorage;\r
InitializeConfigHdr (FormSet, Storage);\r
Storage->ConfigRequest = AllocateCopyPool (StrSize (Storage->ConfigHdr), Storage->ConfigHdr);\r
- Storage->SpareStrLen = 0;\r
+ Storage->SpareStrLen = 0;\r
\r
return Storage;\r
}\r
LIST_ENTRY *Link;\r
BOOLEAN Found;\r
\r
- Found = FALSE;\r
+ Found = FALSE;\r
FormsetStorage = NULL;\r
//\r
// Find Formset Storage for this Question\r
**/\r
FORMSET_STORAGE *\r
GetFstStgFromBrsStg (\r
- IN BROWSER_STORAGE *Storage\r
+ IN BROWSER_STORAGE *Storage\r
)\r
{\r
- FORMSET_STORAGE *FormsetStorage;\r
- LIST_ENTRY *Link;\r
- LIST_ENTRY *FormsetLink;\r
- FORM_BROWSER_FORMSET *FormSet;\r
- BOOLEAN Found;\r
+ FORMSET_STORAGE *FormsetStorage;\r
+ LIST_ENTRY *Link;\r
+ LIST_ENTRY *FormsetLink;\r
+ FORM_BROWSER_FORMSET *FormSet;\r
+ BOOLEAN Found;\r
\r
- Found = FALSE;\r
+ Found = FALSE;\r
FormsetStorage = NULL;\r
\r
FormsetLink = GetFirstNode (&gBrowserFormSetList);\r
while (!IsNull (&gBrowserFormSetList, FormsetLink)) {\r
- FormSet = FORM_BROWSER_FORMSET_FROM_LINK (FormsetLink);\r
+ FormSet = FORM_BROWSER_FORMSET_FROM_LINK (FormsetLink);\r
FormsetLink = GetNextNode (&gBrowserFormSetList, FormsetLink);\r
\r
Link = GetFirstNode (&FormSet->StorageListHead);\r
while (!IsNull (&FormSet->StorageListHead, Link)) {\r
FormsetStorage = FORMSET_STORAGE_FROM_LINK (Link);\r
- Link = GetNextNode (&FormSet->StorageListHead, Link);\r
+ Link = GetNextNode (&FormSet->StorageListHead, Link);\r
\r
if (FormsetStorage->BrowserStorage == Storage) {\r
Found = TRUE;\r
**/\r
EFI_STATUS\r
InitializeRequestElement (\r
- IN OUT FORM_BROWSER_FORMSET *FormSet,\r
- IN OUT FORM_BROWSER_STATEMENT *Question,\r
- IN OUT FORM_BROWSER_FORM *Form\r
+ IN OUT FORM_BROWSER_FORMSET *FormSet,\r
+ IN OUT FORM_BROWSER_STATEMENT *Question,\r
+ IN OUT FORM_BROWSER_FORM *Form\r
)\r
{\r
- BROWSER_STORAGE *Storage;\r
- FORMSET_STORAGE *FormsetStorage;\r
- UINTN StrLen;\r
- UINTN StringSize;\r
- CHAR16 *NewStr;\r
- CHAR16 RequestElement[30];\r
- LIST_ENTRY *Link;\r
- BOOLEAN Find;\r
+ BROWSER_STORAGE *Storage;\r
+ FORMSET_STORAGE *FormsetStorage;\r
+ UINTN StrLen;\r
+ UINTN StringSize;\r
+ CHAR16 *NewStr;\r
+ CHAR16 RequestElement[30];\r
+ LIST_ENTRY *Link;\r
+ BOOLEAN Find;\r
FORM_BROWSER_CONFIG_REQUEST *ConfigInfo;\r
- UINTN MaxLen;\r
+ UINTN MaxLen;\r
\r
Storage = Question->Storage;\r
if (Storage == NULL) {\r
//\r
// Prepare <RequestElement>\r
//\r
- if (Storage->Type == EFI_HII_VARSTORE_BUFFER ||\r
- Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER) {\r
+ if ((Storage->Type == EFI_HII_VARSTORE_BUFFER) ||\r
+ (Storage->Type == EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER))\r
+ {\r
StrLen = UnicodeSPrint (\r
RequestElement,\r
30 * sizeof (CHAR16),\r
Question->VarStoreInfo.VarOffset,\r
Question->StorageWidth\r
);\r
- HiiToLower(RequestElement);\r
+ HiiToLower (RequestElement);\r
Question->BlockName = AllocateCopyPool ((StrLen + 1) * sizeof (CHAR16), RequestElement);\r
} else {\r
StrLen = UnicodeSPrint (RequestElement, 30 * sizeof (CHAR16), L"&%s", Question->VariableName);\r
//\r
// Find Formset Storage for this Question\r
//\r
- FormsetStorage = GetFstStgFromVarId(FormSet, Question->VarStoreId);\r
+ FormsetStorage = GetFstStgFromVarId (FormSet, Question->VarStoreId);\r
ASSERT (FormsetStorage != NULL);\r
StringSize = (FormsetStorage->ConfigRequest != NULL) ? StrSize (FormsetStorage->ConfigRequest) : sizeof (CHAR16);\r
- MaxLen = StringSize / sizeof (CHAR16) + FormsetStorage->SpareStrLen;\r
+ MaxLen = StringSize / sizeof (CHAR16) + FormsetStorage->SpareStrLen;\r
\r
//\r
// Append <RequestElement> to <ConfigRequest>\r
CopyMem (NewStr, FormsetStorage->ConfigRequest, StringSize);\r
FreePool (FormsetStorage->ConfigRequest);\r
}\r
+\r
FormsetStorage->ConfigRequest = NewStr;\r
FormsetStorage->SpareStrLen = CONFIG_REQUEST_STRING_INCREMENTAL;\r
}\r
//\r
ConfigInfo = NULL;\r
Find = FALSE;\r
- Link = GetFirstNode (&Form->ConfigRequestHead);\r
+ Link = GetFirstNode (&Form->ConfigRequestHead);\r
while (!IsNull (&Form->ConfigRequestHead, Link)) {\r
ConfigInfo = FORM_BROWSER_CONFIG_REQUEST_FROM_LINK (Link);\r
\r
- if (ConfigInfo != NULL && ConfigInfo->Storage == FormsetStorage->BrowserStorage) {\r
+ if ((ConfigInfo != NULL) && (ConfigInfo->Storage == FormsetStorage->BrowserStorage)) {\r
Find = TRUE;\r
break;\r
}\r
}\r
\r
if (!Find) {\r
- ConfigInfo = AllocateZeroPool(sizeof (FORM_BROWSER_CONFIG_REQUEST));\r
+ ConfigInfo = AllocateZeroPool (sizeof (FORM_BROWSER_CONFIG_REQUEST));\r
ASSERT (ConfigInfo != NULL);\r
ConfigInfo->Signature = FORM_BROWSER_CONFIG_REQUEST_SIGNATURE;\r
ConfigInfo->ConfigRequest = AllocateCopyPool (StrSize (FormsetStorage->ConfigHdr), FormsetStorage->ConfigHdr);\r
ASSERT (ConfigInfo->ConfigRequest != NULL);\r
- ConfigInfo->SpareStrLen = 0;\r
- ConfigInfo->Storage = FormsetStorage->BrowserStorage;\r
- InsertTailList(&Form->ConfigRequestHead, &ConfigInfo->Link);\r
+ ConfigInfo->SpareStrLen = 0;\r
+ ConfigInfo->Storage = FormsetStorage->BrowserStorage;\r
+ InsertTailList (&Form->ConfigRequestHead, &ConfigInfo->Link);\r
}\r
+\r
StringSize = (ConfigInfo->ConfigRequest != NULL) ? StrSize (ConfigInfo->ConfigRequest) : sizeof (CHAR16);\r
- MaxLen = StringSize / sizeof (CHAR16) + ConfigInfo->SpareStrLen;\r
+ MaxLen = StringSize / sizeof (CHAR16) + ConfigInfo->SpareStrLen;\r
\r
//\r
// Append <RequestElement> to <ConfigRequest>\r
CopyMem (NewStr, ConfigInfo->ConfigRequest, StringSize);\r
FreePool (ConfigInfo->ConfigRequest);\r
}\r
+\r
ConfigInfo->ConfigRequest = NewStr;\r
ConfigInfo->SpareStrLen = CONFIG_REQUEST_STRING_INCREMENTAL;\r
}\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Free resources of a Expression.\r
\r
**/\r
VOID\r
DestroyExpression (\r
- IN FORM_EXPRESSION *Expression\r
+ IN FORM_EXPRESSION *Expression\r
)\r
{\r
LIST_ENTRY *Link;\r
FORM_EXPRESSION *SubExpression;\r
\r
while (!IsListEmpty (&Expression->OpCodeListHead)) {\r
- Link = GetFirstNode (&Expression->OpCodeListHead);\r
+ Link = GetFirstNode (&Expression->OpCodeListHead);\r
OpCode = EXPRESSION_OPCODE_FROM_LINK (Link);\r
RemoveEntryList (&OpCode->Link);\r
\r
\r
if (OpCode->MapExpressionList.ForwardLink != NULL) {\r
while (!IsListEmpty (&OpCode->MapExpressionList)) {\r
- SubExpressionLink = GetFirstNode(&OpCode->MapExpressionList);\r
+ SubExpressionLink = GetFirstNode (&OpCode->MapExpressionList);\r
SubExpression = FORM_EXPRESSION_FROM_LINK (SubExpressionLink);\r
- RemoveEntryList(&SubExpression->Link);\r
+ RemoveEntryList (&SubExpression->Link);\r
DestroyExpression (SubExpression);\r
}\r
}\r
**/\r
VOID\r
DestroyStorage (\r
- IN FORMSET_STORAGE *Storage\r
+ IN FORMSET_STORAGE *Storage\r
)\r
{\r
if (Storage == NULL) {\r
FreePool (Storage);\r
}\r
\r
-\r
/**\r
Free resources of a Statement.\r
\r
// Free Default value List\r
//\r
while (!IsListEmpty (&Statement->DefaultListHead)) {\r
- Link = GetFirstNode (&Statement->DefaultListHead);\r
+ Link = GetFirstNode (&Statement->DefaultListHead);\r
Default = QUESTION_DEFAULT_FROM_LINK (Link);\r
RemoveEntryList (&Default->Link);\r
\r
if (Default->Value.Buffer != NULL) {\r
FreePool (Default->Value.Buffer);\r
}\r
+\r
FreePool (Default);\r
}\r
\r
// Free Options List\r
//\r
while (!IsListEmpty (&Statement->OptionListHead)) {\r
- Link = GetFirstNode (&Statement->OptionListHead);\r
+ Link = GetFirstNode (&Statement->OptionListHead);\r
Option = QUESTION_OPTION_FROM_LINK (Link);\r
if (Option->SuppressExpression != NULL) {\r
FreePool (Option->SuppressExpression);\r
}\r
+\r
RemoveEntryList (&Option->Link);\r
\r
FreePool (Option);\r
// Free Inconsistent List\r
//\r
while (!IsListEmpty (&Statement->InconsistentListHead)) {\r
- Link = GetFirstNode (&Statement->InconsistentListHead);\r
+ Link = GetFirstNode (&Statement->InconsistentListHead);\r
Expression = FORM_EXPRESSION_FROM_LINK (Link);\r
RemoveEntryList (&Expression->Link);\r
\r
// Free NoSubmit List\r
//\r
while (!IsListEmpty (&Statement->NoSubmitListHead)) {\r
- Link = GetFirstNode (&Statement->NoSubmitListHead);\r
+ Link = GetFirstNode (&Statement->NoSubmitListHead);\r
Expression = FORM_EXPRESSION_FROM_LINK (Link);\r
RemoveEntryList (&Expression->Link);\r
\r
// Free WarningIf List\r
//\r
while (!IsListEmpty (&Statement->WarningListHead)) {\r
- Link = GetFirstNode (&Statement->WarningListHead);\r
+ Link = GetFirstNode (&Statement->WarningListHead);\r
Expression = FORM_EXPRESSION_FROM_LINK (Link);\r
RemoveEntryList (&Expression->Link);\r
\r
if (Statement->VariableName != NULL) {\r
FreePool (Statement->VariableName);\r
}\r
+\r
if (Statement->BlockName != NULL) {\r
FreePool (Statement->BlockName);\r
}\r
+\r
if (Statement->BufferValue != NULL) {\r
FreePool (Statement->BufferValue);\r
}\r
- if (Statement->Operand == EFI_IFR_STRING_OP || Statement->Operand == EFI_IFR_PASSWORD_OP) {\r
- DeleteString(Statement->HiiValue.Value.string, FormSet->HiiHandle);\r
+\r
+ if ((Statement->Operand == EFI_IFR_STRING_OP) || (Statement->Operand == EFI_IFR_PASSWORD_OP)) {\r
+ DeleteString (Statement->HiiValue.Value.string, FormSet->HiiHandle);\r
}\r
}\r
\r
-\r
/**\r
Free resources of a Form.\r
\r
IN OUT FORM_BROWSER_FORM *Form\r
)\r
{\r
- LIST_ENTRY *Link;\r
- FORM_EXPRESSION *Expression;\r
- FORM_BROWSER_STATEMENT *Statement;\r
+ LIST_ENTRY *Link;\r
+ FORM_EXPRESSION *Expression;\r
+ FORM_BROWSER_STATEMENT *Statement;\r
FORM_BROWSER_CONFIG_REQUEST *ConfigInfo;\r
\r
//\r
// Free Form Expressions\r
//\r
while (!IsListEmpty (&Form->ExpressionListHead)) {\r
- Link = GetFirstNode (&Form->ExpressionListHead);\r
+ Link = GetFirstNode (&Form->ExpressionListHead);\r
Expression = FORM_EXPRESSION_FROM_LINK (Link);\r
RemoveEntryList (&Expression->Link);\r
\r
// Free Statements/Questions\r
//\r
while (!IsListEmpty (&Form->StatementListHead)) {\r
- Link = GetFirstNode (&Form->StatementListHead);\r
+ Link = GetFirstNode (&Form->StatementListHead);\r
Statement = FORM_BROWSER_STATEMENT_FROM_LINK (Link);\r
RemoveEntryList (&Statement->Link);\r
\r
// Free ConfigRequest string.\r
//\r
while (!IsListEmpty (&Form->ConfigRequestHead)) {\r
- Link = GetFirstNode (&Form->ConfigRequestHead);\r
+ Link = GetFirstNode (&Form->ConfigRequestHead);\r
ConfigInfo = FORM_BROWSER_CONFIG_REQUEST_FROM_LINK (Link);\r
RemoveEntryList (&ConfigInfo->Link);\r
\r
FreePool (Form);\r
}\r
\r
-\r
/**\r
Free resources allocated for a FormSet.\r
\r
//\r
if (FormSet->StorageListHead.ForwardLink != NULL) {\r
while (!IsListEmpty (&FormSet->StorageListHead)) {\r
- Link = GetFirstNode (&FormSet->StorageListHead);\r
+ Link = GetFirstNode (&FormSet->StorageListHead);\r
Storage = FORMSET_STORAGE_FROM_LINK (Link);\r
RemoveEntryList (&Storage->Link);\r
\r
//\r
if (FormSet->DefaultStoreListHead.ForwardLink != NULL) {\r
while (!IsListEmpty (&FormSet->DefaultStoreListHead)) {\r
- Link = GetFirstNode (&FormSet->DefaultStoreListHead);\r
+ Link = GetFirstNode (&FormSet->DefaultStoreListHead);\r
DefaultStore = FORMSET_DEFAULTSTORE_FROM_LINK (Link);\r
RemoveEntryList (&DefaultStore->Link);\r
\r
// Free Formset Expressions\r
//\r
while (!IsListEmpty (&FormSet->ExpressionListHead)) {\r
- Link = GetFirstNode (&FormSet->ExpressionListHead);\r
+ Link = GetFirstNode (&FormSet->ExpressionListHead);\r
Expression = FORM_EXPRESSION_FROM_LINK (Link);\r
RemoveEntryList (&Expression->Link);\r
\r
if (FormSet->StatementBuffer != NULL) {\r
FreePool (FormSet->StatementBuffer);\r
}\r
+\r
if (FormSet->ExpressionBuffer != NULL) {\r
FreePool (FormSet->ExpressionBuffer);\r
}\r
FreePool (FormSet);\r
}\r
\r
-\r
/**\r
Tell whether this Operand is an Expression OpCode or not\r
\r
**/\r
BOOLEAN\r
IsExpressionOpCode (\r
- IN UINT8 Operand\r
+ IN UINT8 Operand\r
)\r
{\r
if (((Operand >= EFI_IFR_EQ_ID_VAL_OP) && (Operand <= EFI_IFR_NOT_OP)) ||\r
(Operand == EFI_IFR_MAP_OP) ||\r
(Operand == EFI_IFR_VERSION_OP) ||\r
(Operand == EFI_IFR_SECURITY_OP) ||\r
- (Operand == EFI_IFR_MATCH2_OP)) {\r
+ (Operand == EFI_IFR_MATCH2_OP))\r
+ {\r
return TRUE;\r
} else {\r
return FALSE;\r
**/\r
BOOLEAN\r
IsStatementOpCode (\r
- IN UINT8 Operand\r
+ IN UINT8 Operand\r
)\r
{\r
if ((Operand == EFI_IFR_SUBTITLE_OP) ||\r
(Operand == EFI_IFR_DATE_OP) ||\r
(Operand == EFI_IFR_TIME_OP) ||\r
(Operand == EFI_IFR_GUID_OP) ||\r
- (Operand == EFI_IFR_ONE_OF_OP)) {\r
+ (Operand == EFI_IFR_ONE_OF_OP))\r
+ {\r
return TRUE;\r
} else {\r
return FALSE;\r
**/\r
BOOLEAN\r
IsUnKnownOpCode (\r
- IN UINT8 Operand\r
+ IN UINT8 Operand\r
)\r
{\r
return Operand > EFI_IFR_MATCH2_OP ? TRUE : FALSE;\r
VOID\r
CountOpCodes (\r
IN FORM_BROWSER_FORMSET *FormSet,\r
- OUT UINTN *NumberOfStatement,\r
- OUT UINTN *NumberOfExpression\r
+ OUT UINTN *NumberOfStatement,\r
+ OUT UINTN *NumberOfExpression\r
)\r
{\r
- UINTN StatementCount;\r
- UINTN ExpressionCount;\r
- UINT8 *OpCodeData;\r
- UINTN Offset;\r
- UINTN OpCodeLen;\r
-\r
- Offset = 0;\r
- StatementCount = 0;\r
+ UINTN StatementCount;\r
+ UINTN ExpressionCount;\r
+ UINT8 *OpCodeData;\r
+ UINTN Offset;\r
+ UINTN OpCodeLen;\r
+\r
+ Offset = 0;\r
+ StatementCount = 0;\r
ExpressionCount = 0;\r
\r
while (Offset < FormSet->IfrBinaryLength) {\r
OpCodeData = FormSet->IfrBinaryData + Offset;\r
- OpCodeLen = ((EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r
- Offset += OpCodeLen;\r
+ OpCodeLen = ((EFI_IFR_OP_HEADER *)OpCodeData)->Length;\r
+ Offset += OpCodeLen;\r
\r
- if (IsExpressionOpCode (((EFI_IFR_OP_HEADER *) OpCodeData)->OpCode)) {\r
+ if (IsExpressionOpCode (((EFI_IFR_OP_HEADER *)OpCodeData)->OpCode)) {\r
ExpressionCount++;\r
} else {\r
StatementCount++;\r
}\r
}\r
\r
- *NumberOfStatement = StatementCount;\r
+ *NumberOfStatement = StatementCount;\r
*NumberOfExpression = ExpressionCount;\r
}\r
\r
-\r
-\r
/**\r
Parse opcodes in the formset IFR binary.\r
\r
**/\r
EFI_STATUS\r
ParseOpCodes (\r
- IN FORM_BROWSER_FORMSET *FormSet\r
+ IN FORM_BROWSER_FORMSET *FormSet\r
)\r
{\r
- EFI_STATUS Status;\r
- FORM_BROWSER_FORM *CurrentForm;\r
- FORM_BROWSER_STATEMENT *CurrentStatement;\r
- FORM_BROWSER_STATEMENT *ParentStatement;\r
- EXPRESSION_OPCODE *ExpressionOpCode;\r
- FORM_EXPRESSION *CurrentExpression;\r
- UINT8 Operand;\r
- UINT8 Scope;\r
- UINTN OpCodeOffset;\r
- UINTN OpCodeLength;\r
- UINT8 *OpCodeData;\r
- UINT8 ScopeOpCode;\r
- FORMSET_STORAGE *Storage;\r
- FORMSET_DEFAULTSTORE *DefaultStore;\r
- QUESTION_DEFAULT *CurrentDefault;\r
- QUESTION_OPTION *CurrentOption;\r
- UINT8 Width;\r
- UINTN NumberOfStatement;\r
- UINTN NumberOfExpression;\r
- EFI_IMAGE_ID *ImageId;\r
- BOOLEAN SuppressForQuestion;\r
- BOOLEAN SuppressForOption;\r
- UINT16 DepthOfDisable;\r
- BOOLEAN OpCodeDisabled;\r
- BOOLEAN SingleOpCodeExpression;\r
- BOOLEAN InScopeDefault;\r
- EFI_HII_VALUE *Value;\r
- EFI_IFR_FORM_MAP_METHOD *MapMethod;\r
- UINT8 MapScopeDepth;\r
- LIST_ENTRY *Link;\r
- FORMSET_STORAGE *VarStorage;\r
- LIST_ENTRY *MapExpressionList;\r
- EFI_VARSTORE_ID TempVarstoreId;\r
- BOOLEAN InScopeDisable;\r
- INTN ConditionalExprCount;\r
- BOOLEAN InUnknownScope;\r
- UINT8 UnknownDepth;\r
- FORMSET_DEFAULTSTORE *PreDefaultStore;\r
- LIST_ENTRY *DefaultLink;\r
- BOOLEAN HaveInserted;\r
- UINT16 TotalBits;\r
- BOOLEAN QuestionReferBitField;\r
-\r
- SuppressForQuestion = FALSE;\r
- SuppressForOption = FALSE;\r
- InScopeDisable = FALSE;\r
- DepthOfDisable = 0;\r
- OpCodeDisabled = FALSE;\r
- SingleOpCodeExpression = FALSE;\r
- InScopeDefault = FALSE;\r
- CurrentExpression = NULL;\r
- CurrentDefault = NULL;\r
- CurrentOption = NULL;\r
- ImageId = NULL;\r
- MapMethod = NULL;\r
- MapScopeDepth = 0;\r
- Link = NULL;\r
- VarStorage = NULL;\r
- MapExpressionList = NULL;\r
- TempVarstoreId = 0;\r
- ConditionalExprCount = 0;\r
- InUnknownScope = FALSE;\r
- UnknownDepth = 0;\r
- QuestionReferBitField = FALSE;\r
+ EFI_STATUS Status;\r
+ FORM_BROWSER_FORM *CurrentForm;\r
+ FORM_BROWSER_STATEMENT *CurrentStatement;\r
+ FORM_BROWSER_STATEMENT *ParentStatement;\r
+ EXPRESSION_OPCODE *ExpressionOpCode;\r
+ FORM_EXPRESSION *CurrentExpression;\r
+ UINT8 Operand;\r
+ UINT8 Scope;\r
+ UINTN OpCodeOffset;\r
+ UINTN OpCodeLength;\r
+ UINT8 *OpCodeData;\r
+ UINT8 ScopeOpCode;\r
+ FORMSET_STORAGE *Storage;\r
+ FORMSET_DEFAULTSTORE *DefaultStore;\r
+ QUESTION_DEFAULT *CurrentDefault;\r
+ QUESTION_OPTION *CurrentOption;\r
+ UINT8 Width;\r
+ UINTN NumberOfStatement;\r
+ UINTN NumberOfExpression;\r
+ EFI_IMAGE_ID *ImageId;\r
+ BOOLEAN SuppressForQuestion;\r
+ BOOLEAN SuppressForOption;\r
+ UINT16 DepthOfDisable;\r
+ BOOLEAN OpCodeDisabled;\r
+ BOOLEAN SingleOpCodeExpression;\r
+ BOOLEAN InScopeDefault;\r
+ EFI_HII_VALUE *Value;\r
+ EFI_IFR_FORM_MAP_METHOD *MapMethod;\r
+ UINT8 MapScopeDepth;\r
+ LIST_ENTRY *Link;\r
+ FORMSET_STORAGE *VarStorage;\r
+ LIST_ENTRY *MapExpressionList;\r
+ EFI_VARSTORE_ID TempVarstoreId;\r
+ BOOLEAN InScopeDisable;\r
+ INTN ConditionalExprCount;\r
+ BOOLEAN InUnknownScope;\r
+ UINT8 UnknownDepth;\r
+ FORMSET_DEFAULTSTORE *PreDefaultStore;\r
+ LIST_ENTRY *DefaultLink;\r
+ BOOLEAN HaveInserted;\r
+ UINT16 TotalBits;\r
+ BOOLEAN QuestionReferBitField;\r
+\r
+ SuppressForQuestion = FALSE;\r
+ SuppressForOption = FALSE;\r
+ InScopeDisable = FALSE;\r
+ DepthOfDisable = 0;\r
+ OpCodeDisabled = FALSE;\r
+ SingleOpCodeExpression = FALSE;\r
+ InScopeDefault = FALSE;\r
+ CurrentExpression = NULL;\r
+ CurrentDefault = NULL;\r
+ CurrentOption = NULL;\r
+ ImageId = NULL;\r
+ MapMethod = NULL;\r
+ MapScopeDepth = 0;\r
+ Link = NULL;\r
+ VarStorage = NULL;\r
+ MapExpressionList = NULL;\r
+ TempVarstoreId = 0;\r
+ ConditionalExprCount = 0;\r
+ InUnknownScope = FALSE;\r
+ UnknownDepth = 0;\r
+ QuestionReferBitField = FALSE;\r
\r
//\r
// Get the number of Statements and Expressions\r
//\r
CountOpCodes (FormSet, &NumberOfStatement, &NumberOfExpression);\r
\r
- mStatementIndex = 0;\r
- mUsedQuestionId = 1;\r
+ mStatementIndex = 0;\r
+ mUsedQuestionId = 1;\r
FormSet->StatementBuffer = AllocateZeroPool (NumberOfStatement * sizeof (FORM_BROWSER_STATEMENT));\r
if (FormSet->StatementBuffer == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- mExpressionOpCodeIndex = 0;\r
+ mExpressionOpCodeIndex = 0;\r
FormSet->ExpressionBuffer = AllocateZeroPool (NumberOfExpression * sizeof (EXPRESSION_OPCODE));\r
if (FormSet->ExpressionBuffer == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
ResetCurrentExpressionStack ();\r
ResetMapExpressionListStack ();\r
\r
- CurrentForm = NULL;\r
+ CurrentForm = NULL;\r
CurrentStatement = NULL;\r
ParentStatement = NULL;\r
\r
while (OpCodeOffset < FormSet->IfrBinaryLength) {\r
OpCodeData = FormSet->IfrBinaryData + OpCodeOffset;\r
\r
- OpCodeLength = ((EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r
+ OpCodeLength = ((EFI_IFR_OP_HEADER *)OpCodeData)->Length;\r
OpCodeOffset += OpCodeLength;\r
- Operand = ((EFI_IFR_OP_HEADER *) OpCodeData)->OpCode;\r
- Scope = ((EFI_IFR_OP_HEADER *) OpCodeData)->Scope;\r
+ Operand = ((EFI_IFR_OP_HEADER *)OpCodeData)->OpCode;\r
+ Scope = ((EFI_IFR_OP_HEADER *)OpCodeData)->Scope;\r
\r
if (InUnknownScope) {\r
if (Operand == EFI_IFR_END_OP) {\r
- UnknownDepth --;\r
+ UnknownDepth--;\r
\r
if (UnknownDepth == 0) {\r
InUnknownScope = FALSE;\r
}\r
} else {\r
if (Scope != 0) {\r
- UnknownDepth ++;\r
+ UnknownDepth++;\r
}\r
}\r
\r
continue;\r
}\r
\r
- if (IsUnKnownOpCode(Operand)) {\r
+ if (IsUnKnownOpCode (Operand)) {\r
if (Scope != 0) {\r
InUnknownScope = TRUE;\r
- UnknownDepth ++;\r
+ UnknownDepth++;\r
}\r
\r
continue;\r
}\r
}\r
}\r
+\r
continue;\r
}\r
\r
mExpressionOpCodeIndex++;\r
\r
ExpressionOpCode->Signature = EXPRESSION_OPCODE_SIGNATURE;\r
- ExpressionOpCode->Operand = Operand;\r
- Value = &ExpressionOpCode->Value;\r
+ ExpressionOpCode->Operand = Operand;\r
+ Value = &ExpressionOpCode->Value;\r
\r
switch (Operand) {\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
- CopyMem (&ExpressionOpCode->QuestionId, &((EFI_IFR_EQ_ID_VAL *) OpCodeData)->QuestionId, sizeof (EFI_QUESTION_ID));\r
+ case EFI_IFR_EQ_ID_VAL_OP:\r
+ CopyMem (&ExpressionOpCode->QuestionId, &((EFI_IFR_EQ_ID_VAL *)OpCodeData)->QuestionId, sizeof (EFI_QUESTION_ID));\r
\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
- CopyMem (&Value->Value.u16, &((EFI_IFR_EQ_ID_VAL *) OpCodeData)->Value, sizeof (UINT16));\r
- break;\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
+ CopyMem (&Value->Value.u16, &((EFI_IFR_EQ_ID_VAL *)OpCodeData)->Value, sizeof (UINT16));\r
+ break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
- CopyMem (&ExpressionOpCode->QuestionId, &((EFI_IFR_EQ_ID_ID *) OpCodeData)->QuestionId1, sizeof (EFI_QUESTION_ID));\r
- CopyMem (&ExpressionOpCode->QuestionId2, &((EFI_IFR_EQ_ID_ID *) OpCodeData)->QuestionId2, sizeof (EFI_QUESTION_ID));\r
- break;\r
+ case EFI_IFR_EQ_ID_ID_OP:\r
+ CopyMem (&ExpressionOpCode->QuestionId, &((EFI_IFR_EQ_ID_ID *)OpCodeData)->QuestionId1, sizeof (EFI_QUESTION_ID));\r
+ CopyMem (&ExpressionOpCode->QuestionId2, &((EFI_IFR_EQ_ID_ID *)OpCodeData)->QuestionId2, sizeof (EFI_QUESTION_ID));\r
+ break;\r
\r
- case EFI_IFR_EQ_ID_VAL_LIST_OP:\r
- CopyMem (&ExpressionOpCode->QuestionId, &((EFI_IFR_EQ_ID_VAL_LIST *) OpCodeData)->QuestionId, sizeof (EFI_QUESTION_ID));\r
- CopyMem (&ExpressionOpCode->ListLength, &((EFI_IFR_EQ_ID_VAL_LIST *) OpCodeData)->ListLength, sizeof (UINT16));\r
- ExpressionOpCode->ValueList = AllocateCopyPool (ExpressionOpCode->ListLength * sizeof (UINT16), &((EFI_IFR_EQ_ID_VAL_LIST *) OpCodeData)->ValueList);\r
- break;\r
+ case EFI_IFR_EQ_ID_VAL_LIST_OP:\r
+ CopyMem (&ExpressionOpCode->QuestionId, &((EFI_IFR_EQ_ID_VAL_LIST *)OpCodeData)->QuestionId, sizeof (EFI_QUESTION_ID));\r
+ CopyMem (&ExpressionOpCode->ListLength, &((EFI_IFR_EQ_ID_VAL_LIST *)OpCodeData)->ListLength, sizeof (UINT16));\r
+ ExpressionOpCode->ValueList = AllocateCopyPool (ExpressionOpCode->ListLength * sizeof (UINT16), &((EFI_IFR_EQ_ID_VAL_LIST *)OpCodeData)->ValueList);\r
+ break;\r
\r
- case EFI_IFR_TO_STRING_OP:\r
- case EFI_IFR_FIND_OP:\r
- ExpressionOpCode->Format = (( EFI_IFR_TO_STRING *) OpCodeData)->Format;\r
- break;\r
+ case EFI_IFR_TO_STRING_OP:\r
+ case EFI_IFR_FIND_OP:\r
+ ExpressionOpCode->Format = ((EFI_IFR_TO_STRING *)OpCodeData)->Format;\r
+ break;\r
\r
- case EFI_IFR_STRING_REF1_OP:\r
- Value->Type = EFI_IFR_TYPE_STRING;\r
- CopyMem (&Value->Value.string, &(( EFI_IFR_STRING_REF1 *) OpCodeData)->StringId, sizeof (EFI_STRING_ID));\r
- break;\r
+ case EFI_IFR_STRING_REF1_OP:\r
+ Value->Type = EFI_IFR_TYPE_STRING;\r
+ CopyMem (&Value->Value.string, &((EFI_IFR_STRING_REF1 *)OpCodeData)->StringId, sizeof (EFI_STRING_ID));\r
+ break;\r
\r
- case EFI_IFR_RULE_REF_OP:\r
- ExpressionOpCode->RuleId = (( EFI_IFR_RULE_REF *) OpCodeData)->RuleId;\r
- break;\r
+ case EFI_IFR_RULE_REF_OP:\r
+ ExpressionOpCode->RuleId = ((EFI_IFR_RULE_REF *)OpCodeData)->RuleId;\r
+ break;\r
\r
- case EFI_IFR_SPAN_OP:\r
- ExpressionOpCode->Flags = (( EFI_IFR_SPAN *) OpCodeData)->Flags;\r
- break;\r
+ case EFI_IFR_SPAN_OP:\r
+ ExpressionOpCode->Flags = ((EFI_IFR_SPAN *)OpCodeData)->Flags;\r
+ break;\r
\r
- case EFI_IFR_THIS_OP:\r
- ASSERT (ParentStatement != NULL);\r
- ExpressionOpCode->QuestionId = ParentStatement->QuestionId;\r
- break;\r
+ case EFI_IFR_THIS_OP:\r
+ ASSERT (ParentStatement != NULL);\r
+ ExpressionOpCode->QuestionId = ParentStatement->QuestionId;\r
+ break;\r
\r
- case EFI_IFR_SECURITY_OP:\r
- CopyMem (&ExpressionOpCode->Guid, &((EFI_IFR_SECURITY *) OpCodeData)->Permissions, sizeof (EFI_GUID));\r
- break;\r
+ case EFI_IFR_SECURITY_OP:\r
+ CopyMem (&ExpressionOpCode->Guid, &((EFI_IFR_SECURITY *)OpCodeData)->Permissions, sizeof (EFI_GUID));\r
+ break;\r
\r
- case EFI_IFR_MATCH2_OP:\r
- CopyMem (&ExpressionOpCode->Guid, &((EFI_IFR_MATCH2 *) OpCodeData)->SyntaxType, sizeof (EFI_GUID));\r
- break;\r
+ case EFI_IFR_MATCH2_OP:\r
+ CopyMem (&ExpressionOpCode->Guid, &((EFI_IFR_MATCH2 *)OpCodeData)->SyntaxType, sizeof (EFI_GUID));\r
+ break;\r
\r
- case EFI_IFR_GET_OP:\r
- case EFI_IFR_SET_OP:\r
- CopyMem (&TempVarstoreId, &((EFI_IFR_GET *) OpCodeData)->VarStoreId, sizeof (TempVarstoreId));\r
- if (TempVarstoreId != 0) {\r
- if (FormSet->StorageListHead.ForwardLink != NULL) {\r
- Link = GetFirstNode (&FormSet->StorageListHead);\r
- while (!IsNull (&FormSet->StorageListHead, Link)) {\r
- VarStorage = FORMSET_STORAGE_FROM_LINK (Link);\r
- if (VarStorage->VarStoreId == ((EFI_IFR_GET *) OpCodeData)->VarStoreId) {\r
- ExpressionOpCode->VarStorage = VarStorage->BrowserStorage;\r
- break;\r
+ case EFI_IFR_GET_OP:\r
+ case EFI_IFR_SET_OP:\r
+ CopyMem (&TempVarstoreId, &((EFI_IFR_GET *)OpCodeData)->VarStoreId, sizeof (TempVarstoreId));\r
+ if (TempVarstoreId != 0) {\r
+ if (FormSet->StorageListHead.ForwardLink != NULL) {\r
+ Link = GetFirstNode (&FormSet->StorageListHead);\r
+ while (!IsNull (&FormSet->StorageListHead, Link)) {\r
+ VarStorage = FORMSET_STORAGE_FROM_LINK (Link);\r
+ if (VarStorage->VarStoreId == ((EFI_IFR_GET *)OpCodeData)->VarStoreId) {\r
+ ExpressionOpCode->VarStorage = VarStorage->BrowserStorage;\r
+ break;\r
+ }\r
+\r
+ Link = GetNextNode (&FormSet->StorageListHead, Link);\r
}\r
- Link = GetNextNode (&FormSet->StorageListHead, Link);\r
}\r
- }\r
- if (ExpressionOpCode->VarStorage == NULL) {\r
- //\r
- // VarStorage is not found.\r
- //\r
- return EFI_INVALID_PARAMETER;\r
- }\r
- }\r
- ExpressionOpCode->ValueType = ((EFI_IFR_GET *) OpCodeData)->VarStoreType;\r
- switch (ExpressionOpCode->ValueType) {\r
- case EFI_IFR_TYPE_BOOLEAN:\r
- case EFI_IFR_TYPE_NUM_SIZE_8:\r
- ExpressionOpCode->ValueWidth = 1;\r
- break;\r
\r
- case EFI_IFR_TYPE_NUM_SIZE_16:\r
- case EFI_IFR_TYPE_STRING:\r
- ExpressionOpCode->ValueWidth = 2;\r
- break;\r
+ if (ExpressionOpCode->VarStorage == NULL) {\r
+ //\r
+ // VarStorage is not found.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
\r
- case EFI_IFR_TYPE_NUM_SIZE_32:\r
- ExpressionOpCode->ValueWidth = 4;\r
- break;\r
+ ExpressionOpCode->ValueType = ((EFI_IFR_GET *)OpCodeData)->VarStoreType;\r
+ switch (ExpressionOpCode->ValueType) {\r
+ case EFI_IFR_TYPE_BOOLEAN:\r
+ case EFI_IFR_TYPE_NUM_SIZE_8:\r
+ ExpressionOpCode->ValueWidth = 1;\r
+ break;\r
+\r
+ case EFI_IFR_TYPE_NUM_SIZE_16:\r
+ case EFI_IFR_TYPE_STRING:\r
+ ExpressionOpCode->ValueWidth = 2;\r
+ break;\r
+\r
+ case EFI_IFR_TYPE_NUM_SIZE_32:\r
+ ExpressionOpCode->ValueWidth = 4;\r
+ break;\r
+\r
+ case EFI_IFR_TYPE_NUM_SIZE_64:\r
+ ExpressionOpCode->ValueWidth = 8;\r
+ break;\r
+\r
+ case EFI_IFR_TYPE_DATE:\r
+ ExpressionOpCode->ValueWidth = (UINT8)sizeof (EFI_IFR_DATE);\r
+ break;\r
+\r
+ case EFI_IFR_TYPE_TIME:\r
+ ExpressionOpCode->ValueWidth = (UINT8)sizeof (EFI_IFR_TIME);\r
+ break;\r
+\r
+ case EFI_IFR_TYPE_REF:\r
+ ExpressionOpCode->ValueWidth = (UINT8)sizeof (EFI_IFR_REF);\r
+ break;\r
+\r
+ case EFI_IFR_TYPE_OTHER:\r
+ case EFI_IFR_TYPE_UNDEFINED:\r
+ case EFI_IFR_TYPE_ACTION:\r
+ case EFI_IFR_TYPE_BUFFER:\r
+ default:\r
+ //\r
+ // Invalid value type for Get/Set opcode.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
\r
- case EFI_IFR_TYPE_NUM_SIZE_64:\r
- ExpressionOpCode->ValueWidth = 8;\r
- break;\r
+ CopyMem (&ExpressionOpCode->VarStoreInfo.VarName, &((EFI_IFR_GET *)OpCodeData)->VarStoreInfo.VarName, sizeof (EFI_STRING_ID));\r
+ CopyMem (&ExpressionOpCode->VarStoreInfo.VarOffset, &((EFI_IFR_GET *)OpCodeData)->VarStoreInfo.VarOffset, sizeof (UINT16));\r
+ if ((ExpressionOpCode->VarStorage != NULL) &&\r
+ ((ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_NAME_VALUE) ||\r
+ (ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE)))\r
+ {\r
+ ExpressionOpCode->ValueName = GetToken (ExpressionOpCode->VarStoreInfo.VarName, FormSet->HiiHandle);\r
+ if (ExpressionOpCode->ValueName == NULL) {\r
+ //\r
+ // String ID is invalid.\r
+ //\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ }\r
\r
- case EFI_IFR_TYPE_DATE:\r
- ExpressionOpCode->ValueWidth = (UINT8) sizeof (EFI_IFR_DATE);\r
break;\r
\r
- case EFI_IFR_TYPE_TIME:\r
- ExpressionOpCode->ValueWidth = (UINT8) sizeof (EFI_IFR_TIME);\r
+ case EFI_IFR_QUESTION_REF1_OP:\r
+ CopyMem (&ExpressionOpCode->QuestionId, &((EFI_IFR_EQ_ID_VAL_LIST *)OpCodeData)->QuestionId, sizeof (EFI_QUESTION_ID));\r
break;\r
\r
- case EFI_IFR_TYPE_REF:\r
- ExpressionOpCode->ValueWidth = (UINT8) sizeof (EFI_IFR_REF);\r
- break;\r
+ case EFI_IFR_QUESTION_REF3_OP:\r
+ if (OpCodeLength >= sizeof (EFI_IFR_QUESTION_REF3_2)) {\r
+ CopyMem (&ExpressionOpCode->DevicePath, &((EFI_IFR_QUESTION_REF3_2 *)OpCodeData)->DevicePath, sizeof (EFI_STRING_ID));\r
\r
- case EFI_IFR_TYPE_OTHER:\r
- case EFI_IFR_TYPE_UNDEFINED:\r
- case EFI_IFR_TYPE_ACTION:\r
- case EFI_IFR_TYPE_BUFFER:\r
- default:\r
- //\r
- // Invalid value type for Get/Set opcode.\r
- //\r
- return EFI_INVALID_PARAMETER;\r
- }\r
- CopyMem (&ExpressionOpCode->VarStoreInfo.VarName, &((EFI_IFR_GET *) OpCodeData)->VarStoreInfo.VarName, sizeof (EFI_STRING_ID));\r
- CopyMem (&ExpressionOpCode->VarStoreInfo.VarOffset, &((EFI_IFR_GET *) OpCodeData)->VarStoreInfo.VarOffset, sizeof (UINT16));\r
- if ((ExpressionOpCode->VarStorage != NULL) &&\r
- (ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_NAME_VALUE ||\r
- ExpressionOpCode->VarStorage->Type == EFI_HII_VARSTORE_EFI_VARIABLE)) {\r
- ExpressionOpCode->ValueName = GetToken (ExpressionOpCode->VarStoreInfo.VarName, FormSet->HiiHandle);\r
- if (ExpressionOpCode->ValueName == NULL) {\r
- //\r
- // String ID is invalid.\r
- //\r
- return EFI_INVALID_PARAMETER;\r
+ if (OpCodeLength >= sizeof (EFI_IFR_QUESTION_REF3_3)) {\r
+ CopyMem (&ExpressionOpCode->Guid, &((EFI_IFR_QUESTION_REF3_3 *)OpCodeData)->Guid, sizeof (EFI_GUID));\r
+ }\r
}\r
- }\r
- break;\r
-\r
- case EFI_IFR_QUESTION_REF1_OP:\r
- CopyMem (&ExpressionOpCode->QuestionId, &((EFI_IFR_EQ_ID_VAL_LIST *) OpCodeData)->QuestionId, sizeof (EFI_QUESTION_ID));\r
- break;\r
-\r
- case EFI_IFR_QUESTION_REF3_OP:\r
- if (OpCodeLength >= sizeof (EFI_IFR_QUESTION_REF3_2)) {\r
- CopyMem (&ExpressionOpCode->DevicePath, &(( EFI_IFR_QUESTION_REF3_2 *) OpCodeData)->DevicePath, sizeof (EFI_STRING_ID));\r
\r
- if (OpCodeLength >= sizeof (EFI_IFR_QUESTION_REF3_3)) {\r
- CopyMem (&ExpressionOpCode->Guid, &(( EFI_IFR_QUESTION_REF3_3 *) OpCodeData)->Guid, sizeof (EFI_GUID));\r
- }\r
- }\r
- break;\r
+ break;\r
\r
- //\r
- // constant\r
- //\r
- case EFI_IFR_TRUE_OP:\r
- Value->Type = EFI_IFR_TYPE_BOOLEAN;\r
- Value->Value.b = TRUE;\r
- break;\r
+ //\r
+ // constant\r
+ //\r
+ case EFI_IFR_TRUE_OP:\r
+ Value->Type = EFI_IFR_TYPE_BOOLEAN;\r
+ Value->Value.b = TRUE;\r
+ break;\r
\r
- case EFI_IFR_FALSE_OP:\r
- Value->Type = EFI_IFR_TYPE_BOOLEAN;\r
- Value->Value.b = FALSE;\r
- break;\r
+ case EFI_IFR_FALSE_OP:\r
+ Value->Type = EFI_IFR_TYPE_BOOLEAN;\r
+ Value->Value.b = FALSE;\r
+ break;\r
\r
- case EFI_IFR_ONE_OP:\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
- Value->Value.u8 = 1;\r
- break;\r
+ case EFI_IFR_ONE_OP:\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
+ Value->Value.u8 = 1;\r
+ break;\r
\r
- case EFI_IFR_ZERO_OP:\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
- Value->Value.u8 = 0;\r
- break;\r
+ case EFI_IFR_ZERO_OP:\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
+ Value->Value.u8 = 0;\r
+ break;\r
\r
- case EFI_IFR_ONES_OP:\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
- Value->Value.u64 = 0xffffffffffffffffULL;\r
- break;\r
+ case EFI_IFR_ONES_OP:\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
+ Value->Value.u64 = 0xffffffffffffffffULL;\r
+ break;\r
\r
- case EFI_IFR_UINT8_OP:\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
- Value->Value.u8 = (( EFI_IFR_UINT8 *) OpCodeData)->Value;\r
- break;\r
+ case EFI_IFR_UINT8_OP:\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
+ Value->Value.u8 = ((EFI_IFR_UINT8 *)OpCodeData)->Value;\r
+ break;\r
\r
- case EFI_IFR_UINT16_OP:\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
- CopyMem (&Value->Value.u16, &(( EFI_IFR_UINT16 *) OpCodeData)->Value, sizeof (UINT16));\r
- break;\r
+ case EFI_IFR_UINT16_OP:\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
+ CopyMem (&Value->Value.u16, &((EFI_IFR_UINT16 *)OpCodeData)->Value, sizeof (UINT16));\r
+ break;\r
\r
- case EFI_IFR_UINT32_OP:\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_32;\r
- CopyMem (&Value->Value.u32, &(( EFI_IFR_UINT32 *) OpCodeData)->Value, sizeof (UINT32));\r
- break;\r
+ case EFI_IFR_UINT32_OP:\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_32;\r
+ CopyMem (&Value->Value.u32, &((EFI_IFR_UINT32 *)OpCodeData)->Value, sizeof (UINT32));\r
+ break;\r
\r
- case EFI_IFR_UINT64_OP:\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
- CopyMem (&Value->Value.u64, &(( EFI_IFR_UINT64 *) OpCodeData)->Value, sizeof (UINT64));\r
- break;\r
+ case EFI_IFR_UINT64_OP:\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
+ CopyMem (&Value->Value.u64, &((EFI_IFR_UINT64 *)OpCodeData)->Value, sizeof (UINT64));\r
+ break;\r
\r
- case EFI_IFR_UNDEFINED_OP:\r
- Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
- break;\r
+ case EFI_IFR_UNDEFINED_OP:\r
+ Value->Type = EFI_IFR_TYPE_UNDEFINED;\r
+ break;\r
\r
- case EFI_IFR_VERSION_OP:\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
- Value->Value.u16 = EFI_IFR_SPECIFICATION_VERSION;\r
- break;\r
+ case EFI_IFR_VERSION_OP:\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
+ Value->Value.u16 = EFI_IFR_SPECIFICATION_VERSION;\r
+ break;\r
\r
- default:\r
- break;\r
+ default:\r
+ break;\r
}\r
+\r
//\r
// Create sub expression nested in MAP opcode\r
//\r
- if (CurrentExpression == NULL && MapScopeDepth > 0) {\r
+ if ((CurrentExpression == NULL) && (MapScopeDepth > 0)) {\r
CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
ASSERT (MapExpressionList != NULL);\r
InsertTailList (MapExpressionList, &CurrentExpression->Link);\r
SingleOpCodeExpression = TRUE;\r
}\r
}\r
+\r
ASSERT (CurrentExpression != NULL);\r
InsertTailList (&CurrentExpression->OpCodeListHead, &ExpressionOpCode->Link);\r
if (Operand == EFI_IFR_MAP_OP) {\r
if (MapExpressionList != NULL) {\r
PushMapExpressionList (MapExpressionList);\r
}\r
+\r
//\r
// Initialize new Map Expression List.\r
//\r
//\r
PushCurrentExpression (CurrentExpression);\r
CurrentExpression = NULL;\r
- MapScopeDepth ++;\r
+ MapScopeDepth++;\r
} else if (SingleOpCodeExpression) {\r
//\r
// There are two cases to indicate the end of an Expression:\r
//\r
SingleOpCodeExpression = FALSE;\r
\r
- if (InScopeDisable && CurrentForm == NULL) {\r
+ if (InScopeDisable && (CurrentForm == NULL)) {\r
//\r
// This is DisableIf expression for Form, it should be a constant expression\r
//\r
return Status;\r
}\r
\r
- OpCodeDisabled = IsTrue(&CurrentExpression->Result);\r
+ OpCodeDisabled = IsTrue (&CurrentExpression->Result);\r
}\r
\r
CurrentExpression = NULL;\r
// Parse the Opcode\r
//\r
switch (Operand) {\r
+ case EFI_IFR_FORM_SET_OP:\r
+ //\r
+ // Check the formset GUID\r
+ //\r
+ if (CompareMem (&FormSet->Guid, &((EFI_IFR_FORM_SET *)OpCodeData)->Guid, sizeof (EFI_GUID)) != 0) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
\r
- case EFI_IFR_FORM_SET_OP:\r
- //\r
- // Check the formset GUID\r
- //\r
- if (CompareMem (&FormSet->Guid, &((EFI_IFR_FORM_SET *) OpCodeData)->Guid, sizeof (EFI_GUID)) != 0) {\r
- return EFI_INVALID_PARAMETER;\r
- }\r
+ CopyMem (&FormSet->FormSetTitle, &((EFI_IFR_FORM_SET *)OpCodeData)->FormSetTitle, sizeof (EFI_STRING_ID));\r
+ CopyMem (&FormSet->Help, &((EFI_IFR_FORM_SET *)OpCodeData)->Help, sizeof (EFI_STRING_ID));\r
+ FormSet->OpCode = (EFI_IFR_OP_HEADER *)OpCodeData;// save the opcode address of formset\r
+\r
+ if (OpCodeLength > OFFSET_OF (EFI_IFR_FORM_SET, Flags)) {\r
+ //\r
+ // The formset OpCode contains ClassGuid\r
+ //\r
+ FormSet->NumberOfClassGuid = (UINT8)(((EFI_IFR_FORM_SET *)OpCodeData)->Flags & 0x3);\r
+ CopyMem (FormSet->ClassGuid, OpCodeData + sizeof (EFI_IFR_FORM_SET), FormSet->NumberOfClassGuid * sizeof (EFI_GUID));\r
+ }\r
\r
- CopyMem (&FormSet->FormSetTitle, &((EFI_IFR_FORM_SET *) OpCodeData)->FormSetTitle, sizeof (EFI_STRING_ID));\r
- CopyMem (&FormSet->Help, &((EFI_IFR_FORM_SET *) OpCodeData)->Help, sizeof (EFI_STRING_ID));\r
- FormSet->OpCode = (EFI_IFR_OP_HEADER *) OpCodeData;//save the opcode address of formset\r
+ break;\r
\r
- if (OpCodeLength > OFFSET_OF (EFI_IFR_FORM_SET, Flags)) {\r
+ case EFI_IFR_FORM_OP:\r
//\r
- // The formset OpCode contains ClassGuid\r
+ // Create a new Form for this FormSet\r
//\r
- FormSet->NumberOfClassGuid = (UINT8) (((EFI_IFR_FORM_SET *) OpCodeData)->Flags & 0x3);\r
- CopyMem (FormSet->ClassGuid, OpCodeData + sizeof (EFI_IFR_FORM_SET), FormSet->NumberOfClassGuid * sizeof (EFI_GUID));\r
- }\r
- break;\r
+ CurrentForm = AllocateZeroPool (sizeof (FORM_BROWSER_FORM));\r
+ ASSERT (CurrentForm != NULL);\r
+ CurrentForm->Signature = FORM_BROWSER_FORM_SIGNATURE;\r
+ InitializeListHead (&CurrentForm->ExpressionListHead);\r
+ InitializeListHead (&CurrentForm->StatementListHead);\r
+ InitializeListHead (&CurrentForm->ConfigRequestHead);\r
+ InitializeListHead (&CurrentForm->FormViewListHead);\r
+\r
+ CurrentForm->FormType = STANDARD_MAP_FORM_TYPE;\r
+ CopyMem (&CurrentForm->FormId, &((EFI_IFR_FORM *)OpCodeData)->FormId, sizeof (UINT16));\r
+ CopyMem (&CurrentForm->FormTitle, &((EFI_IFR_FORM *)OpCodeData)->FormTitle, sizeof (EFI_STRING_ID));\r
+\r
+ ConditionalExprCount = GetConditionalExpressionCount (ExpressForm);\r
+ if ( ConditionalExprCount > 0) {\r
+ //\r
+ // Form is inside of suppressif\r
+ //\r
+ CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *)AllocatePool (\r
+ (UINTN)(sizeof (FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof (FORM_EXPRESSION *)))\r
+ );\r
+ ASSERT (CurrentForm->SuppressExpression != NULL);\r
+ CurrentForm->SuppressExpression->Count = (UINTN)ConditionalExprCount;\r
+ CurrentForm->SuppressExpression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
+ CopyMem (CurrentForm->SuppressExpression->Expression, GetConditionalExpressionList (ExpressForm), (UINTN)(sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
+ }\r
\r
- case EFI_IFR_FORM_OP:\r
- //\r
- // Create a new Form for this FormSet\r
- //\r
- CurrentForm = AllocateZeroPool (sizeof (FORM_BROWSER_FORM));\r
- ASSERT (CurrentForm != NULL);\r
- CurrentForm->Signature = FORM_BROWSER_FORM_SIGNATURE;\r
- InitializeListHead (&CurrentForm->ExpressionListHead);\r
- InitializeListHead (&CurrentForm->StatementListHead);\r
- InitializeListHead (&CurrentForm->ConfigRequestHead);\r
- InitializeListHead (&CurrentForm->FormViewListHead);\r
-\r
- CurrentForm->FormType = STANDARD_MAP_FORM_TYPE;\r
- CopyMem (&CurrentForm->FormId, &((EFI_IFR_FORM *) OpCodeData)->FormId, sizeof (UINT16));\r
- CopyMem (&CurrentForm->FormTitle, &((EFI_IFR_FORM *) OpCodeData)->FormTitle, sizeof (EFI_STRING_ID));\r
-\r
- ConditionalExprCount = GetConditionalExpressionCount(ExpressForm);\r
- if ( ConditionalExprCount > 0) {\r
- //\r
- // Form is inside of suppressif\r
- //\r
- CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(\r
- (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
- ASSERT (CurrentForm->SuppressExpression != NULL);\r
- CurrentForm->SuppressExpression->Count = (UINTN) ConditionalExprCount;\r
- CurrentForm->SuppressExpression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
- CopyMem (CurrentForm->SuppressExpression->Expression, GetConditionalExpressionList(ExpressForm), (UINTN) (sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
- }\r
+ if (Scope != 0) {\r
+ //\r
+ // Enter scope of a Form, suppressif will be used for Question or Option\r
+ //\r
+ SuppressForQuestion = TRUE;\r
+ }\r
\r
- if (Scope != 0) {\r
//\r
- // Enter scope of a Form, suppressif will be used for Question or Option\r
+ // Insert into Form list of this FormSet\r
//\r
- SuppressForQuestion = TRUE;\r
- }\r
-\r
- //\r
- // Insert into Form list of this FormSet\r
- //\r
- InsertTailList (&FormSet->FormListHead, &CurrentForm->Link);\r
- break;\r
+ InsertTailList (&FormSet->FormListHead, &CurrentForm->Link);\r
+ break;\r
\r
- case EFI_IFR_FORM_MAP_OP:\r
- //\r
- // Create a new Form for this FormSet\r
- //\r
- CurrentForm = AllocateZeroPool (sizeof (FORM_BROWSER_FORM));\r
- ASSERT (CurrentForm != NULL);\r
- CurrentForm->Signature = FORM_BROWSER_FORM_SIGNATURE;\r
- InitializeListHead (&CurrentForm->ExpressionListHead);\r
- InitializeListHead (&CurrentForm->StatementListHead);\r
- InitializeListHead (&CurrentForm->ConfigRequestHead);\r
- InitializeListHead (&CurrentForm->FormViewListHead);\r
+ case EFI_IFR_FORM_MAP_OP:\r
+ //\r
+ // Create a new Form for this FormSet\r
+ //\r
+ CurrentForm = AllocateZeroPool (sizeof (FORM_BROWSER_FORM));\r
+ ASSERT (CurrentForm != NULL);\r
+ CurrentForm->Signature = FORM_BROWSER_FORM_SIGNATURE;\r
+ InitializeListHead (&CurrentForm->ExpressionListHead);\r
+ InitializeListHead (&CurrentForm->StatementListHead);\r
+ InitializeListHead (&CurrentForm->ConfigRequestHead);\r
+ InitializeListHead (&CurrentForm->FormViewListHead);\r
\r
- CopyMem (&CurrentForm->FormId, &((EFI_IFR_FORM *) OpCodeData)->FormId, sizeof (UINT16));\r
+ CopyMem (&CurrentForm->FormId, &((EFI_IFR_FORM *)OpCodeData)->FormId, sizeof (UINT16));\r
\r
- MapMethod = (EFI_IFR_FORM_MAP_METHOD *) (OpCodeData + sizeof (EFI_IFR_FORM_MAP));\r
- //\r
- // FormMap Form must contain at least one Map Method.\r
- //\r
- if (((EFI_IFR_OP_HEADER *) OpCodeData)->Length < ((UINTN) (UINT8 *) (MapMethod + 1) - (UINTN) OpCodeData)) {\r
- return EFI_INVALID_PARAMETER;\r
- }\r
- //\r
- // Try to find the standard form map method.\r
- //\r
- while (((UINTN) (UINT8 *) MapMethod - (UINTN) OpCodeData) < ((EFI_IFR_OP_HEADER *) OpCodeData)->Length) {\r
- if (CompareGuid ((EFI_GUID *) (VOID *) &MapMethod->MethodIdentifier, &gEfiHiiStandardFormGuid)) {\r
- CopyMem (&CurrentForm->FormTitle, &MapMethod->MethodTitle, sizeof (EFI_STRING_ID));\r
- CurrentForm->FormType = STANDARD_MAP_FORM_TYPE;\r
- break;\r
+ MapMethod = (EFI_IFR_FORM_MAP_METHOD *)(OpCodeData + sizeof (EFI_IFR_FORM_MAP));\r
+ //\r
+ // FormMap Form must contain at least one Map Method.\r
+ //\r
+ if (((EFI_IFR_OP_HEADER *)OpCodeData)->Length < ((UINTN)(UINT8 *)(MapMethod + 1) - (UINTN)OpCodeData)) {\r
+ return EFI_INVALID_PARAMETER;\r
}\r
- MapMethod ++;\r
- }\r
- //\r
- // If the standard form map method is not found, the first map method title will be used.\r
- //\r
- if (CurrentForm->FormTitle == 0) {\r
- MapMethod = (EFI_IFR_FORM_MAP_METHOD *) (OpCodeData + sizeof (EFI_IFR_FORM_MAP));\r
- CopyMem (&CurrentForm->FormTitle, &MapMethod->MethodTitle, sizeof (EFI_STRING_ID));\r
- }\r
\r
- ConditionalExprCount = GetConditionalExpressionCount(ExpressForm);\r
- if ( ConditionalExprCount > 0) {\r
//\r
- // Form is inside of suppressif\r
+ // Try to find the standard form map method.\r
//\r
- CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(\r
- (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
- ASSERT (CurrentForm->SuppressExpression != NULL);\r
- CurrentForm->SuppressExpression->Count = (UINTN) ConditionalExprCount;\r
- CurrentForm->SuppressExpression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
- CopyMem (CurrentForm->SuppressExpression->Expression, GetConditionalExpressionList(ExpressForm), (UINTN) (sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
- }\r
+ while (((UINTN)(UINT8 *)MapMethod - (UINTN)OpCodeData) < ((EFI_IFR_OP_HEADER *)OpCodeData)->Length) {\r
+ if (CompareGuid ((EFI_GUID *)(VOID *)&MapMethod->MethodIdentifier, &gEfiHiiStandardFormGuid)) {\r
+ CopyMem (&CurrentForm->FormTitle, &MapMethod->MethodTitle, sizeof (EFI_STRING_ID));\r
+ CurrentForm->FormType = STANDARD_MAP_FORM_TYPE;\r
+ break;\r
+ }\r
+\r
+ MapMethod++;\r
+ }\r
\r
- if (Scope != 0) {\r
//\r
- // Enter scope of a Form, suppressif will be used for Question or Option\r
+ // If the standard form map method is not found, the first map method title will be used.\r
//\r
- SuppressForQuestion = TRUE;\r
- }\r
+ if (CurrentForm->FormTitle == 0) {\r
+ MapMethod = (EFI_IFR_FORM_MAP_METHOD *)(OpCodeData + sizeof (EFI_IFR_FORM_MAP));\r
+ CopyMem (&CurrentForm->FormTitle, &MapMethod->MethodTitle, sizeof (EFI_STRING_ID));\r
+ }\r
\r
- //\r
- // Insert into Form list of this FormSet\r
- //\r
- InsertTailList (&FormSet->FormListHead, &CurrentForm->Link);\r
- break;\r
+ ConditionalExprCount = GetConditionalExpressionCount (ExpressForm);\r
+ if ( ConditionalExprCount > 0) {\r
+ //\r
+ // Form is inside of suppressif\r
+ //\r
+ CurrentForm->SuppressExpression = (FORM_EXPRESSION_LIST *)AllocatePool (\r
+ (UINTN)(sizeof (FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof (FORM_EXPRESSION *)))\r
+ );\r
+ ASSERT (CurrentForm->SuppressExpression != NULL);\r
+ CurrentForm->SuppressExpression->Count = (UINTN)ConditionalExprCount;\r
+ CurrentForm->SuppressExpression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
+ CopyMem (CurrentForm->SuppressExpression->Expression, GetConditionalExpressionList (ExpressForm), (UINTN)(sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
+ }\r
\r
- //\r
- // Storage\r
- //\r
- case EFI_IFR_VARSTORE_OP:\r
- //\r
- // Create a buffer Storage for this FormSet\r
- //\r
- Storage = CreateStorage (FormSet, EFI_HII_VARSTORE_BUFFER, OpCodeData);\r
- CopyMem (&Storage->VarStoreId, &((EFI_IFR_VARSTORE *) OpCodeData)->VarStoreId, sizeof (EFI_VARSTORE_ID));\r
- break;\r
+ if (Scope != 0) {\r
+ //\r
+ // Enter scope of a Form, suppressif will be used for Question or Option\r
+ //\r
+ SuppressForQuestion = TRUE;\r
+ }\r
\r
- case EFI_IFR_VARSTORE_NAME_VALUE_OP:\r
- //\r
- // Create a name/value Storage for this FormSet\r
- //\r
- Storage = CreateStorage (FormSet, EFI_HII_VARSTORE_NAME_VALUE, OpCodeData);\r
- CopyMem (&Storage->VarStoreId, &((EFI_IFR_VARSTORE_NAME_VALUE *) OpCodeData)->VarStoreId, sizeof (EFI_VARSTORE_ID));\r
- break;\r
+ //\r
+ // Insert into Form list of this FormSet\r
+ //\r
+ InsertTailList (&FormSet->FormListHead, &CurrentForm->Link);\r
+ break;\r
\r
- case EFI_IFR_VARSTORE_EFI_OP:\r
//\r
- // Create a EFI variable Storage for this FormSet\r
+ // Storage\r
//\r
- if (OpCodeLength < sizeof (EFI_IFR_VARSTORE_EFI)) {\r
+ case EFI_IFR_VARSTORE_OP:\r
//\r
- // Create efi varstore with format follow UEFI spec before 2.3.1.\r
+ // Create a buffer Storage for this FormSet\r
//\r
- Storage = CreateStorage (FormSet, EFI_HII_VARSTORE_EFI_VARIABLE, OpCodeData);\r
- } else {\r
+ Storage = CreateStorage (FormSet, EFI_HII_VARSTORE_BUFFER, OpCodeData);\r
+ CopyMem (&Storage->VarStoreId, &((EFI_IFR_VARSTORE *)OpCodeData)->VarStoreId, sizeof (EFI_VARSTORE_ID));\r
+ break;\r
+\r
+ case EFI_IFR_VARSTORE_NAME_VALUE_OP:\r
//\r
- // Create efi varstore with format follow UEFI spec 2.3.1 and later.\r
+ // Create a name/value Storage for this FormSet\r
//\r
- Storage = CreateStorage (FormSet, EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER, OpCodeData);\r
- }\r
- CopyMem (&Storage->VarStoreId, &((EFI_IFR_VARSTORE_EFI *) OpCodeData)->VarStoreId, sizeof (EFI_VARSTORE_ID));\r
- break;\r
+ Storage = CreateStorage (FormSet, EFI_HII_VARSTORE_NAME_VALUE, OpCodeData);\r
+ CopyMem (&Storage->VarStoreId, &((EFI_IFR_VARSTORE_NAME_VALUE *)OpCodeData)->VarStoreId, sizeof (EFI_VARSTORE_ID));\r
+ break;\r
\r
- //\r
- // DefaultStore\r
- //\r
- case EFI_IFR_DEFAULTSTORE_OP:\r
- HaveInserted = FALSE;\r
- DefaultStore = AllocateZeroPool (sizeof (FORMSET_DEFAULTSTORE));\r
- ASSERT (DefaultStore != NULL);\r
- DefaultStore->Signature = FORMSET_DEFAULTSTORE_SIGNATURE;\r
-\r
- CopyMem (&DefaultStore->DefaultId, &((EFI_IFR_DEFAULTSTORE *) OpCodeData)->DefaultId, sizeof (UINT16));\r
- CopyMem (&DefaultStore->DefaultName, &((EFI_IFR_DEFAULTSTORE *) OpCodeData)->DefaultName, sizeof (EFI_STRING_ID));\r
- //\r
- // Insert it to the DefaultStore list of this Formset with ascending order.\r
- //\r
- if (!IsListEmpty (&FormSet->DefaultStoreListHead)) {\r
- DefaultLink = GetFirstNode (&FormSet->DefaultStoreListHead);\r
- while (!IsNull (&FormSet->DefaultStoreListHead, DefaultLink)) {\r
- PreDefaultStore = FORMSET_DEFAULTSTORE_FROM_LINK(DefaultLink);\r
- DefaultLink = GetNextNode (&FormSet->DefaultStoreListHead, DefaultLink);\r
- if (DefaultStore->DefaultId < PreDefaultStore->DefaultId) {\r
- InsertTailList (&PreDefaultStore->Link, &DefaultStore->Link);\r
- HaveInserted = TRUE;\r
- break;\r
- }\r
+ case EFI_IFR_VARSTORE_EFI_OP:\r
+ //\r
+ // Create a EFI variable Storage for this FormSet\r
+ //\r
+ if (OpCodeLength < sizeof (EFI_IFR_VARSTORE_EFI)) {\r
+ //\r
+ // Create efi varstore with format follow UEFI spec before 2.3.1.\r
+ //\r
+ Storage = CreateStorage (FormSet, EFI_HII_VARSTORE_EFI_VARIABLE, OpCodeData);\r
+ } else {\r
+ //\r
+ // Create efi varstore with format follow UEFI spec 2.3.1 and later.\r
+ //\r
+ Storage = CreateStorage (FormSet, EFI_HII_VARSTORE_EFI_VARIABLE_BUFFER, OpCodeData);\r
}\r
- }\r
- if (!HaveInserted) {\r
- InsertTailList (&FormSet->DefaultStoreListHead, &DefaultStore->Link);\r
- }\r
- break;\r
-\r
- //\r
- // Statements\r
- //\r
- case EFI_IFR_SUBTITLE_OP:\r
- CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
- ASSERT (CurrentStatement != NULL);\r
-\r
- CurrentStatement->Flags = ((EFI_IFR_SUBTITLE *) OpCodeData)->Flags;\r
- CurrentStatement->FakeQuestionId = mUsedQuestionId++;\r
- break;\r
-\r
- case EFI_IFR_TEXT_OP:\r
- CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
- ASSERT (CurrentStatement != NULL);\r
- CurrentStatement->FakeQuestionId = mUsedQuestionId++;\r
- CopyMem (&CurrentStatement->TextTwo, &((EFI_IFR_TEXT *) OpCodeData)->TextTwo, sizeof (EFI_STRING_ID));\r
- break;\r
\r
- case EFI_IFR_RESET_BUTTON_OP:\r
- CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
- ASSERT (CurrentStatement != NULL);\r
- CurrentStatement->FakeQuestionId = mUsedQuestionId++;\r
- CopyMem (&CurrentStatement->DefaultId, &((EFI_IFR_RESET_BUTTON *) OpCodeData)->DefaultId, sizeof (EFI_DEFAULT_ID));\r
- break;\r
+ CopyMem (&Storage->VarStoreId, &((EFI_IFR_VARSTORE_EFI *)OpCodeData)->VarStoreId, sizeof (EFI_VARSTORE_ID));\r
+ break;\r
\r
- //\r
- // Questions\r
- //\r
- case EFI_IFR_ACTION_OP:\r
- CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
- ASSERT (CurrentStatement != NULL);\r
- CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_ACTION;\r
+ //\r
+ // DefaultStore\r
+ //\r
+ case EFI_IFR_DEFAULTSTORE_OP:\r
+ HaveInserted = FALSE;\r
+ DefaultStore = AllocateZeroPool (sizeof (FORMSET_DEFAULTSTORE));\r
+ ASSERT (DefaultStore != NULL);\r
+ DefaultStore->Signature = FORMSET_DEFAULTSTORE_SIGNATURE;\r
\r
- if (OpCodeLength == sizeof (EFI_IFR_ACTION_1)) {\r
+ CopyMem (&DefaultStore->DefaultId, &((EFI_IFR_DEFAULTSTORE *)OpCodeData)->DefaultId, sizeof (UINT16));\r
+ CopyMem (&DefaultStore->DefaultName, &((EFI_IFR_DEFAULTSTORE *)OpCodeData)->DefaultName, sizeof (EFI_STRING_ID));\r
//\r
- // No QuestionConfig present, so no configuration string will be processed\r
+ // Insert it to the DefaultStore list of this Formset with ascending order.\r
//\r
- CurrentStatement->QuestionConfig = 0;\r
- } else {\r
- CopyMem (&CurrentStatement->QuestionConfig, &((EFI_IFR_ACTION *) OpCodeData)->QuestionConfig, sizeof (EFI_STRING_ID));\r
- }\r
- break;\r
-\r
- case EFI_IFR_REF_OP:\r
- CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
- ASSERT (CurrentStatement != NULL);\r
- Value = &CurrentStatement->HiiValue;\r
- Value->Type = EFI_IFR_TYPE_REF;\r
- if (OpCodeLength >= sizeof (EFI_IFR_REF)) {\r
- CopyMem (&Value->Value.ref.FormId, &((EFI_IFR_REF *) OpCodeData)->FormId, sizeof (EFI_FORM_ID));\r
-\r
- if (OpCodeLength >= sizeof (EFI_IFR_REF2)) {\r
- CopyMem (&Value->Value.ref.QuestionId, &((EFI_IFR_REF2 *) OpCodeData)->QuestionId, sizeof (EFI_QUESTION_ID));\r
-\r
- if (OpCodeLength >= sizeof (EFI_IFR_REF3)) {\r
- CopyMem (&Value->Value.ref.FormSetGuid, &((EFI_IFR_REF3 *) OpCodeData)->FormSetId, sizeof (EFI_GUID));\r
-\r
- if (OpCodeLength >= sizeof (EFI_IFR_REF4)) {\r
- CopyMem (&Value->Value.ref.DevicePath, &((EFI_IFR_REF4 *) OpCodeData)->DevicePath, sizeof (EFI_STRING_ID));\r
+ if (!IsListEmpty (&FormSet->DefaultStoreListHead)) {\r
+ DefaultLink = GetFirstNode (&FormSet->DefaultStoreListHead);\r
+ while (!IsNull (&FormSet->DefaultStoreListHead, DefaultLink)) {\r
+ PreDefaultStore = FORMSET_DEFAULTSTORE_FROM_LINK (DefaultLink);\r
+ DefaultLink = GetNextNode (&FormSet->DefaultStoreListHead, DefaultLink);\r
+ if (DefaultStore->DefaultId < PreDefaultStore->DefaultId) {\r
+ InsertTailList (&PreDefaultStore->Link, &DefaultStore->Link);\r
+ HaveInserted = TRUE;\r
+ break;\r
}\r
}\r
}\r
- }\r
- CurrentStatement->StorageWidth = (UINT16) sizeof (EFI_HII_REF);\r
- InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
- break;\r
\r
- case EFI_IFR_ONE_OF_OP:\r
- case EFI_IFR_NUMERIC_OP:\r
- CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
- ASSERT(CurrentStatement != NULL);\r
+ if (!HaveInserted) {\r
+ InsertTailList (&FormSet->DefaultStoreListHead, &DefaultStore->Link);\r
+ }\r
\r
- CurrentStatement->Flags = ((EFI_IFR_ONE_OF *) OpCodeData)->Flags;\r
- Value = &CurrentStatement->HiiValue;\r
+ break;\r
\r
- if (QuestionReferBitField) {\r
- //\r
- // Get the bit var store info (bit/byte offset, bit/byte offset)\r
- //\r
- CurrentStatement->QuestionReferToBitField = TRUE;\r
- CurrentStatement->BitStorageWidth = CurrentStatement->Flags & EDKII_IFR_NUMERIC_SIZE_BIT;\r
- CurrentStatement->BitVarOffset = CurrentStatement->VarStoreInfo.VarOffset;\r
- CurrentStatement->VarStoreInfo.VarOffset = CurrentStatement->BitVarOffset / 8;\r
- TotalBits = CurrentStatement->BitVarOffset % 8 + CurrentStatement->BitStorageWidth;\r
- CurrentStatement->StorageWidth = (TotalBits % 8 == 0? TotalBits / 8: TotalBits / 8 + 1);\r
+ //\r
+ // Statements\r
+ //\r
+ case EFI_IFR_SUBTITLE_OP:\r
+ CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
\r
- //\r
- // Get the Minimum/Maximum/Step value(Note: bit field type has been stored as UINT32 type)\r
- //\r
- CurrentStatement->Minimum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MinValue;\r
- CurrentStatement->Maximum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MaxValue;\r
- CurrentStatement->Step = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.Step;\r
+ CurrentStatement->Flags = ((EFI_IFR_SUBTITLE *)OpCodeData)->Flags;\r
+ CurrentStatement->FakeQuestionId = mUsedQuestionId++;\r
+ break;\r
\r
- //\r
- // Update the Flag and type of Minimum/Maximum/Step according to the actual width of bit field,\r
- // in order to make Browser handle these question with bit varstore correctly.\r
- //\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->Flags &= EDKII_IFR_DISPLAY_BIT;\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->Flags >>= 2;\r
- switch (CurrentStatement->StorageWidth) {\r
- case 1:\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->Flags |= EFI_IFR_TYPE_NUM_SIZE_8;\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MinValue = (UINT8)CurrentStatement->Minimum;\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MaxValue = (UINT8)CurrentStatement->Maximum;\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.Step = (UINT8)CurrentStatement->Step;\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
- break;\r
- case 2:\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->Flags |= EFI_IFR_TYPE_NUM_SIZE_16;\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MinValue = (UINT16)CurrentStatement->Minimum;\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MaxValue = (UINT16)CurrentStatement->Maximum;\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.Step = (UINT16)CurrentStatement->Step;\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
- break;\r
- case 3:\r
- case 4:\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->Flags |= EFI_IFR_TYPE_NUM_SIZE_32;\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MinValue = (UINT32)CurrentStatement->Minimum;\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MaxValue = (UINT32)CurrentStatement->Maximum;\r
- ((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.Step = (UINT32)CurrentStatement->Step;\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_32;\r
- break;\r
- default:\r
- break;\r
+ case EFI_IFR_TEXT_OP:\r
+ CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
+ CurrentStatement->FakeQuestionId = mUsedQuestionId++;\r
+ CopyMem (&CurrentStatement->TextTwo, &((EFI_IFR_TEXT *)OpCodeData)->TextTwo, sizeof (EFI_STRING_ID));\r
+ break;\r
+\r
+ case EFI_IFR_RESET_BUTTON_OP:\r
+ CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
+ CurrentStatement->FakeQuestionId = mUsedQuestionId++;\r
+ CopyMem (&CurrentStatement->DefaultId, &((EFI_IFR_RESET_BUTTON *)OpCodeData)->DefaultId, sizeof (EFI_DEFAULT_ID));\r
+ break;\r
+\r
+ //\r
+ // Questions\r
+ //\r
+ case EFI_IFR_ACTION_OP:\r
+ CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
+ CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_ACTION;\r
+\r
+ if (OpCodeLength == sizeof (EFI_IFR_ACTION_1)) {\r
+ //\r
+ // No QuestionConfig present, so no configuration string will be processed\r
+ //\r
+ CurrentStatement->QuestionConfig = 0;\r
+ } else {\r
+ CopyMem (&CurrentStatement->QuestionConfig, &((EFI_IFR_ACTION *)OpCodeData)->QuestionConfig, sizeof (EFI_STRING_ID));\r
}\r
- } else {\r
- switch (CurrentStatement->Flags & EFI_IFR_NUMERIC_SIZE) {\r
- case EFI_IFR_NUMERIC_SIZE_1:\r
- CurrentStatement->Minimum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MinValue;\r
- CurrentStatement->Maximum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MaxValue;\r
- CurrentStatement->Step = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.Step;\r
- CurrentStatement->StorageWidth = (UINT16) sizeof (UINT8);\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
- break;\r
\r
- case EFI_IFR_NUMERIC_SIZE_2:\r
- CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MinValue, sizeof (UINT16));\r
- CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MaxValue, sizeof (UINT16));\r
- CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.Step, sizeof (UINT16));\r
- CurrentStatement->StorageWidth = (UINT16) sizeof (UINT16);\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
- break;\r
+ break;\r
\r
- case EFI_IFR_NUMERIC_SIZE_4:\r
- CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MinValue, sizeof (UINT32));\r
- CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MaxValue, sizeof (UINT32));\r
- CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.Step, sizeof (UINT32));\r
- CurrentStatement->StorageWidth = (UINT16) sizeof (UINT32);\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_32;\r
- break;\r
+ case EFI_IFR_REF_OP:\r
+ CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
+ Value = &CurrentStatement->HiiValue;\r
+ Value->Type = EFI_IFR_TYPE_REF;\r
+ if (OpCodeLength >= sizeof (EFI_IFR_REF)) {\r
+ CopyMem (&Value->Value.ref.FormId, &((EFI_IFR_REF *)OpCodeData)->FormId, sizeof (EFI_FORM_ID));\r
\r
- case EFI_IFR_NUMERIC_SIZE_8:\r
- CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.MinValue, sizeof (UINT64));\r
- CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.MaxValue, sizeof (UINT64));\r
- CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.Step, sizeof (UINT64));\r
- CurrentStatement->StorageWidth = (UINT16) sizeof (UINT64);\r
- Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
- break;\r
+ if (OpCodeLength >= sizeof (EFI_IFR_REF2)) {\r
+ CopyMem (&Value->Value.ref.QuestionId, &((EFI_IFR_REF2 *)OpCodeData)->QuestionId, sizeof (EFI_QUESTION_ID));\r
\r
- default:\r
- break;\r
+ if (OpCodeLength >= sizeof (EFI_IFR_REF3)) {\r
+ CopyMem (&Value->Value.ref.FormSetGuid, &((EFI_IFR_REF3 *)OpCodeData)->FormSetId, sizeof (EFI_GUID));\r
+\r
+ if (OpCodeLength >= sizeof (EFI_IFR_REF4)) {\r
+ CopyMem (&Value->Value.ref.DevicePath, &((EFI_IFR_REF4 *)OpCodeData)->DevicePath, sizeof (EFI_STRING_ID));\r
+ }\r
+ }\r
+ }\r
}\r
- }\r
- InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
\r
- if ((Operand == EFI_IFR_ONE_OF_OP) && Scope != 0) {\r
- SuppressForOption = TRUE;\r
- }\r
- break;\r
+ CurrentStatement->StorageWidth = (UINT16)sizeof (EFI_HII_REF);\r
+ InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
+ break;\r
\r
- case EFI_IFR_ORDERED_LIST_OP:\r
- CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
- ASSERT(CurrentStatement != NULL);\r
+ case EFI_IFR_ONE_OF_OP:\r
+ case EFI_IFR_NUMERIC_OP:\r
+ CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
\r
- CurrentStatement->Flags = ((EFI_IFR_ORDERED_LIST *) OpCodeData)->Flags;\r
- CurrentStatement->MaxContainers = ((EFI_IFR_ORDERED_LIST *) OpCodeData)->MaxContainers;\r
+ CurrentStatement->Flags = ((EFI_IFR_ONE_OF *)OpCodeData)->Flags;\r
+ Value = &CurrentStatement->HiiValue;\r
\r
- CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_BUFFER;\r
- CurrentStatement->BufferValue = NULL;\r
+ if (QuestionReferBitField) {\r
+ //\r
+ // Get the bit var store info (bit/byte offset, bit/byte offset)\r
+ //\r
+ CurrentStatement->QuestionReferToBitField = TRUE;\r
+ CurrentStatement->BitStorageWidth = CurrentStatement->Flags & EDKII_IFR_NUMERIC_SIZE_BIT;\r
+ CurrentStatement->BitVarOffset = CurrentStatement->VarStoreInfo.VarOffset;\r
+ CurrentStatement->VarStoreInfo.VarOffset = CurrentStatement->BitVarOffset / 8;\r
+ TotalBits = CurrentStatement->BitVarOffset % 8 + CurrentStatement->BitStorageWidth;\r
+ CurrentStatement->StorageWidth = (TotalBits % 8 == 0 ? TotalBits / 8 : TotalBits / 8 + 1);\r
\r
- if (Scope != 0) {\r
- SuppressForOption = TRUE;\r
- }\r
- break;\r
+ //\r
+ // Get the Minimum/Maximum/Step value(Note: bit field type has been stored as UINT32 type)\r
+ //\r
+ CurrentStatement->Minimum = ((EFI_IFR_NUMERIC *)OpCodeData)->data.u32.MinValue;\r
+ CurrentStatement->Maximum = ((EFI_IFR_NUMERIC *)OpCodeData)->data.u32.MaxValue;\r
+ CurrentStatement->Step = ((EFI_IFR_NUMERIC *)OpCodeData)->data.u32.Step;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
- CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
- ASSERT(CurrentStatement != NULL);\r
+ //\r
+ // Update the Flag and type of Minimum/Maximum/Step according to the actual width of bit field,\r
+ // in order to make Browser handle these question with bit varstore correctly.\r
+ //\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->Flags &= EDKII_IFR_DISPLAY_BIT;\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->Flags >>= 2;\r
+ switch (CurrentStatement->StorageWidth) {\r
+ case 1:\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->Flags |= EFI_IFR_TYPE_NUM_SIZE_8;\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->data.u8.MinValue = (UINT8)CurrentStatement->Minimum;\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->data.u8.MaxValue = (UINT8)CurrentStatement->Maximum;\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->data.u8.Step = (UINT8)CurrentStatement->Step;\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
+ break;\r
+ case 2:\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->Flags |= EFI_IFR_TYPE_NUM_SIZE_16;\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->data.u16.MinValue = (UINT16)CurrentStatement->Minimum;\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->data.u16.MaxValue = (UINT16)CurrentStatement->Maximum;\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->data.u16.Step = (UINT16)CurrentStatement->Step;\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
+ break;\r
+ case 3:\r
+ case 4:\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->Flags |= EFI_IFR_TYPE_NUM_SIZE_32;\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->data.u32.MinValue = (UINT32)CurrentStatement->Minimum;\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->data.u32.MaxValue = (UINT32)CurrentStatement->Maximum;\r
+ ((EFI_IFR_NUMERIC *)OpCodeData)->data.u32.Step = (UINT32)CurrentStatement->Step;\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_32;\r
+ break;\r
+ default:\r
+ break;\r
+ }\r
+ } else {\r
+ switch (CurrentStatement->Flags & EFI_IFR_NUMERIC_SIZE) {\r
+ case EFI_IFR_NUMERIC_SIZE_1:\r
+ CurrentStatement->Minimum = ((EFI_IFR_NUMERIC *)OpCodeData)->data.u8.MinValue;\r
+ CurrentStatement->Maximum = ((EFI_IFR_NUMERIC *)OpCodeData)->data.u8.MaxValue;\r
+ CurrentStatement->Step = ((EFI_IFR_NUMERIC *)OpCodeData)->data.u8.Step;\r
+ CurrentStatement->StorageWidth = (UINT16)sizeof (UINT8);\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;\r
+ break;\r
+\r
+ case EFI_IFR_NUMERIC_SIZE_2:\r
+ CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *)OpCodeData)->data.u16.MinValue, sizeof (UINT16));\r
+ CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *)OpCodeData)->data.u16.MaxValue, sizeof (UINT16));\r
+ CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *)OpCodeData)->data.u16.Step, sizeof (UINT16));\r
+ CurrentStatement->StorageWidth = (UINT16)sizeof (UINT16);\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;\r
+ break;\r
+\r
+ case EFI_IFR_NUMERIC_SIZE_4:\r
+ CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *)OpCodeData)->data.u32.MinValue, sizeof (UINT32));\r
+ CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *)OpCodeData)->data.u32.MaxValue, sizeof (UINT32));\r
+ CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *)OpCodeData)->data.u32.Step, sizeof (UINT32));\r
+ CurrentStatement->StorageWidth = (UINT16)sizeof (UINT32);\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_32;\r
+ break;\r
+\r
+ case EFI_IFR_NUMERIC_SIZE_8:\r
+ CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *)OpCodeData)->data.u64.MinValue, sizeof (UINT64));\r
+ CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *)OpCodeData)->data.u64.MaxValue, sizeof (UINT64));\r
+ CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *)OpCodeData)->data.u64.Step, sizeof (UINT64));\r
+ CurrentStatement->StorageWidth = (UINT16)sizeof (UINT64);\r
+ Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;\r
+ break;\r
+\r
+ default:\r
+ break;\r
+ }\r
+ }\r
\r
- CurrentStatement->Flags = ((EFI_IFR_CHECKBOX *) OpCodeData)->Flags;\r
- CurrentStatement->StorageWidth = (UINT16) sizeof (BOOLEAN);\r
- CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_BOOLEAN;\r
+ InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
\r
- if (QuestionReferBitField) {\r
- //\r
- // Get the bit var store info (bit/byte offset, bit/byte offset)\r
- //\r
- CurrentStatement->QuestionReferToBitField = TRUE;\r
- CurrentStatement->BitStorageWidth = 1;\r
- CurrentStatement->BitVarOffset = CurrentStatement->VarStoreInfo.VarOffset;\r
- CurrentStatement->VarStoreInfo.VarOffset = CurrentStatement->BitVarOffset / 8;\r
- TotalBits = CurrentStatement->BitVarOffset % 8 + CurrentStatement->BitStorageWidth;\r
- CurrentStatement->StorageWidth = (TotalBits % 8 == 0? TotalBits / 8: TotalBits / 8 + 1);\r
- }\r
+ if ((Operand == EFI_IFR_ONE_OF_OP) && (Scope != 0)) {\r
+ SuppressForOption = TRUE;\r
+ }\r
\r
- InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
+ break;\r
\r
- break;\r
+ case EFI_IFR_ORDERED_LIST_OP:\r
+ CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
\r
- case EFI_IFR_STRING_OP:\r
- CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
- ASSERT (CurrentStatement != NULL);\r
- //\r
- // MinSize is the minimum number of characters that can be accepted for this opcode,\r
- // MaxSize is the maximum number of characters that can be accepted for this opcode.\r
- // The characters are stored as Unicode, so the storage width should multiply 2.\r
- //\r
- CurrentStatement->Minimum = ((EFI_IFR_STRING *) OpCodeData)->MinSize;\r
- CurrentStatement->Maximum = ((EFI_IFR_STRING *) OpCodeData)->MaxSize;\r
- CurrentStatement->StorageWidth = (UINT16)((UINTN) CurrentStatement->Maximum * sizeof (CHAR16));\r
- CurrentStatement->Flags = ((EFI_IFR_STRING *) OpCodeData)->Flags;\r
+ CurrentStatement->Flags = ((EFI_IFR_ORDERED_LIST *)OpCodeData)->Flags;\r
+ CurrentStatement->MaxContainers = ((EFI_IFR_ORDERED_LIST *)OpCodeData)->MaxContainers;\r
\r
- CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_STRING;\r
- CurrentStatement->BufferValue = AllocateZeroPool (CurrentStatement->StorageWidth + sizeof (CHAR16));\r
- CurrentStatement->HiiValue.Value.string = NewString ((CHAR16*) CurrentStatement->BufferValue, FormSet->HiiHandle);\r
+ CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_BUFFER;\r
+ CurrentStatement->BufferValue = NULL;\r
\r
- InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
- break;\r
+ if (Scope != 0) {\r
+ SuppressForOption = TRUE;\r
+ }\r
\r
- case EFI_IFR_PASSWORD_OP:\r
- CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
- ASSERT (CurrentStatement != NULL);\r
- //\r
- // MinSize is the minimum number of characters that can be accepted for this opcode,\r
- // MaxSize is the maximum number of characters that can be accepted for this opcode.\r
- // The characters are stored as Unicode, so the storage width should multiply 2.\r
- //\r
- CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_PASSWORD *) OpCodeData)->MinSize, sizeof (UINT16));\r
- CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_PASSWORD *) OpCodeData)->MaxSize, sizeof (UINT16));\r
- CurrentStatement->StorageWidth = (UINT16)((UINTN) CurrentStatement->Maximum * sizeof (CHAR16));\r
+ break;\r
\r
- CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_STRING;\r
- CurrentStatement->BufferValue = AllocateZeroPool ((CurrentStatement->StorageWidth + sizeof (CHAR16)));\r
- CurrentStatement->HiiValue.Value.string = NewString ((CHAR16*) CurrentStatement->BufferValue, FormSet->HiiHandle);\r
+ case EFI_IFR_CHECKBOX_OP:\r
+ CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
\r
- InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
- break;\r
+ CurrentStatement->Flags = ((EFI_IFR_CHECKBOX *)OpCodeData)->Flags;\r
+ CurrentStatement->StorageWidth = (UINT16)sizeof (BOOLEAN);\r
+ CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_BOOLEAN;\r
\r
- case EFI_IFR_DATE_OP:\r
- CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
- ASSERT(CurrentStatement != NULL);\r
+ if (QuestionReferBitField) {\r
+ //\r
+ // Get the bit var store info (bit/byte offset, bit/byte offset)\r
+ //\r
+ CurrentStatement->QuestionReferToBitField = TRUE;\r
+ CurrentStatement->BitStorageWidth = 1;\r
+ CurrentStatement->BitVarOffset = CurrentStatement->VarStoreInfo.VarOffset;\r
+ CurrentStatement->VarStoreInfo.VarOffset = CurrentStatement->BitVarOffset / 8;\r
+ TotalBits = CurrentStatement->BitVarOffset % 8 + CurrentStatement->BitStorageWidth;\r
+ CurrentStatement->StorageWidth = (TotalBits % 8 == 0 ? TotalBits / 8 : TotalBits / 8 + 1);\r
+ }\r
\r
- CurrentStatement->Flags = ((EFI_IFR_DATE *) OpCodeData)->Flags;\r
- CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_DATE;\r
+ InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
\r
- if ((CurrentStatement->Flags & EFI_QF_DATE_STORAGE) == QF_DATE_STORAGE_NORMAL) {\r
- CurrentStatement->StorageWidth = (UINT16) sizeof (EFI_HII_DATE);\r
+ break;\r
\r
- InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
- } else {\r
+ case EFI_IFR_STRING_OP:\r
+ CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
//\r
- // Don't assign storage for RTC type of date/time\r
+ // MinSize is the minimum number of characters that can be accepted for this opcode,\r
+ // MaxSize is the maximum number of characters that can be accepted for this opcode.\r
+ // The characters are stored as Unicode, so the storage width should multiply 2.\r
//\r
- CurrentStatement->Storage = NULL;\r
- CurrentStatement->StorageWidth = 0;\r
- }\r
- break;\r
-\r
- case EFI_IFR_TIME_OP:\r
- CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
- ASSERT(CurrentStatement != NULL);\r
-\r
- CurrentStatement->Flags = ((EFI_IFR_TIME *) OpCodeData)->Flags;\r
- CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_TIME;\r
+ CurrentStatement->Minimum = ((EFI_IFR_STRING *)OpCodeData)->MinSize;\r
+ CurrentStatement->Maximum = ((EFI_IFR_STRING *)OpCodeData)->MaxSize;\r
+ CurrentStatement->StorageWidth = (UINT16)((UINTN)CurrentStatement->Maximum * sizeof (CHAR16));\r
+ CurrentStatement->Flags = ((EFI_IFR_STRING *)OpCodeData)->Flags;\r
\r
- if ((CurrentStatement->Flags & QF_TIME_STORAGE) == QF_TIME_STORAGE_NORMAL) {\r
- CurrentStatement->StorageWidth = (UINT16) sizeof (EFI_HII_TIME);\r
+ CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_STRING;\r
+ CurrentStatement->BufferValue = AllocateZeroPool (CurrentStatement->StorageWidth + sizeof (CHAR16));\r
+ CurrentStatement->HiiValue.Value.string = NewString ((CHAR16 *)CurrentStatement->BufferValue, FormSet->HiiHandle);\r
\r
InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
- } else {\r
+ break;\r
+\r
+ case EFI_IFR_PASSWORD_OP:\r
+ CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
//\r
- // Don't assign storage for RTC type of date/time\r
+ // MinSize is the minimum number of characters that can be accepted for this opcode,\r
+ // MaxSize is the maximum number of characters that can be accepted for this opcode.\r
+ // The characters are stored as Unicode, so the storage width should multiply 2.\r
//\r
- CurrentStatement->Storage = NULL;\r
- CurrentStatement->StorageWidth = 0;\r
- }\r
- break;\r
+ CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_PASSWORD *)OpCodeData)->MinSize, sizeof (UINT16));\r
+ CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_PASSWORD *)OpCodeData)->MaxSize, sizeof (UINT16));\r
+ CurrentStatement->StorageWidth = (UINT16)((UINTN)CurrentStatement->Maximum * sizeof (CHAR16));\r
\r
- //\r
- // Default\r
- //\r
- case EFI_IFR_DEFAULT_OP:\r
- //\r
- // EFI_IFR_DEFAULT appear in scope of a Question,\r
- // It creates a default value for the current question.\r
- // A Question may have more than one Default value which have different default types.\r
- //\r
- CurrentDefault = AllocateZeroPool (sizeof (QUESTION_DEFAULT));\r
- ASSERT (CurrentDefault != NULL);\r
- CurrentDefault->Signature = QUESTION_DEFAULT_SIGNATURE;\r
-\r
- CurrentDefault->Value.Type = ((EFI_IFR_DEFAULT *) OpCodeData)->Type;\r
- CopyMem (&CurrentDefault->DefaultId, &((EFI_IFR_DEFAULT *) OpCodeData)->DefaultId, sizeof (UINT16));\r
- if (CurrentDefault->Value.Type == EFI_IFR_TYPE_BUFFER) {\r
- CurrentDefault->Value.BufferLen = (UINT16) (OpCodeLength - OFFSET_OF (EFI_IFR_DEFAULT, Value));\r
- CurrentDefault->Value.Buffer = AllocateCopyPool (CurrentDefault->Value.BufferLen, &((EFI_IFR_DEFAULT *) OpCodeData)->Value);\r
- ASSERT (CurrentDefault->Value.Buffer != NULL);\r
- } else {\r
- CopyMem (&CurrentDefault->Value.Value, &((EFI_IFR_DEFAULT *) OpCodeData)->Value, OpCodeLength - OFFSET_OF (EFI_IFR_DEFAULT, Value));\r
- ExtendValueToU64 (&CurrentDefault->Value);\r
- }\r
+ CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_STRING;\r
+ CurrentStatement->BufferValue = AllocateZeroPool ((CurrentStatement->StorageWidth + sizeof (CHAR16)));\r
+ CurrentStatement->HiiValue.Value.string = NewString ((CHAR16 *)CurrentStatement->BufferValue, FormSet->HiiHandle);\r
\r
- //\r
- // Insert to Default Value list of current Question\r
- //\r
- InsertTailList (&ParentStatement->DefaultListHead, &CurrentDefault->Link);\r
+ InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
+ break;\r
\r
- if (Scope != 0) {\r
- InScopeDefault = TRUE;\r
- }\r
- break;\r
+ case EFI_IFR_DATE_OP:\r
+ CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
\r
- //\r
- // Option\r
- //\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
- ASSERT (ParentStatement != NULL);\r
- if (ParentStatement->Operand == EFI_IFR_ORDERED_LIST_OP && ((((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Flags & (EFI_IFR_OPTION_DEFAULT | EFI_IFR_OPTION_DEFAULT_MFG)) != 0)) {\r
+ CurrentStatement->Flags = ((EFI_IFR_DATE *)OpCodeData)->Flags;\r
+ CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_DATE;\r
+\r
+ if ((CurrentStatement->Flags & EFI_QF_DATE_STORAGE) == QF_DATE_STORAGE_NORMAL) {\r
+ CurrentStatement->StorageWidth = (UINT16)sizeof (EFI_HII_DATE);\r
+\r
+ InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
+ } else {\r
+ //\r
+ // Don't assign storage for RTC type of date/time\r
+ //\r
+ CurrentStatement->Storage = NULL;\r
+ CurrentStatement->StorageWidth = 0;\r
+ }\r
+\r
+ break;\r
+\r
+ case EFI_IFR_TIME_OP:\r
+ CurrentStatement = CreateQuestion (OpCodeData, FormSet, CurrentForm);\r
+ ASSERT (CurrentStatement != NULL);\r
+\r
+ CurrentStatement->Flags = ((EFI_IFR_TIME *)OpCodeData)->Flags;\r
+ CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_TIME;\r
+\r
+ if ((CurrentStatement->Flags & QF_TIME_STORAGE) == QF_TIME_STORAGE_NORMAL) {\r
+ CurrentStatement->StorageWidth = (UINT16)sizeof (EFI_HII_TIME);\r
+\r
+ InitializeRequestElement (FormSet, CurrentStatement, CurrentForm);\r
+ } else {\r
+ //\r
+ // Don't assign storage for RTC type of date/time\r
+ //\r
+ CurrentStatement->Storage = NULL;\r
+ CurrentStatement->StorageWidth = 0;\r
+ }\r
+\r
+ break;\r
+\r
+ //\r
+ // Default\r
+ //\r
+ case EFI_IFR_DEFAULT_OP:\r
//\r
- // It's keep the default value for ordered list opcode.\r
+ // EFI_IFR_DEFAULT appear in scope of a Question,\r
+ // It creates a default value for the current question.\r
+ // A Question may have more than one Default value which have different default types.\r
//\r
CurrentDefault = AllocateZeroPool (sizeof (QUESTION_DEFAULT));\r
ASSERT (CurrentDefault != NULL);\r
CurrentDefault->Signature = QUESTION_DEFAULT_SIGNATURE;\r
\r
- CurrentDefault->Value.Type = EFI_IFR_TYPE_BUFFER;\r
- if ((((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Flags & EFI_IFR_OPTION_DEFAULT) != 0) {\r
- CurrentDefault->DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
+ CurrentDefault->Value.Type = ((EFI_IFR_DEFAULT *)OpCodeData)->Type;\r
+ CopyMem (&CurrentDefault->DefaultId, &((EFI_IFR_DEFAULT *)OpCodeData)->DefaultId, sizeof (UINT16));\r
+ if (CurrentDefault->Value.Type == EFI_IFR_TYPE_BUFFER) {\r
+ CurrentDefault->Value.BufferLen = (UINT16)(OpCodeLength - OFFSET_OF (EFI_IFR_DEFAULT, Value));\r
+ CurrentDefault->Value.Buffer = AllocateCopyPool (CurrentDefault->Value.BufferLen, &((EFI_IFR_DEFAULT *)OpCodeData)->Value);\r
+ ASSERT (CurrentDefault->Value.Buffer != NULL);\r
} else {\r
- CurrentDefault->DefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;\r
+ CopyMem (&CurrentDefault->Value.Value, &((EFI_IFR_DEFAULT *)OpCodeData)->Value, OpCodeLength - OFFSET_OF (EFI_IFR_DEFAULT, Value));\r
+ ExtendValueToU64 (&CurrentDefault->Value);\r
}\r
\r
- CurrentDefault->Value.BufferLen = (UINT16) (OpCodeLength - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
- CurrentDefault->Value.Buffer = AllocateCopyPool (CurrentDefault->Value.BufferLen, &((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Value);\r
- ASSERT (CurrentDefault->Value.Buffer != NULL);\r
-\r
//\r
// Insert to Default Value list of current Question\r
//\r
InsertTailList (&ParentStatement->DefaultListHead, &CurrentDefault->Link);\r
- break;\r
- }\r
\r
- //\r
- // EFI_IFR_ONE_OF_OPTION appear in scope of a Question.\r
- // It create a selection for use in current Question.\r
- //\r
- CurrentOption = AllocateZeroPool (sizeof (QUESTION_OPTION));\r
- ASSERT (CurrentOption != NULL);\r
- CurrentOption->Signature = QUESTION_OPTION_SIGNATURE;\r
- CurrentOption->OpCode = (EFI_IFR_ONE_OF_OPTION *) OpCodeData;\r
-\r
- CurrentOption->Flags = ((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Flags;\r
- CurrentOption->Value.Type = ((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Type;\r
- CopyMem (&CurrentOption->Text, &((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Option, sizeof (EFI_STRING_ID));\r
- CopyMem (&CurrentOption->Value.Value, &((EFI_IFR_ONE_OF_OPTION *) OpCodeData)->Value, OpCodeLength - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
- ExtendValueToU64 (&CurrentOption->Value);\r
-\r
- ConditionalExprCount = GetConditionalExpressionCount(ExpressOption);\r
- if ( ConditionalExprCount > 0) {\r
- //\r
- // Form is inside of suppressif\r
- //\r
- CurrentOption->SuppressExpression = (FORM_EXPRESSION_LIST *) AllocatePool(\r
- (UINTN) (sizeof(FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof(FORM_EXPRESSION *))));\r
- ASSERT (CurrentOption->SuppressExpression != NULL);\r
- CurrentOption->SuppressExpression->Count = (UINTN) ConditionalExprCount;\r
- CurrentOption->SuppressExpression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
- CopyMem (CurrentOption->SuppressExpression->Expression, GetConditionalExpressionList(ExpressOption), (UINTN) (sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
- }\r
+ if (Scope != 0) {\r
+ InScopeDefault = TRUE;\r
+ }\r
+\r
+ break;\r
\r
//\r
- // Insert to Option list of current Question\r
- //\r
- InsertTailList (&ParentStatement->OptionListHead, &CurrentOption->Link);\r
- //\r
- // Now we know the Storage width of nested Ordered List\r
+ // Option\r
//\r
- if ((ParentStatement->Operand == EFI_IFR_ORDERED_LIST_OP) && (ParentStatement->BufferValue == NULL)) {\r
- Width = 1;\r
- switch (CurrentOption->Value.Type) {\r
- case EFI_IFR_TYPE_NUM_SIZE_8:\r
- Width = 1;\r
- break;\r
-\r
- case EFI_IFR_TYPE_NUM_SIZE_16:\r
- Width = 2;\r
- break;\r
+ case EFI_IFR_ONE_OF_OPTION_OP:\r
+ ASSERT (ParentStatement != NULL);\r
+ if ((ParentStatement->Operand == EFI_IFR_ORDERED_LIST_OP) && ((((EFI_IFR_ONE_OF_OPTION *)OpCodeData)->Flags & (EFI_IFR_OPTION_DEFAULT | EFI_IFR_OPTION_DEFAULT_MFG)) != 0)) {\r
+ //\r
+ // It's keep the default value for ordered list opcode.\r
+ //\r
+ CurrentDefault = AllocateZeroPool (sizeof (QUESTION_DEFAULT));\r
+ ASSERT (CurrentDefault != NULL);\r
+ CurrentDefault->Signature = QUESTION_DEFAULT_SIGNATURE;\r
\r
- case EFI_IFR_TYPE_NUM_SIZE_32:\r
- Width = 4;\r
- break;\r
+ CurrentDefault->Value.Type = EFI_IFR_TYPE_BUFFER;\r
+ if ((((EFI_IFR_ONE_OF_OPTION *)OpCodeData)->Flags & EFI_IFR_OPTION_DEFAULT) != 0) {\r
+ CurrentDefault->DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
+ } else {\r
+ CurrentDefault->DefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;\r
+ }\r
\r
- case EFI_IFR_TYPE_NUM_SIZE_64:\r
- Width = 8;\r
- break;\r
+ CurrentDefault->Value.BufferLen = (UINT16)(OpCodeLength - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
+ CurrentDefault->Value.Buffer = AllocateCopyPool (CurrentDefault->Value.BufferLen, &((EFI_IFR_ONE_OF_OPTION *)OpCodeData)->Value);\r
+ ASSERT (CurrentDefault->Value.Buffer != NULL);\r
\r
- default:\r
//\r
- // Invalid type for Ordered List\r
+ // Insert to Default Value list of current Question\r
//\r
+ InsertTailList (&ParentStatement->DefaultListHead, &CurrentDefault->Link);\r
break;\r
}\r
\r
- ParentStatement->StorageWidth = (UINT16) (ParentStatement->MaxContainers * Width);\r
- ParentStatement->BufferValue = AllocateZeroPool (ParentStatement->StorageWidth);\r
- ParentStatement->ValueType = CurrentOption->Value.Type;\r
- if (ParentStatement->HiiValue.Type == EFI_IFR_TYPE_BUFFER) {\r
- ParentStatement->HiiValue.Buffer = ParentStatement->BufferValue;\r
- ParentStatement->HiiValue.BufferLen = ParentStatement->StorageWidth;\r
- }\r
+ //\r
+ // EFI_IFR_ONE_OF_OPTION appear in scope of a Question.\r
+ // It create a selection for use in current Question.\r
+ //\r
+ CurrentOption = AllocateZeroPool (sizeof (QUESTION_OPTION));\r
+ ASSERT (CurrentOption != NULL);\r
+ CurrentOption->Signature = QUESTION_OPTION_SIGNATURE;\r
+ CurrentOption->OpCode = (EFI_IFR_ONE_OF_OPTION *)OpCodeData;\r
\r
- InitializeRequestElement (FormSet, ParentStatement, CurrentForm);\r
- }\r
- break;\r
+ CurrentOption->Flags = ((EFI_IFR_ONE_OF_OPTION *)OpCodeData)->Flags;\r
+ CurrentOption->Value.Type = ((EFI_IFR_ONE_OF_OPTION *)OpCodeData)->Type;\r
+ CopyMem (&CurrentOption->Text, &((EFI_IFR_ONE_OF_OPTION *)OpCodeData)->Option, sizeof (EFI_STRING_ID));\r
+ CopyMem (&CurrentOption->Value.Value, &((EFI_IFR_ONE_OF_OPTION *)OpCodeData)->Value, OpCodeLength - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
+ ExtendValueToU64 (&CurrentOption->Value);\r
\r
- //\r
- // Conditional\r
- //\r
- case EFI_IFR_NO_SUBMIT_IF_OP:\r
- case EFI_IFR_INCONSISTENT_IF_OP:\r
- //\r
- // Create an Expression node\r
- //\r
- CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
- CopyMem (&CurrentExpression->Error, &((EFI_IFR_INCONSISTENT_IF *) OpCodeData)->Error, sizeof (EFI_STRING_ID));\r
+ ConditionalExprCount = GetConditionalExpressionCount (ExpressOption);\r
+ if ( ConditionalExprCount > 0) {\r
+ //\r
+ // Form is inside of suppressif\r
+ //\r
+ CurrentOption->SuppressExpression = (FORM_EXPRESSION_LIST *)AllocatePool (\r
+ (UINTN)(sizeof (FORM_EXPRESSION_LIST) + ((ConditionalExprCount -1) * sizeof (FORM_EXPRESSION *)))\r
+ );\r
+ ASSERT (CurrentOption->SuppressExpression != NULL);\r
+ CurrentOption->SuppressExpression->Count = (UINTN)ConditionalExprCount;\r
+ CurrentOption->SuppressExpression->Signature = FORM_EXPRESSION_LIST_SIGNATURE;\r
+ CopyMem (CurrentOption->SuppressExpression->Expression, GetConditionalExpressionList (ExpressOption), (UINTN)(sizeof (FORM_EXPRESSION *) * ConditionalExprCount));\r
+ }\r
\r
- if (Operand == EFI_IFR_NO_SUBMIT_IF_OP) {\r
- CurrentExpression->Type = EFI_HII_EXPRESSION_NO_SUBMIT_IF;\r
- InsertTailList (&ParentStatement->NoSubmitListHead, &CurrentExpression->Link);\r
- } else {\r
- CurrentExpression->Type = EFI_HII_EXPRESSION_INCONSISTENT_IF;\r
- InsertTailList (&ParentStatement->InconsistentListHead, &CurrentExpression->Link);\r
- }\r
+ //\r
+ // Insert to Option list of current Question\r
+ //\r
+ InsertTailList (&ParentStatement->OptionListHead, &CurrentOption->Link);\r
+ //\r
+ // Now we know the Storage width of nested Ordered List\r
+ //\r
+ if ((ParentStatement->Operand == EFI_IFR_ORDERED_LIST_OP) && (ParentStatement->BufferValue == NULL)) {\r
+ Width = 1;\r
+ switch (CurrentOption->Value.Type) {\r
+ case EFI_IFR_TYPE_NUM_SIZE_8:\r
+ Width = 1;\r
+ break;\r
+\r
+ case EFI_IFR_TYPE_NUM_SIZE_16:\r
+ Width = 2;\r
+ break;\r
+\r
+ case EFI_IFR_TYPE_NUM_SIZE_32:\r
+ Width = 4;\r
+ break;\r
+\r
+ case EFI_IFR_TYPE_NUM_SIZE_64:\r
+ Width = 8;\r
+ break;\r
+\r
+ default:\r
+ //\r
+ // Invalid type for Ordered List\r
+ //\r
+ break;\r
+ }\r
\r
- //\r
- // Take a look at next OpCode to see whether current expression consists\r
- // of single OpCode\r
- //\r
- if (((EFI_IFR_OP_HEADER *) (OpCodeData + OpCodeLength))->Scope == 0) {\r
- SingleOpCodeExpression = TRUE;\r
- }\r
- break;\r
+ ParentStatement->StorageWidth = (UINT16)(ParentStatement->MaxContainers * Width);\r
+ ParentStatement->BufferValue = AllocateZeroPool (ParentStatement->StorageWidth);\r
+ ParentStatement->ValueType = CurrentOption->Value.Type;\r
+ if (ParentStatement->HiiValue.Type == EFI_IFR_TYPE_BUFFER) {\r
+ ParentStatement->HiiValue.Buffer = ParentStatement->BufferValue;\r
+ ParentStatement->HiiValue.BufferLen = ParentStatement->StorageWidth;\r
+ }\r
\r
- case EFI_IFR_WARNING_IF_OP:\r
- //\r
- // Create an Expression node\r
- //\r
- CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
- CopyMem (&CurrentExpression->Error, &((EFI_IFR_WARNING_IF *) OpCodeData)->Warning, sizeof (EFI_STRING_ID));\r
- CurrentExpression->TimeOut = ((EFI_IFR_WARNING_IF *) OpCodeData)->TimeOut;\r
- CurrentExpression->Type = EFI_HII_EXPRESSION_WARNING_IF;\r
- InsertTailList (&ParentStatement->WarningListHead, &CurrentExpression->Link);\r
+ InitializeRequestElement (FormSet, ParentStatement, CurrentForm);\r
+ }\r
\r
- //\r
- // Take a look at next OpCode to see whether current expression consists\r
- // of single OpCode\r
- //\r
- if (((EFI_IFR_OP_HEADER *) (OpCodeData + OpCodeLength))->Scope == 0) {\r
- SingleOpCodeExpression = TRUE;\r
- }\r
- break;\r
+ break;\r
\r
- case EFI_IFR_SUPPRESS_IF_OP:\r
//\r
- // Question and Option will appear in scope of this OpCode\r
+ // Conditional\r
//\r
- CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
- CurrentExpression->Type = EFI_HII_EXPRESSION_SUPPRESS_IF;\r
+ case EFI_IFR_NO_SUBMIT_IF_OP:\r
+ case EFI_IFR_INCONSISTENT_IF_OP:\r
+ //\r
+ // Create an Expression node\r
+ //\r
+ CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
+ CopyMem (&CurrentExpression->Error, &((EFI_IFR_INCONSISTENT_IF *)OpCodeData)->Error, sizeof (EFI_STRING_ID));\r
\r
- if (CurrentForm == NULL) {\r
- InsertTailList (&FormSet->ExpressionListHead, &CurrentExpression->Link);\r
- } else {\r
- InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
- }\r
+ if (Operand == EFI_IFR_NO_SUBMIT_IF_OP) {\r
+ CurrentExpression->Type = EFI_HII_EXPRESSION_NO_SUBMIT_IF;\r
+ InsertTailList (&ParentStatement->NoSubmitListHead, &CurrentExpression->Link);\r
+ } else {\r
+ CurrentExpression->Type = EFI_HII_EXPRESSION_INCONSISTENT_IF;\r
+ InsertTailList (&ParentStatement->InconsistentListHead, &CurrentExpression->Link);\r
+ }\r
\r
- if (SuppressForOption) {\r
- PushConditionalExpression(CurrentExpression, ExpressOption);\r
- } else if (SuppressForQuestion) {\r
- PushConditionalExpression(CurrentExpression, ExpressStatement);\r
- } else {\r
- PushConditionalExpression(CurrentExpression, ExpressForm);\r
- }\r
+ //\r
+ // Take a look at next OpCode to see whether current expression consists\r
+ // of single OpCode\r
+ //\r
+ if (((EFI_IFR_OP_HEADER *)(OpCodeData + OpCodeLength))->Scope == 0) {\r
+ SingleOpCodeExpression = TRUE;\r
+ }\r
\r
- //\r
- // Take a look at next OpCode to see whether current expression consists\r
- // of single OpCode\r
- //\r
- if (((EFI_IFR_OP_HEADER *) (OpCodeData + OpCodeLength))->Scope == 0) {\r
- SingleOpCodeExpression = TRUE;\r
- }\r
- break;\r
+ break;\r
\r
- case EFI_IFR_GRAY_OUT_IF_OP:\r
- //\r
- // Questions will appear in scope of this OpCode\r
- //\r
- CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
- CurrentExpression->Type = EFI_HII_EXPRESSION_GRAY_OUT_IF;\r
- InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
- PushConditionalExpression(CurrentExpression, ExpressStatement);\r
+ case EFI_IFR_WARNING_IF_OP:\r
+ //\r
+ // Create an Expression node\r
+ //\r
+ CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
+ CopyMem (&CurrentExpression->Error, &((EFI_IFR_WARNING_IF *)OpCodeData)->Warning, sizeof (EFI_STRING_ID));\r
+ CurrentExpression->TimeOut = ((EFI_IFR_WARNING_IF *)OpCodeData)->TimeOut;\r
+ CurrentExpression->Type = EFI_HII_EXPRESSION_WARNING_IF;\r
+ InsertTailList (&ParentStatement->WarningListHead, &CurrentExpression->Link);\r
\r
- //\r
- // Take a look at next OpCode to see whether current expression consists\r
- // of single OpCode\r
- //\r
- if (((EFI_IFR_OP_HEADER *) (OpCodeData + OpCodeLength))->Scope == 0) {\r
- SingleOpCodeExpression = TRUE;\r
- }\r
- break;\r
+ //\r
+ // Take a look at next OpCode to see whether current expression consists\r
+ // of single OpCode\r
+ //\r
+ if (((EFI_IFR_OP_HEADER *)(OpCodeData + OpCodeLength))->Scope == 0) {\r
+ SingleOpCodeExpression = TRUE;\r
+ }\r
\r
- case EFI_IFR_DISABLE_IF_OP:\r
- //\r
- // The DisableIf expression should only rely on constant, so it could be\r
- // evaluated at initialization and it will not be queued\r
- //\r
- CurrentExpression = AllocateZeroPool (sizeof (FORM_EXPRESSION));\r
- ASSERT (CurrentExpression != NULL);\r
- CurrentExpression->Signature = FORM_EXPRESSION_SIGNATURE;\r
- CurrentExpression->Type = EFI_HII_EXPRESSION_DISABLE_IF;\r
- InitializeListHead (&CurrentExpression->OpCodeListHead);\r
+ break;\r
\r
- if (CurrentForm != NULL) {\r
+ case EFI_IFR_SUPPRESS_IF_OP:\r
//\r
- // This is DisableIf for Question, enqueue it to Form expression list\r
+ // Question and Option will appear in scope of this OpCode\r
//\r
- InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
- PushConditionalExpression(CurrentExpression, ExpressStatement);\r
- }\r
+ CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
+ CurrentExpression->Type = EFI_HII_EXPRESSION_SUPPRESS_IF;\r
\r
- OpCodeDisabled = FALSE;\r
- InScopeDisable = TRUE;\r
- //\r
- // Take a look at next OpCode to see whether current expression consists\r
- // of single OpCode\r
- //\r
- if (((EFI_IFR_OP_HEADER *) (OpCodeData + OpCodeLength))->Scope == 0) {\r
- SingleOpCodeExpression = TRUE;\r
- }\r
- break;\r
+ if (CurrentForm == NULL) {\r
+ InsertTailList (&FormSet->ExpressionListHead, &CurrentExpression->Link);\r
+ } else {\r
+ InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
+ }\r
\r
- //\r
- // Expression\r
- //\r
- case EFI_IFR_VALUE_OP:\r
- CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
- CurrentExpression->Type = EFI_HII_EXPRESSION_VALUE;\r
- InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
+ if (SuppressForOption) {\r
+ PushConditionalExpression (CurrentExpression, ExpressOption);\r
+ } else if (SuppressForQuestion) {\r
+ PushConditionalExpression (CurrentExpression, ExpressStatement);\r
+ } else {\r
+ PushConditionalExpression (CurrentExpression, ExpressForm);\r
+ }\r
\r
- if (InScopeDefault) {\r
//\r
- // Used for default (EFI_IFR_DEFAULT)\r
+ // Take a look at next OpCode to see whether current expression consists\r
+ // of single OpCode\r
//\r
- CurrentDefault->ValueExpression = CurrentExpression;\r
- } else {\r
+ if (((EFI_IFR_OP_HEADER *)(OpCodeData + OpCodeLength))->Scope == 0) {\r
+ SingleOpCodeExpression = TRUE;\r
+ }\r
+\r
+ break;\r
+\r
+ case EFI_IFR_GRAY_OUT_IF_OP:\r
//\r
- // If used for a question, then the question will be read-only\r
+ // Questions will appear in scope of this OpCode\r
//\r
+ CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
+ CurrentExpression->Type = EFI_HII_EXPRESSION_GRAY_OUT_IF;\r
+ InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
+ PushConditionalExpression (CurrentExpression, ExpressStatement);\r
+\r
//\r
- // Make sure CurrentStatement is not NULL.\r
- // If it is NULL, 1) ParseOpCodes functions may parse the IFR wrongly. Or 2) the IFR\r
- // file is wrongly generated by tools such as VFR Compiler. There may be a bug in VFR Compiler.\r
+ // Take a look at next OpCode to see whether current expression consists\r
+ // of single OpCode\r
//\r
- ASSERT (ParentStatement != NULL);\r
- ParentStatement->ValueExpression = CurrentExpression;\r
- }\r
+ if (((EFI_IFR_OP_HEADER *)(OpCodeData + OpCodeLength))->Scope == 0) {\r
+ SingleOpCodeExpression = TRUE;\r
+ }\r
\r
- //\r
- // Take a look at next OpCode to see whether current expression consists\r
- // of single OpCode\r
- //\r
- if (((EFI_IFR_OP_HEADER *) (OpCodeData + OpCodeLength))->Scope == 0) {\r
- SingleOpCodeExpression = TRUE;\r
- }\r
- break;\r
+ break;\r
\r
- case EFI_IFR_RULE_OP:\r
- CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
- CurrentExpression->Type = EFI_HII_EXPRESSION_RULE;\r
+ case EFI_IFR_DISABLE_IF_OP:\r
+ //\r
+ // The DisableIf expression should only rely on constant, so it could be\r
+ // evaluated at initialization and it will not be queued\r
+ //\r
+ CurrentExpression = AllocateZeroPool (sizeof (FORM_EXPRESSION));\r
+ ASSERT (CurrentExpression != NULL);\r
+ CurrentExpression->Signature = FORM_EXPRESSION_SIGNATURE;\r
+ CurrentExpression->Type = EFI_HII_EXPRESSION_DISABLE_IF;\r
+ InitializeListHead (&CurrentExpression->OpCodeListHead);\r
\r
- CurrentExpression->RuleId = ((EFI_IFR_RULE *) OpCodeData)->RuleId;\r
- InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
+ if (CurrentForm != NULL) {\r
+ //\r
+ // This is DisableIf for Question, enqueue it to Form expression list\r
+ //\r
+ InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
+ PushConditionalExpression (CurrentExpression, ExpressStatement);\r
+ }\r
\r
- //\r
- // Take a look at next OpCode to see whether current expression consists\r
- // of single OpCode\r
- //\r
- if (((EFI_IFR_OP_HEADER *) (OpCodeData + OpCodeLength))->Scope == 0) {\r
- SingleOpCodeExpression = TRUE;\r
- }\r
- break;\r
+ OpCodeDisabled = FALSE;\r
+ InScopeDisable = TRUE;\r
+ //\r
+ // Take a look at next OpCode to see whether current expression consists\r
+ // of single OpCode\r
+ //\r
+ if (((EFI_IFR_OP_HEADER *)(OpCodeData + OpCodeLength))->Scope == 0) {\r
+ SingleOpCodeExpression = TRUE;\r
+ }\r
\r
- case EFI_IFR_READ_OP:\r
- CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
- CurrentExpression->Type = EFI_HII_EXPRESSION_READ;\r
- InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
+ break;\r
\r
//\r
- // Make sure CurrentStatement is not NULL.\r
- // If it is NULL, 1) ParseOpCodes functions may parse the IFR wrongly. Or 2) the IFR\r
- // file is wrongly generated by tools such as VFR Compiler. There may be a bug in VFR Compiler.\r
+ // Expression\r
//\r
- ASSERT (ParentStatement != NULL);\r
- ParentStatement->ReadExpression = CurrentExpression;\r
+ case EFI_IFR_VALUE_OP:\r
+ CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
+ CurrentExpression->Type = EFI_HII_EXPRESSION_VALUE;\r
+ InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
\r
- //\r
- // Take a look at next OpCode to see whether current expression consists\r
- // of single OpCode\r
- //\r
- if (((EFI_IFR_OP_HEADER *) (OpCodeData + OpCodeLength))->Scope == 0) {\r
- SingleOpCodeExpression = TRUE;\r
- }\r
- break;\r
+ if (InScopeDefault) {\r
+ //\r
+ // Used for default (EFI_IFR_DEFAULT)\r
+ //\r
+ CurrentDefault->ValueExpression = CurrentExpression;\r
+ } else {\r
+ //\r
+ // If used for a question, then the question will be read-only\r
+ //\r
+ //\r
+ // Make sure CurrentStatement is not NULL.\r
+ // If it is NULL, 1) ParseOpCodes functions may parse the IFR wrongly. Or 2) the IFR\r
+ // file is wrongly generated by tools such as VFR Compiler. There may be a bug in VFR Compiler.\r
+ //\r
+ ASSERT (ParentStatement != NULL);\r
+ ParentStatement->ValueExpression = CurrentExpression;\r
+ }\r
\r
- case EFI_IFR_WRITE_OP:\r
- CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
- CurrentExpression->Type = EFI_HII_EXPRESSION_WRITE;\r
- InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
+ //\r
+ // Take a look at next OpCode to see whether current expression consists\r
+ // of single OpCode\r
+ //\r
+ if (((EFI_IFR_OP_HEADER *)(OpCodeData + OpCodeLength))->Scope == 0) {\r
+ SingleOpCodeExpression = TRUE;\r
+ }\r
\r
- //\r
- // Make sure CurrentStatement is not NULL.\r
- // If it is NULL, 1) ParseOpCodes functions may parse the IFR wrongly. Or 2) the IFR\r
- // file is wrongly generated by tools such as VFR Compiler. There may be a bug in VFR Compiler.\r
- //\r
- ASSERT (ParentStatement != NULL);\r
- ParentStatement->WriteExpression = CurrentExpression;\r
+ break;\r
\r
- //\r
- // Take a look at next OpCode to see whether current expression consists\r
- // of single OpCode\r
- //\r
- if (((EFI_IFR_OP_HEADER *) (OpCodeData + OpCodeLength))->Scope == 0) {\r
- SingleOpCodeExpression = TRUE;\r
- }\r
- break;\r
+ case EFI_IFR_RULE_OP:\r
+ CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
+ CurrentExpression->Type = EFI_HII_EXPRESSION_RULE;\r
\r
- //\r
- // Image\r
- //\r
- case EFI_IFR_IMAGE_OP:\r
- //\r
- // Get ScopeOpcode from top of stack\r
- //\r
- PopScope (&ScopeOpCode);\r
- PushScope (ScopeOpCode);\r
+ CurrentExpression->RuleId = ((EFI_IFR_RULE *)OpCodeData)->RuleId;\r
+ InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
\r
- switch (ScopeOpCode) {\r
- case EFI_IFR_FORM_SET_OP:\r
- ImageId = &FormSet->ImageId;\r
- break;\r
+ //\r
+ // Take a look at next OpCode to see whether current expression consists\r
+ // of single OpCode\r
+ //\r
+ if (((EFI_IFR_OP_HEADER *)(OpCodeData + OpCodeLength))->Scope == 0) {\r
+ SingleOpCodeExpression = TRUE;\r
+ }\r
\r
- case EFI_IFR_FORM_OP:\r
- case EFI_IFR_FORM_MAP_OP:\r
- ASSERT (CurrentForm != NULL);\r
- ImageId = &CurrentForm->ImageId;\r
break;\r
\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
- ASSERT (CurrentOption != NULL);\r
- ImageId = &CurrentOption->ImageId;\r
- break;\r
+ case EFI_IFR_READ_OP:\r
+ CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
+ CurrentExpression->Type = EFI_HII_EXPRESSION_READ;\r
+ InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
\r
- default:\r
//\r
// Make sure CurrentStatement is not NULL.\r
// If it is NULL, 1) ParseOpCodes functions may parse the IFR wrongly. Or 2) the IFR\r
- // file is wrongly generated by tools such as VFR Compiler.\r
+ // file is wrongly generated by tools such as VFR Compiler. There may be a bug in VFR Compiler.\r
//\r
ASSERT (ParentStatement != NULL);\r
- ImageId = &ParentStatement->ImageId;\r
- break;\r
- }\r
-\r
- ASSERT (ImageId != NULL);\r
- CopyMem (ImageId, &((EFI_IFR_IMAGE *) OpCodeData)->Id, sizeof (EFI_IMAGE_ID));\r
- break;\r
-\r
- //\r
- // Refresh\r
- //\r
- case EFI_IFR_REFRESH_OP:\r
- ASSERT (ParentStatement != NULL);\r
- ParentStatement->RefreshInterval = ((EFI_IFR_REFRESH *) OpCodeData)->RefreshInterval;\r
- break;\r
+ ParentStatement->ReadExpression = CurrentExpression;\r
\r
- //\r
- // Refresh guid.\r
- //\r
- case EFI_IFR_REFRESH_ID_OP:\r
- //\r
- // Get ScopeOpcode from top of stack\r
- //\r
- PopScope (&ScopeOpCode);\r
- PushScope (ScopeOpCode);\r
+ //\r
+ // Take a look at next OpCode to see whether current expression consists\r
+ // of single OpCode\r
+ //\r
+ if (((EFI_IFR_OP_HEADER *)(OpCodeData + OpCodeLength))->Scope == 0) {\r
+ SingleOpCodeExpression = TRUE;\r
+ }\r
\r
- switch (ScopeOpCode) {\r
- case EFI_IFR_FORM_OP:\r
- case EFI_IFR_FORM_MAP_OP:\r
- ASSERT (CurrentForm != NULL);\r
- CopyMem (&CurrentForm->RefreshGuid, &((EFI_IFR_REFRESH_ID *) OpCodeData)->RefreshEventGroupId, sizeof (EFI_GUID));\r
break;\r
\r
- default:\r
+ case EFI_IFR_WRITE_OP:\r
+ CurrentExpression = CreateExpression (CurrentForm, OpCodeData);\r
+ CurrentExpression->Type = EFI_HII_EXPRESSION_WRITE;\r
+ InsertTailList (&CurrentForm->ExpressionListHead, &CurrentExpression->Link);\r
+\r
+ //\r
+ // Make sure CurrentStatement is not NULL.\r
+ // If it is NULL, 1) ParseOpCodes functions may parse the IFR wrongly. Or 2) the IFR\r
+ // file is wrongly generated by tools such as VFR Compiler. There may be a bug in VFR Compiler.\r
+ //\r
ASSERT (ParentStatement != NULL);\r
- CopyMem (&ParentStatement->RefreshGuid, &((EFI_IFR_REFRESH_ID *) OpCodeData)->RefreshEventGroupId, sizeof (EFI_GUID));\r
- break;\r
- }\r
- break;\r
+ ParentStatement->WriteExpression = CurrentExpression;\r
\r
- //\r
- // Modal tag\r
- //\r
- case EFI_IFR_MODAL_TAG_OP:\r
- ASSERT (CurrentForm != NULL);\r
- CurrentForm->ModalForm = TRUE;\r
- break;\r
+ //\r
+ // Take a look at next OpCode to see whether current expression consists\r
+ // of single OpCode\r
+ //\r
+ if (((EFI_IFR_OP_HEADER *)(OpCodeData + OpCodeLength))->Scope == 0) {\r
+ SingleOpCodeExpression = TRUE;\r
+ }\r
+\r
+ break;\r
\r
- //\r
- // Lock tag, used by form and statement.\r
- //\r
- case EFI_IFR_LOCKED_OP:\r
//\r
- // Get ScopeOpcode from top of stack\r
+ // Image\r
//\r
- PopScope (&ScopeOpCode);\r
- PushScope (ScopeOpCode);\r
- switch (ScopeOpCode) {\r
- case EFI_IFR_FORM_OP:\r
- case EFI_IFR_FORM_MAP_OP:\r
- ASSERT (CurrentForm != NULL);\r
- CurrentForm->Locked = TRUE;\r
- break;\r
+ case EFI_IFR_IMAGE_OP:\r
+ //\r
+ // Get ScopeOpcode from top of stack\r
+ //\r
+ PopScope (&ScopeOpCode);\r
+ PushScope (ScopeOpCode);\r
\r
- default:\r
- ASSERT (ParentStatement != NULL);\r
- ParentStatement->Locked = TRUE;\r
- }\r
- break;\r
+ switch (ScopeOpCode) {\r
+ case EFI_IFR_FORM_SET_OP:\r
+ ImageId = &FormSet->ImageId;\r
+ break;\r
\r
- //\r
- // Vendor specific\r
- //\r
- case EFI_IFR_GUID_OP:\r
- CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
- if (CompareGuid ((EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)), &gEdkiiIfrBitVarstoreGuid)) {\r
- Scope = 0;\r
- QuestionReferBitField = TRUE;\r
- }\r
- break;\r
+ case EFI_IFR_FORM_OP:\r
+ case EFI_IFR_FORM_MAP_OP:\r
+ ASSERT (CurrentForm != NULL);\r
+ ImageId = &CurrentForm->ImageId;\r
+ break;\r
\r
- //\r
- // Scope End\r
- //\r
- case EFI_IFR_END_OP:\r
- QuestionReferBitField = FALSE;\r
- Status = PopScope (&ScopeOpCode);\r
- if (EFI_ERROR (Status)) {\r
- ResetScopeStack ();\r
- return Status;\r
- }\r
+ case EFI_IFR_ONE_OF_OPTION_OP:\r
+ ASSERT (CurrentOption != NULL);\r
+ ImageId = &CurrentOption->ImageId;\r
+ break;\r
+\r
+ default:\r
+ //\r
+ // Make sure CurrentStatement is not NULL.\r
+ // If it is NULL, 1) ParseOpCodes functions may parse the IFR wrongly. Or 2) the IFR\r
+ // file is wrongly generated by tools such as VFR Compiler.\r
+ //\r
+ ASSERT (ParentStatement != NULL);\r
+ ImageId = &ParentStatement->ImageId;\r
+ break;\r
+ }\r
+\r
+ ASSERT (ImageId != NULL);\r
+ CopyMem (ImageId, &((EFI_IFR_IMAGE *)OpCodeData)->Id, sizeof (EFI_IMAGE_ID));\r
+ break;\r
\r
//\r
- // Parent statement end tag found, update ParentStatement info.\r
+ // Refresh\r
//\r
- if (IsStatementOpCode(ScopeOpCode) && (ParentStatement != NULL) && (ParentStatement->Operand == ScopeOpCode)) {\r
- ParentStatement = ParentStatement->ParentStatement;\r
- }\r
-\r
- switch (ScopeOpCode) {\r
- case EFI_IFR_FORM_SET_OP:\r
- //\r
- // End of FormSet, update FormSet IFR binary length\r
- // to stop parsing substantial OpCodes\r
- //\r
- FormSet->IfrBinaryLength = OpCodeOffset;\r
+ case EFI_IFR_REFRESH_OP:\r
+ ASSERT (ParentStatement != NULL);\r
+ ParentStatement->RefreshInterval = ((EFI_IFR_REFRESH *)OpCodeData)->RefreshInterval;\r
break;\r
\r
- case EFI_IFR_FORM_OP:\r
- case EFI_IFR_FORM_MAP_OP:\r
+ //\r
+ // Refresh guid.\r
+ //\r
+ case EFI_IFR_REFRESH_ID_OP:\r
//\r
- // End of Form\r
+ // Get ScopeOpcode from top of stack\r
//\r
- CurrentForm = NULL;\r
- SuppressForQuestion = FALSE;\r
+ PopScope (&ScopeOpCode);\r
+ PushScope (ScopeOpCode);\r
+\r
+ switch (ScopeOpCode) {\r
+ case EFI_IFR_FORM_OP:\r
+ case EFI_IFR_FORM_MAP_OP:\r
+ ASSERT (CurrentForm != NULL);\r
+ CopyMem (&CurrentForm->RefreshGuid, &((EFI_IFR_REFRESH_ID *)OpCodeData)->RefreshEventGroupId, sizeof (EFI_GUID));\r
+ break;\r
+\r
+ default:\r
+ ASSERT (ParentStatement != NULL);\r
+ CopyMem (&ParentStatement->RefreshGuid, &((EFI_IFR_REFRESH_ID *)OpCodeData)->RefreshEventGroupId, sizeof (EFI_GUID));\r
+ break;\r
+ }\r
+\r
break;\r
\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
- //\r
- // End of Option\r
- //\r
- CurrentOption = NULL;\r
+ //\r
+ // Modal tag\r
+ //\r
+ case EFI_IFR_MODAL_TAG_OP:\r
+ ASSERT (CurrentForm != NULL);\r
+ CurrentForm->ModalForm = TRUE;\r
break;\r
\r
- case EFI_IFR_NO_SUBMIT_IF_OP:\r
- case EFI_IFR_INCONSISTENT_IF_OP:\r
- case EFI_IFR_WARNING_IF_OP:\r
+ //\r
+ // Lock tag, used by form and statement.\r
+ //\r
+ case EFI_IFR_LOCKED_OP:\r
//\r
- // Ignore end of EFI_IFR_NO_SUBMIT_IF and EFI_IFR_INCONSISTENT_IF\r
+ // Get ScopeOpcode from top of stack\r
//\r
- break;\r
+ PopScope (&ScopeOpCode);\r
+ PushScope (ScopeOpCode);\r
+ switch (ScopeOpCode) {\r
+ case EFI_IFR_FORM_OP:\r
+ case EFI_IFR_FORM_MAP_OP:\r
+ ASSERT (CurrentForm != NULL);\r
+ CurrentForm->Locked = TRUE;\r
+ break;\r
\r
- case EFI_IFR_SUPPRESS_IF_OP:\r
- if (SuppressForOption) {\r
- PopConditionalExpression(ExpressOption);\r
- } else if (SuppressForQuestion) {\r
- PopConditionalExpression(ExpressStatement);\r
- } else {\r
- PopConditionalExpression(ExpressForm);\r
+ default:\r
+ ASSERT (ParentStatement != NULL);\r
+ ParentStatement->Locked = TRUE;\r
}\r
- break;\r
\r
- case EFI_IFR_GRAY_OUT_IF_OP:\r
- PopConditionalExpression(ExpressStatement);\r
break;\r
\r
- case EFI_IFR_DISABLE_IF_OP:\r
- if (CurrentForm != NULL) {\r
- PopConditionalExpression(ExpressStatement);\r
+ //\r
+ // Vendor specific\r
+ //\r
+ case EFI_IFR_GUID_OP:\r
+ CurrentStatement = CreateStatement (OpCodeData, FormSet, CurrentForm);\r
+ if (CompareGuid ((EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)), &gEdkiiIfrBitVarstoreGuid)) {\r
+ Scope = 0;\r
+ QuestionReferBitField = TRUE;\r
}\r
- InScopeDisable = FALSE;\r
- OpCodeDisabled = FALSE;\r
- break;\r
\r
- case EFI_IFR_ONE_OF_OP:\r
- case EFI_IFR_ORDERED_LIST_OP:\r
- SuppressForOption = FALSE;\r
break;\r
\r
- case EFI_IFR_DEFAULT_OP:\r
- InScopeDefault = FALSE;\r
- break;\r
+ //\r
+ // Scope End\r
+ //\r
+ case EFI_IFR_END_OP:\r
+ QuestionReferBitField = FALSE;\r
+ Status = PopScope (&ScopeOpCode);\r
+ if (EFI_ERROR (Status)) {\r
+ ResetScopeStack ();\r
+ return Status;\r
+ }\r
\r
- case EFI_IFR_MAP_OP:\r
//\r
- // Get current Map Expression List.\r
+ // Parent statement end tag found, update ParentStatement info.\r
//\r
- Status = PopMapExpressionList ((VOID **) &MapExpressionList);\r
- if (Status == EFI_ACCESS_DENIED) {\r
- MapExpressionList = NULL;\r
+ if (IsStatementOpCode (ScopeOpCode) && (ParentStatement != NULL) && (ParentStatement->Operand == ScopeOpCode)) {\r
+ ParentStatement = ParentStatement->ParentStatement;\r
}\r
- //\r
- // Get current expression.\r
- //\r
- Status = PopCurrentExpression ((VOID **) &CurrentExpression);\r
- ASSERT_EFI_ERROR (Status);\r
- ASSERT (MapScopeDepth > 0);\r
- MapScopeDepth --;\r
- break;\r
\r
- default:\r
- if (IsExpressionOpCode (ScopeOpCode)) {\r
- if (InScopeDisable && CurrentForm == NULL) {\r
+ switch (ScopeOpCode) {\r
+ case EFI_IFR_FORM_SET_OP:\r
//\r
- // This is DisableIf expression for Form, it should be a constant expression\r
+ // End of FormSet, update FormSet IFR binary length\r
+ // to stop parsing substantial OpCodes\r
//\r
- ASSERT (CurrentExpression != NULL);\r
- Status = EvaluateExpression (FormSet, CurrentForm, CurrentExpression);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
+ FormSet->IfrBinaryLength = OpCodeOffset;\r
+ break;\r
+\r
+ case EFI_IFR_FORM_OP:\r
+ case EFI_IFR_FORM_MAP_OP:\r
+ //\r
+ // End of Form\r
+ //\r
+ CurrentForm = NULL;\r
+ SuppressForQuestion = FALSE;\r
+ break;\r
+\r
+ case EFI_IFR_ONE_OF_OPTION_OP:\r
+ //\r
+ // End of Option\r
+ //\r
+ CurrentOption = NULL;\r
+ break;\r
+\r
+ case EFI_IFR_NO_SUBMIT_IF_OP:\r
+ case EFI_IFR_INCONSISTENT_IF_OP:\r
+ case EFI_IFR_WARNING_IF_OP:\r
+ //\r
+ // Ignore end of EFI_IFR_NO_SUBMIT_IF and EFI_IFR_INCONSISTENT_IF\r
+ //\r
+ break;\r
+\r
+ case EFI_IFR_SUPPRESS_IF_OP:\r
+ if (SuppressForOption) {\r
+ PopConditionalExpression (ExpressOption);\r
+ } else if (SuppressForQuestion) {\r
+ PopConditionalExpression (ExpressStatement);\r
+ } else {\r
+ PopConditionalExpression (ExpressForm);\r
}\r
\r
- OpCodeDisabled = IsTrue (&CurrentExpression->Result);\r
+ break;\r
+\r
+ case EFI_IFR_GRAY_OUT_IF_OP:\r
+ PopConditionalExpression (ExpressStatement);\r
+ break;\r
\r
+ case EFI_IFR_DISABLE_IF_OP:\r
+ if (CurrentForm != NULL) {\r
+ PopConditionalExpression (ExpressStatement);\r
+ }\r
+\r
+ InScopeDisable = FALSE;\r
+ OpCodeDisabled = FALSE;\r
+ break;\r
+\r
+ case EFI_IFR_ONE_OF_OP:\r
+ case EFI_IFR_ORDERED_LIST_OP:\r
+ SuppressForOption = FALSE;\r
+ break;\r
+\r
+ case EFI_IFR_DEFAULT_OP:\r
+ InScopeDefault = FALSE;\r
+ break;\r
+\r
+ case EFI_IFR_MAP_OP:\r
//\r
- // DisableIf Expression is only used once and not queued, free it\r
+ // Get current Map Expression List.\r
//\r
- DestroyExpression (CurrentExpression);\r
- }\r
+ Status = PopMapExpressionList ((VOID **)&MapExpressionList);\r
+ if (Status == EFI_ACCESS_DENIED) {\r
+ MapExpressionList = NULL;\r
+ }\r
\r
- //\r
- // End of current Expression\r
- //\r
- CurrentExpression = NULL;\r
+ //\r
+ // Get current expression.\r
+ //\r
+ Status = PopCurrentExpression ((VOID **)&CurrentExpression);\r
+ ASSERT_EFI_ERROR (Status);\r
+ ASSERT (MapScopeDepth > 0);\r
+ MapScopeDepth--;\r
+ break;\r
+\r
+ default:\r
+ if (IsExpressionOpCode (ScopeOpCode)) {\r
+ if (InScopeDisable && (CurrentForm == NULL)) {\r
+ //\r
+ // This is DisableIf expression for Form, it should be a constant expression\r
+ //\r
+ ASSERT (CurrentExpression != NULL);\r
+ Status = EvaluateExpression (FormSet, CurrentForm, CurrentExpression);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+\r
+ OpCodeDisabled = IsTrue (&CurrentExpression->Result);\r
+\r
+ //\r
+ // DisableIf Expression is only used once and not queued, free it\r
+ //\r
+ DestroyExpression (CurrentExpression);\r
+ }\r
+\r
+ //\r
+ // End of current Expression\r
+ //\r
+ CurrentExpression = NULL;\r
+ }\r
+\r
+ break;\r
}\r
+\r
break;\r
- }\r
- break;\r
\r
- default:\r
- break;\r
+ default:\r
+ break;\r
}\r
\r
- if (IsStatementOpCode(Operand)) {\r
+ if (IsStatementOpCode (Operand)) {\r
CurrentStatement->ParentStatement = ParentStatement;\r
if (Scope != 0) {\r
//\r