STATIC\r
EFI_STATUS\r
InitializeBinaryStructures (\r
- IN EFI_HII_HANDLE *Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE *Handle,\r
IN BOOLEAN UseDatabase,\r
- IN EFI_IFR_PACKET *Packet,\r
+ IN FRAMEWORK_EFI_IFR_PACKET *Packet,\r
IN UINT8 *NvMapOverride,\r
IN UINTN NumberOfIfrImages,\r
EFI_FILE_FORM_TAGS **FileFormTagsHead\r
STATIC\r
EFI_STATUS\r
InitializeTagStructures (\r
- IN EFI_IFR_BINARY *BinaryData,\r
+ IN FRAMEWORK_EFI_IFR_BINARY *BinaryData,\r
OUT EFI_FILE_FORM_TAGS *FileFormTags\r
);\r
\r
EFI_STATUS\r
GetIfrBinaryData (\r
IN EFI_HII_PROTOCOL *Hii,\r
- IN EFI_HII_HANDLE HiiHandle,\r
- IN EFI_IFR_PACKET *Packet,\r
- IN EFI_IFR_BINARY *BinaryData\r
+ IN FRAMEWORK_EFI_HII_HANDLE HiiHandle,\r
+ IN FRAMEWORK_EFI_IFR_PACKET *Packet,\r
+ IN FRAMEWORK_EFI_IFR_BINARY *BinaryData\r
);\r
\r
STATIC\r
SendForm (\r
IN EFI_FORM_BROWSER_PROTOCOL * This,\r
IN BOOLEAN UseDatabase,\r
- IN EFI_HII_HANDLE * Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE * Handle,\r
IN UINTN HandleCount,\r
- IN EFI_IFR_PACKET * Packet,\r
+ IN FRAMEWORK_EFI_IFR_PACKET * Packet,\r
IN EFI_HANDLE CallbackHandle,\r
IN UINT8 *NvMapOverride,\r
IN EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL\r
EFI_STATUS Status;\r
BOOLEAN Callback;\r
VOID *CallbackData;\r
- EFI_HII_HANDLE BackupHandle;\r
+ FRAMEWORK_EFI_HII_HANDLE BackupHandle;\r
\r
ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));\r
\r
\r
Tag->NumberOfLines = 1;\r
Tag->VariableNumber = CurrentVariable;\r
- CopyMem (&Tag->Id, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
- CopyMem (&Tag->StorageStart, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
- CopyMem (&Tag->StorageWidth, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));\r
- CopyMem (&Tag->Text, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));\r
- CopyMem (&Tag->Help, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));\r
+ CopyMem (&Tag->Id, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
+ CopyMem (&Tag->StorageStart, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
+ CopyMem (&Tag->StorageWidth, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));\r
+ CopyMem (&Tag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));\r
+ CopyMem (&Tag->Help, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));\r
\r
VariableDefinition = FileFormTags->VariableDefinitions;\r
\r
\r
Tag->NumberOfLines = NumberOfLines;\r
Tag->VariableNumber = CurrentVariable;\r
- CopyMem (&Tag->Id, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
- CopyMem (&Tag->StorageStart, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
- CopyMem (&Tag->StorageWidth, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));\r
- CopyMem (&Tag->Text, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));\r
- CopyMem (&Tag->Help, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));\r
- CopyMem (&Tag->Minimum, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Minimum, sizeof (UINT16));\r
- CopyMem (&Tag->Maximum, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Maximum, sizeof (UINT16));\r
- CopyMem (&Tag->Step, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Step, sizeof (UINT16));\r
- CopyMem (&Tag->Default, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Default, sizeof (UINT16));\r
- Tag->ResetRequired = (BOOLEAN) (((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
+ CopyMem (&Tag->Id, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
+ CopyMem (&Tag->StorageStart, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));\r
+ CopyMem (&Tag->StorageWidth, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));\r
+ CopyMem (&Tag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));\r
+ CopyMem (&Tag->Help, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));\r
+ CopyMem (&Tag->Minimum, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Minimum, sizeof (UINT16));\r
+ CopyMem (&Tag->Maximum, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Maximum, sizeof (UINT16));\r
+ CopyMem (&Tag->Step, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Step, sizeof (UINT16));\r
+ CopyMem (&Tag->Default, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Default, sizeof (UINT16));\r
+ Tag->ResetRequired = (BOOLEAN) (((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
\r
VariableDefinition = FileFormTags->VariableDefinitions;\r
\r
// Assume on entry we are pointing to an OpCode - reasonably this should\r
// be a FormOp since the purpose is to count the tags in a particular Form.\r
//\r
- for (Index = 0; RawFormSet[Index] != EFI_IFR_END_FORM_OP;) {\r
+ for (Index = 0; RawFormSet[Index] != FRAMEWORK_EFI_IFR_END_FORM_OP;) {\r
//\r
// If we encounter the end of a form set, bail out\r
//\r
- if (RawFormSet[Index] == EFI_IFR_END_FORM_SET_OP) {\r
+ if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_END_FORM_SET_OP) {\r
break;\r
}\r
//\r
// We treat date/time internally as three op-codes\r
//\r
- if (RawFormSet[Index] == EFI_IFR_DATE_OP || RawFormSet[Index] == EFI_IFR_TIME_OP) {\r
+ if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_DATE_OP || RawFormSet[Index] == FRAMEWORK_EFI_IFR_TIME_OP) {\r
*NumberOfTags = (UINT16) (*NumberOfTags + 3);\r
} else {\r
//\r
STATIC\r
EFI_STATUS\r
InitializeTagStructures (\r
- IN EFI_IFR_BINARY *BinaryData,\r
+ IN FRAMEWORK_EFI_IFR_BINARY *BinaryData,\r
OUT EFI_FILE_FORM_TAGS *FileFormTags\r
)\r
{\r
\r
ZeroMem (FormTags->Tags, NumberOfTags * sizeof (EFI_TAG));\r
\r
- for (CurrTag = 0; RawFormSet[Index] != EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
+ for (CurrTag = 0; RawFormSet[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
//\r
// Operand = IFR OpCode\r
//\r
//\r
switch (RawFormSet[Index]) {\r
\r
- case EFI_IFR_FORM_OP:\r
+ case FRAMEWORK_EFI_IFR_FORM_OP:\r
//\r
// If there was no variable op-code defined, create a dummy entry for one\r
//\r
}\r
break;\r
\r
- case EFI_IFR_SUBTITLE_OP:\r
- case EFI_IFR_TEXT_OP:\r
- case EFI_IFR_REF_OP:\r
+ case FRAMEWORK_EFI_IFR_SUBTITLE_OP:\r
+ case FRAMEWORK_EFI_IFR_TEXT_OP:\r
+ case FRAMEWORK_EFI_IFR_REF_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
break;\r
\r
- case EFI_IFR_VARSTORE_OP:\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_OP:\r
if (FileFormTags->VariableDefinitions == NULL) {\r
VariableDefinitions = AllocateZeroPool (sizeof (EFI_VARIABLE_DEFINITION));\r
ASSERT (VariableDefinitions != NULL);\r
);\r
break;\r
\r
- case EFI_IFR_VARSTORE_SELECT_OP:\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
- CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) &RawFormSet[Index])->VarId, sizeof (UINT16));\r
+ CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) &RawFormSet[Index])->VarId, sizeof (UINT16));\r
CurrentVariable2 = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_VARSTORE_SELECT_PAIR_OP:\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
- CopyMem(&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT_PAIR *)&RawFormSet[Index])->VarId, sizeof (UINT16));\r
+ CopyMem(&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *)&RawFormSet[Index])->VarId, sizeof (UINT16));\r
CopyMem (\r
&CurrentVariable2,\r
- &((EFI_IFR_VARSTORE_SELECT_PAIR *) &RawFormSet[Index])->SecondaryVarId,\r
+ &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) &RawFormSet[Index])->SecondaryVarId,\r
sizeof (UINT16)\r
);\r
break;\r
\r
- case EFI_IFR_END_FORM_OP:\r
+ case FRAMEWORK_EFI_IFR_END_FORM_OP:\r
//\r
// Test for an allocated buffer. If already allocated this is due to having called this routine\r
// once for sizing of the NV storage. We then loaded the NV variable and can correctly initialize\r
// Two types of tags constitute the One Of question: a one-of header and\r
// several one-of options.\r
//\r
- case EFI_IFR_ONE_OF_OP:\r
- case EFI_IFR_ORDERED_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:\r
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);\r
\r
//\r
QuestionIndex = (UINT16) CurrTag;\r
break;\r
\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
- FormTags->Tags[QuestionIndex].Flags = ((EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Flags;\r
+ FormTags->Tags[QuestionIndex].Flags = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Flags;\r
CopyMem (\r
&FormTags->Tags[QuestionIndex].Key,\r
- &((EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Key,\r
+ &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Key,\r
sizeof (UINT16)\r
);\r
- FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
+ FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
break;\r
\r
- case EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
GetNumericHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, (UINT16) 1, FileFormTags, CurrentVariable);\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
break;\r
\r
- case EFI_IFR_DATE_OP:\r
+ case FRAMEWORK_EFI_IFR_DATE_OP:\r
//\r
// Date elements come in as a Year, Month, Day. We need to process them as a country-based\r
// Order. It is much easier to do it here than anywhere else.\r
TagLength = RawFormSet[Index + 1];\r
break;\r
\r
- case EFI_IFR_TIME_OP:\r
+ case FRAMEWORK_EFI_IFR_TIME_OP:\r
GetNumericHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, (UINT16) 0, FileFormTags, CurrentVariable);\r
\r
if (Count == 2) {\r
}\r
break;\r
\r
- case EFI_IFR_PASSWORD_OP:\r
- case EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
break;\r
\r
- case EFI_IFR_SUPPRESS_IF_OP:\r
- case EFI_IFR_GRAYOUT_IF_OP:\r
- InconsistentTags->Operand = ((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;\r
+ case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;\r
gConsistencyId++;\r
\r
//\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_FORM_SET_OP:\r
+ case FRAMEWORK_EFI_IFR_FORM_SET_OP:\r
CopyMem (\r
&FormTags->Tags[CurrTag].GuidValue,\r
- &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Guid,\r
+ &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Guid,\r
sizeof (EFI_GUID)\r
);\r
CopyMem (\r
&FormTags->Tags[CurrTag].CallbackHandle,\r
- &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->CallbackHandle,\r
+ &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->CallbackHandle,\r
sizeof (EFI_PHYSICAL_ADDRESS)\r
);\r
- CopyMem (&FormTags->Tags[CurrTag].Class, &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class, sizeof (UINT8));\r
+ CopyMem (&FormTags->Tags[CurrTag].Class, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class, sizeof (UINT8));\r
CopyMem (\r
&FormTags->Tags[CurrTag].SubClass,\r
- &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass,\r
+ &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass,\r
sizeof (UINT8)\r
);\r
CopyMem (\r
&FormTags->Tags[CurrTag].NvDataSize,\r
- &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->NvDataSize,\r
+ &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->NvDataSize,\r
sizeof (UINT16)\r
);\r
- Class = ((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class;\r
- SubClass = ((EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass;\r
+ Class = ((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class;\r
+ SubClass = ((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass;\r
//\r
// If the formset has a size value, that means someone must be using this, so create a variable\r
// We also shall reserve the formid of 0 for this specific purpose.\r
}\r
break;\r
\r
- case EFI_IFR_BANNER_OP:\r
+ case FRAMEWORK_EFI_IFR_BANNER_OP:\r
if (gClassOfVfr == EFI_FRONT_PAGE_SUBCLASS) {\r
TempValue = 0;\r
- CopyMem (&TempValue, &((EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment, sizeof (UINT8));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment, sizeof (UINT8));\r
//\r
// If this is the special timeout value, we will dynamically figure out where to put it\r
// Also the least significant byte refers to the TimeOut desired.\r
//\r
- if (TempValue == EFI_IFR_BANNER_TIMEOUT) {\r
- CopyMem (&FrontPageTimeOutTitle, &((EFI_IFR_BANNER *) &RawFormSet[Index])->Title, sizeof (UINT16));\r
+ if (TempValue == FRAMEWORK_EFI_IFR_BANNER_TIMEOUT) {\r
+ CopyMem (&FrontPageTimeOutTitle, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Title, sizeof (UINT16));\r
if (FrontPageTimeOutValue != (INT16) -1) {\r
- CopyMem (&FrontPageTimeOutValue, &((EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber, sizeof (UINT16));\r
+ CopyMem (&FrontPageTimeOutValue, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber, sizeof (UINT16));\r
}\r
break;\r
}\r
\r
CopyMem (\r
- &BannerData->Banner[((EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber][\r
- ((EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment],\r
- &((EFI_IFR_BANNER *) &RawFormSet[Index])->Title,\r
+ &BannerData->Banner[((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber][\r
+ ((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment],\r
+ &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Title,\r
sizeof (STRING_REF)\r
);\r
}\r
break;\r
\r
- case EFI_IFR_INCONSISTENT_IF_OP:\r
+ case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:\r
CopyMem (\r
&FormTags->Tags[CurrTag].Text,\r
- &((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup,\r
+ &((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup,\r
sizeof (UINT16)\r
);\r
gConsistencyId++;\r
\r
- InconsistentTags->Operand = ((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;\r
- CopyMem (&InconsistentTags->Popup, &((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup, sizeof (UINT16));\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;\r
+ CopyMem (&InconsistentTags->Popup, &((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup, sizeof (UINT16));\r
\r
//\r
// Since this op-code doesn't use the next field(s), initialize them with something invalid.\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
\r
- InconsistentTags->Operand = ((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Header.OpCode;\r
- CopyMem (&InconsistentTags->Value, &((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Header.OpCode;\r
+ CopyMem (&InconsistentTags->Value, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));\r
CopyMem (\r
&InconsistentTags->QuestionId1,\r
- &((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->QuestionId,\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->QuestionId,\r
sizeof (UINT16)\r
);\r
\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
\r
- InconsistentTags->Operand = ((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Header.OpCode;\r
- CopyMem (&InconsistentTags->Value, &((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Header.OpCode;\r
+ CopyMem (&InconsistentTags->Value, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));\r
CopyMem (\r
&InconsistentTags->QuestionId1,\r
- &((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->VariableId,\r
+ &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->VariableId,\r
sizeof (UINT16)\r
);\r
\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
\r
- InconsistentTags->Operand = ((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->Header.OpCode;\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->Header.OpCode;\r
CopyMem (\r
&InconsistentTags->QuestionId1,\r
- &((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId1,\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId1,\r
sizeof (UINT16)\r
);\r
CopyMem (\r
&InconsistentTags->QuestionId2,\r
- &((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId2,\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId2,\r
sizeof (UINT16)\r
);\r
\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_AND_OP:\r
- case EFI_IFR_OR_OP:\r
- case EFI_IFR_NOT_OP:\r
- case EFI_IFR_GT_OP:\r
- case EFI_IFR_GE_OP:\r
- case EFI_IFR_TRUE_OP:\r
- case EFI_IFR_FALSE_OP:\r
- InconsistentTags->Operand = ((EFI_IFR_NOT *) &RawFormSet[Index])->Header.OpCode;\r
+ case FRAMEWORK_EFI_IFR_AND_OP:\r
+ case FRAMEWORK_EFI_IFR_OR_OP:\r
+ case FRAMEWORK_EFI_IFR_NOT_OP:\r
+ case FRAMEWORK_EFI_IFR_GT_OP:\r
+ case FRAMEWORK_EFI_IFR_GE_OP:\r
+ case FRAMEWORK_EFI_IFR_TRUE_OP:\r
+ case FRAMEWORK_EFI_IFR_FALSE_OP:\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_NOT *) &RawFormSet[Index])->Header.OpCode;\r
\r
//\r
// Since this op-code doesn't use the next field(s), initialize them with something invalid.\r
// Reserve INVALID_OFFSET_VALUE - 1 for TRUE or FALSE because they are inconsistency tags also, but\r
// have no coresponding id. The examination of id is needed by evaluating boolean expression.\r
//\r
- if (RawFormSet[Index] == EFI_IFR_TRUE_OP ||\r
- RawFormSet[Index] == EFI_IFR_FALSE_OP) {\r
+ if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_TRUE_OP ||\r
+ RawFormSet[Index] == FRAMEWORK_EFI_IFR_FALSE_OP) {\r
InconsistentTags->QuestionId1 = INVALID_OFFSET_VALUE - 1;\r
} else {\r
InconsistentTags->QuestionId1 = INVALID_OFFSET_VALUE;\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);\r
\r
- InconsistentTags->Operand = ((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->Header.OpCode;\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->Header.OpCode;\r
CopyMem (\r
&InconsistentTags->QuestionId1,\r
- &((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->QuestionId,\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->QuestionId,\r
sizeof (UINT16)\r
);\r
CopyMem (\r
&InconsistentTags->ListLength,\r
- &((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->ListLength,\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->ListLength,\r
sizeof (UINT16)\r
);\r
InconsistentTags->ValueList = FormTags->Tags[CurrTag].IntList;\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_END_IF_OP:\r
- InconsistentTags->Operand = ((EFI_IFR_END_EXPR *) &RawFormSet[Index])->Header.OpCode;\r
+ case FRAMEWORK_EFI_IFR_END_IF_OP:\r
+ InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_END_EXPR *) &RawFormSet[Index])->Header.OpCode;\r
\r
//\r
// Since this op-code doesn't use the next field(s), initialize them with something invalid.\r
InconsistentTags = InconsistentTags->Next;\r
break;\r
\r
- case EFI_IFR_END_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_END_ONE_OF_OP:\r
break;\r
\r
default:\r
//\r
// Search the tags for the tag which corresponds to this ID\r
//\r
- for (CurrTag = 0; FormTags->Tags[0].Operand != EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
+ for (CurrTag = 0; FormTags->Tags[0].Operand != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
//\r
// If we hit the end of a form, go to the next set of Tags.\r
// Remember - EndFormSet op-codes sit on their own page after an end form.\r
//\r
- if (FormTags->Tags[CurrTag].Operand == EFI_IFR_END_FORM_OP) {\r
+ if (FormTags->Tags[CurrTag].Operand == FRAMEWORK_EFI_IFR_END_FORM_OP) {\r
//\r
// Reset the CurrTag value (it will be incremented, after this case statement\r
// so set to a negative one so that we get the desired effect.) Fish can beat me later.\r
//\r
// Search the tags for the tag which corresponds to this ID\r
//\r
- for (CurrTag = 0; FormTags->Tags[CurrTag].Operand != EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
+ for (CurrTag = 0; FormTags->Tags[CurrTag].Operand != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {\r
//\r
// If we hit the end of a form, go to the next set of Tags.\r
// Remember - EndFormSet op-codes sit on their own page after an end form.\r
//\r
- if (FormTags->Tags[CurrTag].Operand == EFI_IFR_END_FORM_OP) {\r
+ if (FormTags->Tags[CurrTag].Operand == FRAMEWORK_EFI_IFR_END_FORM_OP) {\r
//\r
// Reset the CurrTag value (it will be incremented, after this case statement\r
// so set to a negative one so that we get the desired effect.) Fish can beat me later.\r
CHAR16 *\r
GetToken (\r
IN STRING_REF Token,\r
- IN EFI_HII_HANDLE HiiHandle\r
+ IN FRAMEWORK_EFI_HII_HANDLE HiiHandle\r
)\r
/*++\r
\r
{\r
EFI_STATUS Status;\r
UINTN Index;\r
- EFI_IFR_BINARY *IfrBinary;\r
+ FRAMEWORK_EFI_IFR_BINARY *IfrBinary;\r
CHAR16 *StringPtr;\r
EFI_FILE_FORM_TAGS *FileFormTags;\r
EFI_FORM_TAGS LocalTags;\r
return Selection;\r
}\r
\r
- Selection = UiDisplayMenu (FALSE, FileFormTagsHead, (EFI_IFR_DATA_ARRAY *) CallbackData);\r
+ Selection = UiDisplayMenu (FALSE, FileFormTagsHead, (FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData);\r
\r
return Selection;\r
}\r
STATIC\r
EFI_STATUS\r
InitializeBinaryStructures (\r
- IN EFI_HII_HANDLE *Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE *Handle,\r
IN BOOLEAN UseDatabase,\r
- IN EFI_IFR_PACKET *Packet,\r
+ IN FRAMEWORK_EFI_IFR_PACKET *Packet,\r
IN UINT8 *NvMapOverride,\r
IN UINTN NumberOfIfrImages,\r
OUT EFI_FILE_FORM_TAGS **FileFormTagsHead\r
{\r
UINTN HandleIndex;\r
EFI_STATUS Status;\r
- EFI_IFR_BINARY *BinaryData;\r
+ FRAMEWORK_EFI_IFR_BINARY *BinaryData;\r
EFI_FILE_FORM_TAGS *FileFormTags;\r
UINTN SizeOfNvStore;\r
EFI_FORM_CALLBACK_PROTOCOL *FormCallback;\r
//\r
// Allocate memory for our Binary Data\r
//\r
- BinaryData = AllocateZeroPool (sizeof (EFI_IFR_BINARY));\r
+ BinaryData = AllocateZeroPool (sizeof (FRAMEWORK_EFI_IFR_BINARY));\r
ASSERT (BinaryData);\r
\r
//\r
// Allocate memory for our Binary Data linked-list\r
// Each handle represents a Binary and we will store that data away.\r
//\r
- BinaryData->Next = AllocateZeroPool (sizeof (EFI_IFR_BINARY));\r
+ BinaryData->Next = AllocateZeroPool (sizeof (FRAMEWORK_EFI_IFR_BINARY));\r
ASSERT (BinaryData->Next);\r
\r
BinaryData = BinaryData->Next;\r
\r
NvMapListHead = NULL;\r
\r
- Status = Hii->GetDefaultImage (Hii, Handle[HandleIndex], EFI_IFR_FLAG_DEFAULT, &NvMapListHead);\r
+ Status = Hii->GetDefaultImage (Hii, Handle[HandleIndex], FRAMEWORK_EFI_IFR_FLAG_DEFAULT, &NvMapListHead);\r
\r
if (!EFI_ERROR (Status)) {\r
ASSERT_EFI_ERROR (NULL != NvMapListHead);\r
EFI_STATUS\r
GetIfrBinaryData (\r
IN EFI_HII_PROTOCOL *Hii,\r
- IN EFI_HII_HANDLE HiiHandle,\r
- IN EFI_IFR_PACKET *Packet,\r
- IN OUT EFI_IFR_BINARY *BinaryData\r
+ IN FRAMEWORK_EFI_HII_HANDLE HiiHandle,\r
+ IN FRAMEWORK_EFI_IFR_PACKET *Packet,\r
+ IN OUT FRAMEWORK_EFI_IFR_BINARY *BinaryData\r
)\r
/*++\r
\r
UINTN BufferSize;\r
VOID *Buffer;\r
UINT8 *RawFormBinary;\r
- EFI_IFR_FORM_SET *FormOp;\r
+ FRAMEWORK_EFI_IFR_FORM_SET *FormOp;\r
UINT16 Index;\r
UINT16 Index2;\r
UINT16 TitleToken;\r
}\r
//\r
// Walk through the FormSet Opcodes looking for the FormSet opcode\r
- // If we hit EFI_IFR_END_SET_OP we know we hit the end of the FormSet.\r
+ // If we hit FRAMEWORK_EFI_IFR_END_SET_OP we know we hit the end of the FormSet.\r
//\r
- for (Index = 0; RawFormBinary[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
- FormOp = (EFI_IFR_FORM_SET *) &RawFormBinary[Index];\r
+ for (Index = 0; RawFormBinary[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
+ FormOp = (FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormBinary[Index];\r
Index = (UINT16) (Index + FormOp->Header.Length);\r
\r
- if (FormOp->Header.OpCode == EFI_IFR_FORM_SET_OP) {\r
+ if (FormOp->Header.OpCode == FRAMEWORK_EFI_IFR_FORM_SET_OP) {\r
TitleToken = FormOp->FormSetTitle;\r
//\r
// If displaying FrontPage - set the flag signifying it\r
projects / mirror_edk2.git / blobdiff