IN UI_MENU_OPTION *MenuOption,\r
IN BOOLEAN PromptForPassword,\r
IN EFI_TAG *Tag,\r
- IN EFI_IFR_DATA_ARRAY *PageData,\r
+ IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,\r
IN BOOLEAN SecondEntry,\r
IN EFI_FILE_FORM_TAGS *FileFormTags,\r
OUT CHAR16 *StringPtr\r
EFI_VARIABLE_DEFINITION *VariableDefinition;\r
UINTN DimensionsWidth;\r
UINTN DimensionsHeight;\r
- EFI_IFR_DATA_ENTRY *DataEntry;\r
+ FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;\r
UINTN WidthOfString;\r
\r
DimensionsWidth = gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn;\r
ASSERT (TempString);\r
ASSERT (TempString2);\r
\r
- if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
//\r
// Password requires a callback to determine if a password exists\r
//\r
- DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
- DataEntry->OpCode = EFI_IFR_PASSWORD_OP;\r
+ DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
+ DataEntry->OpCode = FRAMEWORK_EFI_IFR_PASSWORD_OP;\r
DataEntry->Length = 3;\r
\r
ExtractRequestedNvMap (FileFormTags, Tag->VariableNumber, &VariableDefinition);\r
break;\r
\r
case CHAR_CARRIAGE_RETURN:\r
- if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
//\r
// User just typed a string in\r
//\r
- DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
- DataEntry->OpCode = EFI_IFR_PASSWORD_OP;\r
+ DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
+ DataEntry->OpCode = FRAMEWORK_EFI_IFR_PASSWORD_OP;\r
\r
//\r
// If the user just typed in a password, Data = 1\r
);\r
}\r
\r
- DataEntry->Length = sizeof (EFI_IFR_DATA_ENTRY);\r
+ DataEntry->Length = sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY);\r
DataEntry->Data = (VOID *) TempString;\r
} else {\r
DataEntry->Length = 3;\r
);\r
}\r
\r
- DataEntry->Length = sizeof (EFI_IFR_DATA_ENTRY);\r
+ DataEntry->Length = sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY);\r
DataEntry->Data = (VOID *) TempString2;\r
}\r
\r
if (ManualInput) {\r
PrintAt (Column, Row, (CHAR16 *) L"[ ]");\r
Column++;\r
- if (Tag->Operand != EFI_IFR_TIME_OP) {\r
+ if (Tag->Operand != FRAMEWORK_EFI_IFR_TIME_OP) {\r
*Value = BackupValue;\r
}\r
}\r
switch (Key.UnicodeChar) {\r
case '+':\r
case '-':\r
- if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
Key.UnicodeChar = CHAR_NULL;\r
if (Key.UnicodeChar == '+') {\r
Key.ScanCode = SCAN_RIGHT;\r
switch (Key.ScanCode) {\r
case SCAN_LEFT:\r
case SCAN_RIGHT:\r
- if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
//\r
// By setting this value, we will return back to the caller.\r
// We need to do this since an auto-refresh will destroy the adjustment\r
Number = (UINT16) GetStringWidth (FormattedNumber);\r
\r
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
- if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
for (Loop = 0; Loop < (UINTN) ((Number >= 8) ? 4 : 2); Loop++) {\r
PrintAt (MenuOption->OptCol + Loop, MenuOption->Row, (CHAR16 *) L" ");\r
}\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, &BackupValue, Tag->StorageWidth);\r
} else {\r
//\r
ShowDownArrow = FALSE;\r
ShowUpArrow = FALSE;\r
\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
ValueArrayBackup = AllocateZeroPool (Tag->StorageWidth);\r
ASSERT (ValueArrayBackup != NULL);\r
CopyMem (ValueArrayBackup, ValueArray, ValueCount);\r
//\r
// Get the number of one of options present and its size\r
//\r
- for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) {\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP &&\r
+ for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
!MenuOption->Tags[Index].Suppress) {\r
if (!FirstOptionFoundFlag) {\r
FirstOptionFoundFlag = TRUE;\r
//\r
if (Initialized) {\r
for (ValueBackup = (UINT8) MenuOption->TagIndex;\r
- MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_OP;\r
+ MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_OP;\r
ValueBackup++\r
) {\r
if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) {\r
break;\r
}\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
for (ValueBackup = (UINT8) MenuOption->TagIndex;\r
- MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_ONE_OF_OP;\r
+ MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
ValueBackup++\r
) {\r
//\r
//\r
Index2 = Top + 1;\r
for (Index = MenuOption->TagIndex + TopOptionIndex;\r
- (MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP) && (Index2 < Bottom);\r
+ (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) && (Index2 < Bottom);\r
Index++\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
Token = MenuOption->Tags[Index].Text;\r
if (Initialized) {\r
for (ValueBackup = (UINT8) MenuOption->TagIndex;\r
- MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_ONE_OF_OP;\r
+ MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
ValueBackup++\r
) {\r
if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) {\r
}\r
\r
if (!KeyInitialized) {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_ONE_OF_OP) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_ONE_OF_OP) {\r
*KeyValue = MenuOption->Tags[MenuOption->TagIndex + 1].Key;\r
} else {\r
*KeyValue = MenuOption->ThisTag->Key;\r
// If an ordered list op-code, we will allow for a popup of +/- keys\r
// to create an ordered list of items\r
//\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
if (Key.UnicodeChar == '+') {\r
if ((TopOptionIndex > 1) && (HighlightPosition == (Top + 1))) {\r
//\r
}\r
\r
for (Index = MenuOption->TagIndex + TopOptionIndex;\r
- MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP;\r
+ MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
Index++\r
) {\r
- if (MenuOption->Tags[Index].Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
continue;\r
}\r
\r
//\r
// Is this prior tag a valid choice? If not, bail out\r
//\r
- if (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
//\r
// Copy the destination tag to the local variable\r
//\r
}\r
\r
for (Index = MenuOption->TagIndex + TopOptionIndex;\r
- MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP;\r
+ MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
Index++\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 (Initialized) {\r
for (Index = 0; (ValueArrayBackup[Index] != TempValue) && (Index < ValueCount); Index++)\r
;\r
//\r
// Keep going until meets meaningful tag.\r
//\r
- while ((MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OPTION_OP &&\r
- MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OP &&\r
- MenuOption->Tags[TempIndex].Operand != EFI_IFR_END_ONE_OF_OP)\r
+ while ((MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
+ MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OP &&\r
+ MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP)\r
||\r
- (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP &&\r
+ (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
(MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) {\r
TempIndex--;\r
}\r
//\r
// Keep going until meets meaningful tag.\r
//\r
- while ((MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OPTION_OP &&\r
- MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OP &&\r
- MenuOption->Tags[TempIndex].Operand != EFI_IFR_END_ONE_OF_OP)\r
+ while ((MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
+ MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OP &&\r
+ MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP)\r
||\r
- (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP &&\r
+ (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&\r
(MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) {\r
TempIndex++;\r
}\r
//\r
// Only if the previous op-code is an option can we select it, otherwise we are at the left-most option\r
//\r
- if (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP) {\r
+ if (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {\r
TempValue = MenuOption->Tags[TempIndex].Value;\r
*KeyValue = MenuOption->Tags[TempIndex].Key;\r
} else {\r
//\r
// return the current selection\r
//\r
- if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
+ if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {\r
CopyMem (ValueArray, ValueArrayBackup, ValueCount);\r
FreePool (ValueArrayBackup);\r
} else {\r