// Remember, the only time we come here is because we are in the NVPlus section of the NvRamMap\r
//\r
for (Index = MenuOption->TagIndex;\r
- (MenuOption->Tags[Index].Operand != EFI_IFR_END_FORM_OP) && (MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP);\r
+ (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP) && (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP);\r
Index++\r
) {\r
\r
switch (MenuOption->Tags[Index].Operand) {\r
- case EFI_IFR_ORDERED_LIST_OP:\r
- case EFI_IFR_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
CachedStart = MenuOption->Tags[Index].StorageStart;\r
break;\r
\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
- if (MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_DEFAULT) {\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:\r
+ if (MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) {\r
CopyMem (&NvRamMap[CachedStart], &MenuOption->Tags[Index].Value, 2);\r
}\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
CopyMem (&NvRamMap[MenuOption->Tags[Index].StorageStart], &MenuOption->Tags[Index].Flags, 1);\r
break;\r
\r
- case EFI_IFR_NUMERIC_OP:\r
- case EFI_IFR_DATE_OP:\r
- case EFI_IFR_TIME_OP:\r
- case EFI_IFR_STRING_OP:\r
- case EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_DATE_OP:\r
+ case FRAMEWORK_EFI_IFR_TIME_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
CopyMem (\r
&NvRamMap[MenuOption->Tags[Index].StorageStart],\r
&MenuOption->Tags[Index].Value,\r
IN UI_MENU_OPTION *MenuOption,\r
IN BOOLEAN Selected,\r
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,\r
- IN EFI_IFR_DATA_ARRAY *PageData,\r
+ IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,\r
OUT CHAR16 **OptionString\r
)\r
{\r
NullCharacter = CHAR_NULL;\r
FormCallback = NULL;\r
\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
OrderedList = TRUE;\r
if (((UINT8 *) NvRamMap)[0] != 0x00) {\r
Initialized = TRUE;\r
\r
switch (Tag->Operand) {\r
\r
- case EFI_IFR_ORDERED_LIST_OP:\r
- case EFI_IFR_ONE_OF_OP:\r
+ case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
CachedIndex = MenuOption->TagIndex;\r
\r
//\r
- // search for EFI_IFR_ONE_OF_OPTION_OP until you hit the EFI_IFR_END_ONE_OF_OP,\r
+ // search for FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP until you hit the FRAMEWORK_EFI_IFR_END_ONE_OF_OP,\r
// each of the .Text in the options are going to be what gets displayed. Break each into 26 char chunks\r
// when hit right/left arrow allows for selection - then repopulate Tag[TagIndex] with the choice\r
//\r
- for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) {\r
+ for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {\r
//\r
// We found an option - which assumedly has a string. We will eventually have to support\r
// wrapping of strings. For now, let's pretend they don't wrap and code that up.\r
//\r
// Count how many strings there are\r
//\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
//\r
// If one of the options for the one-of has an interactive flag, back-define the oneof to have one too\r
//\r
- if (MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
- MenuOption->Tags[CachedIndex].Flags = (UINT8) (MenuOption->Tags[CachedIndex].Flags | EFI_IFR_FLAG_INTERACTIVE);\r
+ if (MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
+ MenuOption->Tags[CachedIndex].Flags = (UINT8) (MenuOption->Tags[CachedIndex].Flags | FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE);\r
}\r
\r
StringCount++;\r
//\r
// Copy current setting to the seed Value\r
//\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
ValueArray = AllocateZeroPool (MenuOption->ThisTag->StorageWidth);\r
ASSERT (ValueArray != NULL);\r
CopyMem (ValueArray, NvRamMap, MenuOption->ThisTag->StorageWidth);\r
}\r
\r
Number = Value;\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
Status = GetSelectionInputPopUp (MenuOption, Tag, MenuOption->ThisTag->StorageWidth, ValueArray, &KeyValue);\r
} else {\r
Status = GetSelectionInputPopUp (MenuOption, Tag, 1, &Value, &KeyValue);\r
}\r
\r
if (!EFI_ERROR (Status)) {\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
CopyMem (NvRamMap, ValueArray, MenuOption->ThisTag->StorageWidth);\r
FreePool (ValueArray);\r
} else {\r
// if two questions are bound by consistency checks and each only has two possible choices, there\r
// would be no way for a user to switch the values. Thus we require late checking.\r
//\r
- if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {\r
CopyMem (&Tag->OldValue, &Value, Tag->StorageWidth);\r
} else {\r
//\r
\r
UpdateStatusBar (NV_UPDATE_REQUIRED, Tag->Flags, TRUE);\r
} else {\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
FreePool (ValueArray);\r
}\r
\r
return EFI_SUCCESS;\r
}\r
} else {\r
- for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) {\r
+ for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {\r
//\r
// We found an option - which assumedly has a string. We will eventually have to support\r
// wrapping of strings. For now, let's pretend they don't wrap and code that up.\r
//\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
if (OrderedList) {\r
if (!Initialized) {\r
//\r
StringPtr = GetToken (MenuOption->Tags[Index].Text, MenuOption->Handle);\r
} else {\r
for (Value = (UINT16) (MenuOption->TagIndex + 1);\r
- MenuOption->Tags[Value].Operand != EFI_IFR_END_ONE_OF_OP;\r
+ MenuOption->Tags[Value].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
Value++\r
) {\r
if (MenuOption->Tags[Value].Value == ((UINT8 *) NvRamMap)[Index - MenuOption->TagIndex - 1]) {\r
}\r
}\r
\r
- if (MenuOption->Tags[Value].Operand == EFI_IFR_END_ONE_OF_OP) {\r
+ if (MenuOption->Tags[Value].Operand == FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {\r
Skip = TRUE;\r
continue;\r
}\r
break;\r
}\r
\r
- if ((MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_DEFAULT) == 1) {\r
+ if ((MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) == 1) {\r
Default = MenuOption->Tags[Index].Text;\r
Value = MenuOption->Tags[Index].Value;\r
};\r
}\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
NewStrCat (OptionString[0], StringPtr);\r
break;\r
\r
- case EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
}\r
break;\r
\r
- case EFI_IFR_DATE_OP:\r
+ case FRAMEWORK_EFI_IFR_DATE_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
//\r
// Also, we want to internationalize the order of the date information. We need to code for it as well.\r
//\r
- for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == EFI_IFR_DATE_OP; Index++)\r
+ for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_DATE_OP; Index++)\r
;\r
\r
//\r
// might want to set an alarm and actually preserve the data in NVRam so a driver can pick up the instruction\r
// BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG\r
//\r
- case EFI_IFR_TIME_OP:\r
+ case FRAMEWORK_EFI_IFR_TIME_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
// to 53 and found it to no longer point to a date operand, we were pointing to the last of 3\r
// date operands.\r
//\r
- for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == EFI_IFR_TIME_OP; Index++)\r
+ for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_TIME_OP; Index++)\r
;\r
//\r
// Count 0 = We entered on the first Date operand\r
}\r
break;\r
\r
- case EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
return Status;\r
}\r
\r
- case EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
//\r
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically\r
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust\r
// Since interactive passwords assume to handle the password data in a separate variable\r
// storage, we don't need to do more than what is below for password callbacks\r
//\r
- if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
MenuOption->Tags[0].CallbackHandle = FileFormTags->FormTags.Tags[0].CallbackHandle;\r
Status = ReadPassword (MenuOption, TRUE, Tag, PageData, FALSE, FileFormTags, StringPtr);\r
ZeroMem (StringPtr, Tag->Maximum);\r
UINTN Index;\r
\r
switch (OpCode) {\r
- case EFI_IFR_FORM_OP:\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_FORM *) FormData)->FormId, sizeof (UINT16));\r
- CopyMem (&TargetTag->Text, &((EFI_IFR_FORM *) FormData)->FormTitle, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_FORM_OP:\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_FORM *) FormData)->FormId, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_FORM *) FormData)->FormTitle, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
if (VariableDefinitionsHead != NULL) {\r
VariableName = AllocateZeroPool (12);\r
}\r
break;\r
\r
- case EFI_IFR_SUBTITLE_OP:\r
+ case FRAMEWORK_EFI_IFR_SUBTITLE_OP:\r
TargetTag->NumberOfLines = 1;\r
- CopyMem (&TargetTag->Text, &((EFI_IFR_SUBTITLE *) FormData)->SubTitle, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_SUBTITLE *) FormData)->SubTitle, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_TEXT_OP:\r
+ case FRAMEWORK_EFI_IFR_TEXT_OP:\r
TargetTag->NumberOfLines = 1;\r
- CopyMem (&TargetTag->Text, &((EFI_IFR_TEXT *) FormData)->Text, sizeof (UINT16));\r
- CopyMem (&TargetTag->Help, &((EFI_IFR_TEXT *) FormData)->Help, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Text, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Help, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Help, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
\r
//\r
// inside the if() statement. If the encoded length is the complete size, then we\r
// know we have valid data encoded that we want to integrate\r
//\r
- if (((EFI_IFR_TEXT *) FormData)->Header.Length == sizeof (EFI_IFR_TEXT)) {\r
+ if (((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Header.Length == sizeof (FRAMEWORK_EFI_IFR_TEXT)) {\r
//\r
// Text has no help associated with it, but in case there is a second entry due to\r
// dynamic/interactive flags being active, bring this data over.\r
//\r
- CopyMem (&TargetTag->TextTwo, &((EFI_IFR_TEXT *) FormData)->TextTwo, sizeof (UINT16));\r
- TargetTag->Flags = ((EFI_IFR_TEXT *) FormData)->Flags;\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_TEXT *) FormData)->Key, sizeof (UINT16));\r
+ CopyMem (&TargetTag->TextTwo, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->TextTwo, sizeof (UINT16));\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Flags;\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Key, sizeof (UINT16));\r
}\r
break;\r
\r
- case EFI_IFR_ONE_OF_OPTION_OP:\r
- CopyMem (&TargetTag->Text, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Option, sizeof (UINT16));\r
- CopyMem (&TargetTag->Value, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Value, sizeof (UINT16));\r
- TargetTag->Flags = ((EFI_IFR_ONE_OF_OPTION *) FormData)->Flags;\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Key, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:\r
+ CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Option, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Value, sizeof (UINT16));\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Flags;\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Key, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_CHECKBOX_OP:\r
- TargetTag->Flags = ((EFI_IFR_CHECKBOX *) FormData)->Flags;\r
- TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_CHECKBOX *) FormData)->Key, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_CHECKBOX *) FormData)->Flags;\r
+ TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_CHECKBOX *) FormData)->Key, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_NUMERIC_OP:\r
- TargetTag->Flags = ((EFI_IFR_NUMERIC *) FormData)->Flags;\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_NUMERIC *) FormData)->Key, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_NUMERIC *) FormData)->Flags;\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_NUMERIC *) FormData)->Key, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_STRING_OP:\r
+ case FRAMEWORK_EFI_IFR_STRING_OP:\r
//\r
- // Convert EFI_IFR_STRING.MinSize and EFI_IFR_STRING.MaxSize to actual minimum and maximum bytes\r
+ // Convert FRAMEWORK_EFI_IFR_STRING.MinSize and FRAMEWORK_EFI_IFR_STRING.MaxSize to actual minimum and maximum bytes\r
// and store to EFI_TAG.Minimum and EFI_TAG.Maximum\r
//\r
TempValue = 0;\r
- CopyMem (&TempValue, &((EFI_IFR_STRING *) FormData)->MinSize, sizeof (UINT8));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->MinSize, sizeof (UINT8));\r
TempValue = (UINT16) (TempValue * 2);\r
CopyMem (&TargetTag->Minimum, &TempValue, sizeof (UINT16));\r
\r
TempValue = 0;\r
- CopyMem (&TempValue, &((EFI_IFR_STRING *) FormData)->MaxSize, sizeof (UINT8));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->MaxSize, sizeof (UINT8));\r
TempValue = (UINT16) (TempValue * 2);\r
CopyMem (&TargetTag->Maximum, &TempValue, sizeof (UINT16));\r
CopyMem (&TargetTag->StorageWidth, &TempValue, sizeof (UINT16));\r
- TargetTag->Flags = (UINT8) (((EFI_IFR_STRING *) FormData)->Flags);\r
- TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_STRING *) FormData)->Key, sizeof (UINT16));\r
+ TargetTag->Flags = (UINT8) (((FRAMEWORK_EFI_IFR_STRING *) FormData)->Flags);\r
+ TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->Key, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_PASSWORD_OP:\r
+ case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
TempValue = 0;\r
- CopyMem (&TempValue, &((EFI_IFR_PASSWORD *) FormData)->MinSize, sizeof (UINT8));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->MinSize, sizeof (UINT8));\r
TempValue = (UINT16) (TempValue * 2);\r
CopyMem (&TargetTag->Minimum, &TempValue, sizeof (UINT16));\r
\r
TempValue = 0;\r
- CopyMem (&TempValue, &((EFI_IFR_PASSWORD *) FormData)->MaxSize, sizeof (UINT8));\r
+ CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->MaxSize, sizeof (UINT8));\r
TempValue = (UINT16) (TempValue * 2);\r
CopyMem (&TargetTag->Maximum, &TempValue, sizeof (UINT16));\r
CopyMem (&TargetTag->StorageWidth, &TempValue, sizeof (UINT16));\r
- TargetTag->Flags = ((EFI_IFR_PASSWORD *) FormData)->Flags;\r
- TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED);\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_PASSWORD *) FormData)->Key, sizeof (UINT16));\r
- CopyMem (&TargetTag->Encoding, &((EFI_IFR_PASSWORD *) FormData)->Encoding, sizeof (UINT16));\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Flags;\r
+ TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Key, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Encoding, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Encoding, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_VARSTORE_OP:\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_OP:\r
//\r
// It should NEVER be NULL\r
//\r
//\r
// If there is a variable with this GUID and ID already, we need to bail out\r
//\r
- if (!CompareMem (&VariableDefinitions->Guid, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID)) &&\r
- !CompareMem (&VariableDefinitions->VariableId, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16))\r
+ if (!CompareMem (&VariableDefinitions->Guid, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID)) &&\r
+ !CompareMem (&VariableDefinitions->VariableId, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16))\r
) {\r
return ;\r
}\r
//\r
// Copy the Variable data to our linked list\r
//\r
- CopyMem (&VariableDefinitions->VariableId, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));\r
- CopyMem (&VariableDefinitions->VariableSize, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
- CopyMem (&VariableDefinitions->Guid, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&VariableDefinitions->VariableId, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));\r
+ CopyMem (&VariableDefinitions->VariableSize, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
+ CopyMem (&VariableDefinitions->Guid, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));\r
\r
//\r
- // The ASCII String which is immediately past the EFI_IFR_VARSTORE is inferred by the structure definition\r
+ // The ASCII String which is immediately past the FRAMEWORK_EFI_IFR_VARSTORE is inferred by the structure definition\r
// due to it being variable sized. There are rules preventing it from being > 40 characters long and should\r
// be enforced by the compiler.\r
//\r
- AsciiString = (CHAR8 *) (&((EFI_IFR_VARSTORE *) FormData)->Size);\r
+ AsciiString = (CHAR8 *) (&((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size);\r
AsciiString = AsciiString + 2;\r
VariableDefinitions->VariableName = AllocateZeroPool ((AsciiStrLen (AsciiString) + 1) * 2);\r
ASSERT (VariableDefinitions->VariableName != NULL);\r
//\r
// Propogate the tag information for this op-code\r
//\r
- CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));\r
- CopyMem (&TargetTag->GuidValue, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));\r
- CopyMem (&TargetTag->StorageWidth, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
- CopyMem (&TargetTag->Maximum, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
+ CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));\r
+ CopyMem (&TargetTag->GuidValue, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));\r
+ CopyMem (&TargetTag->StorageWidth, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Maximum, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));\r
break;\r
\r
- case EFI_IFR_VARSTORE_SELECT_OP:\r
- CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));\r
- CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:\r
+ CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));\r
+ CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));\r
CurrentVariable2 = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_VARSTORE_SELECT_PAIR_OP:\r
- CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP:\r
+ CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));\r
CopyMem (\r
&TargetTag->VariableNumber2,\r
- &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId,\r
+ &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId,\r
sizeof (UINT16)\r
);\r
- CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));\r
- CopyMem (&CurrentVariable2, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId, sizeof (UINT16));\r
+ CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));\r
+ CopyMem (&CurrentVariable2, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId, sizeof (UINT16));\r
break;\r
\r
- case EFI_IFR_REF_OP:\r
+ case FRAMEWORK_EFI_IFR_REF_OP:\r
TargetTag->NumberOfLines = 1;\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_REF *) FormData)->FormId, sizeof (UINT16));\r
- CopyMem (&TargetTag->Key, &((EFI_IFR_REF *) FormData)->Key, sizeof (UINT16));\r
- CopyMem (&TargetTag->Text, &((EFI_IFR_REF *) FormData)->Prompt, sizeof (UINT16));\r
- CopyMem (&TargetTag->Help, &((EFI_IFR_REF *) FormData)->Help, sizeof (UINT16));\r
- TargetTag->Flags = ((EFI_IFR_REF *) FormData)->Flags;\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_REF *) FormData)->FormId, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Key, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Prompt, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Help, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Help, sizeof (UINT16));\r
+ TargetTag->Flags = ((FRAMEWORK_EFI_IFR_REF *) FormData)->Flags;\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_EQ_ID_VAL_OP:\r
- CopyMem (&TargetTag->Value, &((EFI_IFR_EQ_ID_VAL *) FormData)->Value, sizeof (UINT16));\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_VAL *) FormData)->QuestionId, sizeof (UINT16));\r
- TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_VAL *) FormData)->Width;\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:\r
+ CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->Value, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->QuestionId, sizeof (UINT16));\r
+ TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->Width;\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_EQ_VAR_VAL_OP:\r
- CopyMem (&TargetTag->Value, &((EFI_IFR_EQ_VAR_VAL *) FormData)->Value, sizeof (UINT16));\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_VAR_VAL *) FormData)->VariableId, sizeof (UINT16));\r
+ case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:\r
+ CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) FormData)->Value, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) FormData)->VariableId, sizeof (UINT16));\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_EQ_ID_ID_OP:\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_ID *) FormData)->QuestionId1, sizeof (UINT16));\r
- CopyMem (&TargetTag->Id2, &((EFI_IFR_EQ_ID_ID *) FormData)->QuestionId2, sizeof (UINT16));\r
- TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_ID *) FormData)->Width;\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->QuestionId1, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Id2, &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->QuestionId2, sizeof (UINT16));\r
+ TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->Width;\r
TargetTag->VariableNumber = CurrentVariable;\r
TargetTag->VariableNumber = CurrentVariable2;\r
break;\r
\r
- case EFI_IFR_EQ_ID_LIST_OP:\r
- CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_LIST *) FormData)->QuestionId, sizeof (UINT16));\r
- CopyMem (&TargetTag->Id2, &((EFI_IFR_EQ_ID_LIST *) FormData)->ListLength, sizeof (UINT16));\r
- TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_LIST *) FormData)->Width;\r
+ case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:\r
+ CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->QuestionId, sizeof (UINT16));\r
+ CopyMem (&TargetTag->Id2, &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->ListLength, sizeof (UINT16));\r
+ TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->Width;\r
\r
TargetTag->IntList = AllocateZeroPool (TargetTag->Id2 * sizeof (UINT16));\r
ASSERT (TargetTag->IntList);\r
for (TempValue = 0; TempValue < TargetTag->Id2; TempValue++) {\r
CopyMem (\r
&TargetTag->IntList[TempValue],\r
- &((EFI_IFR_EQ_ID_LIST *) FormData)->ValueList[TempValue],\r
+ &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->ValueList[TempValue],\r
sizeof (UINT16)\r
);\r
}\r
TargetTag->VariableNumber = CurrentVariable;\r
break;\r
\r
- case EFI_IFR_FORM_SET_OP:\r
- CopyMem (&VariableSize, &((EFI_IFR_FORM_SET *) FormData)->NvDataSize, sizeof (UINT16));\r
- CopyMem (&Guid, &((EFI_IFR_FORM_SET *) FormData)->Guid, sizeof (EFI_GUID));\r
+ case FRAMEWORK_EFI_IFR_FORM_SET_OP:\r
+ CopyMem (&VariableSize, &((FRAMEWORK_EFI_IFR_FORM_SET *) FormData)->NvDataSize, sizeof (UINT16));\r
+ CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) FormData)->Guid, sizeof (EFI_GUID));\r
//\r
// If there is a size specified in the formste, we will establish a "default" variable\r
//\r
}\r
break;\r
\r
- case EFI_IFR_END_FORM_SET_OP:\r
+ case FRAMEWORK_EFI_IFR_END_FORM_SET_OP:\r
CurrentVariable = 0;\r
CurrentVariable2 = 0;\r
break;\r
projects / mirror_edk2.git / blobdiff