VOID\r
UiAddMenuOption (\r
IN CHAR16 *String,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN EFI_TAG *Tags,\r
IN VOID *FormBinary,\r
IN UINTN IfrNumber\r
VOID\r
UiAddSubMenuOption (\r
IN CHAR16 *String,\r
- IN EFI_HII_HANDLE Handle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle,\r
IN EFI_TAG *Tags,\r
IN UINTN TagIndex,\r
IN UINT16 FormId,\r
gScreenDimensions.BottomRow - 1,\r
NvUpdateMessage\r
);\r
- gResetRequired = (BOOLEAN) (gResetRequired | ((Flags & EFI_IFR_FLAG_RESET_REQUIRED) == EFI_IFR_FLAG_RESET_REQUIRED));\r
+ gResetRequired = (BOOLEAN) (gResetRequired | ((Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) == FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
\r
gNvUpdateRequired = TRUE;\r
} else {\r
EFI_FILE_FORM_TAGS *PreviousFileForm;\r
EFI_FORM_TAGS *FormTags;\r
EFI_FORM_TAGS *PreviousFormTags;\r
- EFI_IFR_BINARY *IfrBinary;\r
- EFI_IFR_BINARY *PreviousIfrBinary;\r
+ FRAMEWORK_EFI_IFR_BINARY *IfrBinary;\r
+ FRAMEWORK_EFI_IFR_BINARY *PreviousIfrBinary;\r
EFI_INCONSISTENCY_DATA *Inconsistent;\r
EFI_VARIABLE_DEFINITION *VariableDefinition;\r
EFI_VARIABLE_DEFINITION *PreviousVariableDefinition;\r
//\r
// Walk through each of the tags and free the IntList allocation\r
//\r
- for (Index = 0; FormTags->Tags[Index].Operand != EFI_IFR_END_FORM_OP; Index++) {\r
+ for (Index = 0; FormTags->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP; Index++) {\r
//\r
// It is more than likely that the very last page will contain an end formset\r
//\r
- if (FormTags->Tags[Index].Operand == EFI_IFR_END_FORM_SET_OP) {\r
+ if (FormTags->Tags[Index].Operand == FRAMEWORK_EFI_IFR_END_FORM_SET_OP) {\r
break;\r
}\r
\r
//\r
// If the op-code has a late check, ensure consistency checks are now applied\r
//\r
- if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) {\r
+ if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {\r
if (ValueIsNotValid (TRUE, 0, Tag, FileFormTags, &PopUp)) {\r
if (PopUp != 0x0000) {\r
StringPtr = GetToken (PopUp, MenuOption->Handle);\r
UINT16\r
GetWidth (\r
IN EFI_TAG *Tag,\r
- IN EFI_HII_HANDLE Handle\r
+ IN FRAMEWORK_EFI_HII_HANDLE Handle\r
)\r
/*++\r
\r
//\r
// See if the second text parameter is really NULL\r
//\r
- if ((Tag->Operand == EFI_IFR_TEXT_OP) && (Tag->TextTwo != 0)) {\r
+ if ((Tag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (Tag->TextTwo != 0)) {\r
String = GetToken (Tag->TextTwo, Handle);\r
Size = StrLen (String);\r
FreePool (String);\r
}\r
\r
- if ((Tag->Operand == EFI_IFR_SUBTITLE_OP) ||\r
- (Tag->Operand == EFI_IFR_REF_OP) ||\r
- (Tag->Operand == EFI_IFR_PASSWORD_OP) ||\r
- (Tag->Operand == EFI_IFR_STRING_OP) ||\r
- (Tag->Operand == EFI_IFR_INVENTORY_OP) ||\r
+ if ((Tag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) ||\r
+ (Tag->Operand == FRAMEWORK_EFI_IFR_REF_OP) ||\r
+ (Tag->Operand == FRAMEWORK_EFI_IFR_PASSWORD_OP) ||\r
+ (Tag->Operand == FRAMEWORK_EFI_IFR_STRING_OP) ||\r
+ (Tag->Operand == FRAMEWORK_EFI_IFR_INVENTORY_OP) ||\r
//\r
// Allow a wide display if text op-code and no secondary text op-code\r
//\r
- ((Tag->Operand == EFI_IFR_TEXT_OP) && (Size == 0x0000))\r
+ ((Tag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (Size == 0x0000))\r
) {\r
return (UINT16) (gPromptBlockWidth + gOptionBlockWidth);\r
} else {\r
STATIC\r
VOID\r
UpdateOptionSkipLines (\r
- IN EFI_IFR_DATA_ARRAY *PageData,\r
+ IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,\r
IN UI_MENU_OPTION *MenuOption,\r
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,\r
IN CHAR16 **OptionalString,\r
UiDisplayMenu (\r
IN BOOLEAN SubMenu,\r
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,\r
- OUT EFI_IFR_DATA_ARRAY *PageData\r
+ OUT FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData\r
)\r
/*++\r
\r
Arguments:\r
SubMenu - Indicate is sub menu.\r
FileFormTagsHead - A pointer to the EFI_FILE_FORM_TAGS structure.\r
- PageData - A pointer to the EFI_IFR_DATA_ARRAY.\r
+ PageData - A pointer to the FRAMEWORK_EFI_IFR_DATA_ARRAY.\r
\r
Returns:\r
Return the pointer of the menu which selected,\r
UI_MENU_OPTION *NextMenuOption;\r
UI_MENU_OPTION *SavedMenuOption;\r
UI_MENU_OPTION *PreviousMenuOption;\r
- EFI_IFR_BINARY *IfrBinary;\r
+ FRAMEWORK_EFI_IFR_BINARY *IfrBinary;\r
UI_CONTROL_FLAG ControlFlag;\r
EFI_SCREEN_DESCRIPTOR LocalScreen;\r
EFI_FILE_FORM_TAGS *FileFormTags;\r
if (MenuOption->ThisTag->GrayOut) {\r
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);\r
} else {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) {\r
gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);\r
}\r
}\r
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);\r
\r
if (OptionString != NULL) {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||\r
- MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||\r
+ MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP\r
) {\r
//\r
// If leading spaces on OptionString - remove the spaces\r
//\r
// If this is a date or time op-code and is used to reflect an RTC, register the op-code\r
//\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||\r
- MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP) &&\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||\r
+ MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP) &&\r
(MenuOption->ThisTag->StorageStart >= FileFormTags->FormTags.Tags[0].NvDataSize)) {\r
\r
if (gMenuRefreshHead == NULL) {\r
//\r
// If this is a text op with secondary text information\r
//\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_TEXT_OP) && (MenuOption->ThisTag->TextTwo != 0)) {\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (MenuOption->ThisTag->TextTwo != 0)) {\r
StringPtr = GetToken (MenuOption->ThisTag->TextTwo, MenuOption->Handle);\r
\r
Width = (UINT16) gOptionBlockWidth;\r
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);\r
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
if (OptionString != NULL) {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||\r
- MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||\r
+ MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP\r
) {\r
//\r
// If leading spaces on OptionString - remove the spaces\r
if (MenuOption->ThisTag->GrayOut) {\r
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);\r
} else {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) {\r
gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);\r
}\r
}\r
// This is only possible if we entered this page and the first menu option is\r
// a "non-menu" item. In that case, force it UiDown\r
//\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
//\r
// If we previously hit an UP command and we are still sitting on a text operation\r
// we must continue going up\r
if (SubMenu) {\r
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);\r
if (OptionString != NULL) {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||\r
- MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||\r
+ MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP\r
) {\r
//\r
// If leading spaces on OptionString - remove the spaces\r
\r
if (SubMenu &&\r
(Repaint || NewLine ||\r
- (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) ||\r
- (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) &&\r
+ (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) ||\r
+ (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) &&\r
!(gClassOfVfr == EFI_GENERAL_APPLICATION_SUBCLASS)) {\r
//\r
// Don't print anything if it is a NULL help token\r
\r
Status = UiWaitForSingleEvent (gST->ConIn->WaitForKey, ONE_SECOND);\r
if (Status == EFI_TIMEOUT) {\r
- EFI_IFR_DATA_ENTRY *DataEntry;\r
+ FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;\r
\r
- DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
+ DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);\r
\r
PageData->EntryCount = 1;\r
Count = (UINT32) ((OriginalTimeOut - FrontPageTimeOutValue) * 100 / OriginalTimeOut);\r
FormCallback->Callback (\r
FormCallback,\r
0xFFFF,\r
- (EFI_IFR_DATA_ARRAY *) PageData,\r
+ (FRAMEWORK_EFI_IFR_DATA_ARRAY *) PageData,\r
NULL\r
);\r
}\r
FormCallback->Callback (\r
FormCallback,\r
0xFFFE,\r
- (EFI_IFR_DATA_ARRAY *) PageData,\r
+ (FRAMEWORK_EFI_IFR_DATA_ARRAY *) PageData,\r
NULL\r
);\r
}\r
//\r
case '+':\r
case '-':\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
\r
if (Key.UnicodeChar == '+') {\r
gDirection = SCAN_RIGHT;\r
case ' ':\r
if (gClassOfVfr != EFI_FRONT_PAGE_SUBCLASS) {\r
if (SubMenu) {\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_CHECKBOX_OP && !(MenuOption->ThisTag->GrayOut)) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_CHECKBOX_OP && !(MenuOption->ThisTag->GrayOut)) {\r
gST->ConOut->SetCursorPosition (gST->ConOut, MenuOption->Col, MenuOption->Row);\r
gST->ConOut->OutputString (gST->ConOut, MenuOption->Description);\r
Selection = MenuOption;\r
//\r
for (Link = Menu.ForwardLink; Link != &Menu; Link = Link->ForwardLink) {\r
NextMenuOption = CR (Link, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);\r
- if (!(NextMenuOption->ThisTag->GrayOut) && (NextMenuOption->ThisTag->Operand != EFI_IFR_SUBTITLE_OP)) {\r
+ if (!(NextMenuOption->ThisTag->GrayOut) && (NextMenuOption->ThisTag->Operand != FRAMEWORK_EFI_IFR_SUBTITLE_OP)) {\r
break;\r
}\r
}\r
ExtractRequestedNvMap (FileFormTags, MenuOption->ThisTag->VariableNumber, &VariableDefinition);\r
\r
if (SubMenu) {\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_TEXT_OP &&\r
- !(MenuOption->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE)) ||\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP &&\r
+ !(MenuOption->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE)) ||\r
(MenuOption->ThisTag->GrayOut) ||\r
- (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) ||\r
- (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
+ (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) ||\r
+ (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
Selection = NULL;\r
break;\r
}\r
PrintStringAt (LocalScreen.LeftColumn + gPromptBlockWidth + 1, MenuOption->Row, OptionString);\r
}\r
\r
- if (MenuOption->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE) {\r
+ if (MenuOption->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {\r
Selection = MenuOption;\r
}\r
\r
//\r
// If not a goto, dump single piece of data, otherwise dump everything\r
//\r
- if (Selection->ThisTag->Operand == EFI_IFR_REF_OP) {\r
+ if (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_REF_OP) {\r
//\r
// Check for tags that might have LATE_CHECK enabled. If they do, we can't switch pages or save NV data.\r
//\r
\r
case CfUiLeft:\r
ControlFlag = CfCheckSelection;\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
if (MenuOption->Skip == 1) {\r
//\r
// In the tail of the Date/Time op-code set, go left.\r
case CfUiRight:\r
ControlFlag = CfCheckSelection;\r
if ((MenuOption->Skip == 0) &&\r
- ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP))\r
+ ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP))\r
) {\r
//\r
// We are in the head or middle of the Date/Time op-code set, advance right.\r
//\r
// If the previous MenuOption contains a display-only op-code, skip to the next one\r
//\r
- if (PreviousMenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || PreviousMenuOption->ThisTag->GrayOut) {\r
+ if (PreviousMenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || PreviousMenuOption->ThisTag->GrayOut) {\r
//\r
// This is ok as long as not at the end of the list\r
//\r
if (SubMenu) {\r
SavedMenuOption = MenuOption;\r
MenuOption = CR (NewPos, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
//\r
// If we are at the end of the list and sitting on a text op, we need to more forward\r
//\r
// If the next MenuOption contains a display-only op-code, skip to the next one\r
// Also if the next MenuOption is date or time,\r
//\r
- if (NextMenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || NextMenuOption->ThisTag->GrayOut) {\r
+ if (NextMenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || NextMenuOption->ThisTag->GrayOut) {\r
//\r
// This is ok as long as not at the end of the list\r
//\r
if (SubMenu) {\r
SavedMenuOption = MenuOption;\r
MenuOption = CR (NewPos, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);\r
- if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
+ if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {\r
//\r
// If we are at the end of the list and sitting on a text op, we need to more forward\r
//\r
\r
NvMapListHead = NULL;\r
\r
- Status = Hii->GetDefaultImage (Hii, MenuOption->Handle, EFI_IFR_FLAG_DEFAULT, &NvMapListHead);\r
+ Status = Hii->GetDefaultImage (Hii, MenuOption->Handle, FRAMEWORK_EFI_IFR_FLAG_DEFAULT, &NvMapListHead);\r
\r
if (!EFI_ERROR (Status)) {\r
ASSERT_EFI_ERROR (NULL != NvMapListHead);\r
\r
for (; Temp != &Menu; Temp = Direction ? Temp->BackLink : Temp->ForwardLink) {\r
MenuOption = CR (Temp, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);\r
- if (!(MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut)) {\r
+ if (!(MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut)) {\r
return FALSE;\r
}\r
}\r
NewPosition = *CurrentPosition;\r
MenuOption = CR (NewPosition, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);\r
\r
- if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
+ if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {\r
//\r
// Calculate the distance from current position to the last Date/Time op-code.\r
//\r
projects / mirror_edk2.git / blobdiff