UEFI HII: Merge UEFI HII support changes from branch.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4598 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -261,9 +261,9 @@ Returns:
|
||||
// We need to rewind to the beginning of the Inconsistent expression
|
||||
//
|
||||
for (;
|
||||
(InconsistentTags->Operand != EFI_IFR_INCONSISTENT_IF_OP) &&
|
||||
(InconsistentTags->Operand != EFI_IFR_GRAYOUT_IF_OP) &&
|
||||
(InconsistentTags->Operand != EFI_IFR_SUPPRESS_IF_OP);
|
||||
(InconsistentTags->Operand != FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP) &&
|
||||
(InconsistentTags->Operand != FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP) &&
|
||||
(InconsistentTags->Operand != FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP);
|
||||
) {
|
||||
InconsistentTags = InconsistentTags->Previous;
|
||||
}
|
||||
@@ -278,9 +278,9 @@ Returns:
|
||||
// consistency check like grayout/suppress
|
||||
//
|
||||
for (;
|
||||
InconsistentTags->Operand != EFI_IFR_END_IF_OP &&
|
||||
InconsistentTags->Operand != EFI_IFR_GRAYOUT_IF_OP &&
|
||||
InconsistentTags->Operand != EFI_IFR_SUPPRESS_IF_OP;
|
||||
InconsistentTags->Operand != FRAMEWORK_EFI_IFR_END_IF_OP &&
|
||||
InconsistentTags->Operand != FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP &&
|
||||
InconsistentTags->Operand != FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP;
|
||||
) {
|
||||
GrowBooleanExpression (InconsistentTags, BooleanExpression, BooleanExpressionLength);
|
||||
InconsistentTags = InconsistentTags->Next;
|
||||
@@ -397,16 +397,16 @@ Returns:
|
||||
// while Operand means ideqval, TRUE, or other what can be evaluated to True or False,
|
||||
// and Opcode means AND or OR.
|
||||
//
|
||||
if (Iterator->Operand == EFI_IFR_NOT_OP ||
|
||||
if (Iterator->Operand == FRAMEWORK_EFI_IFR_NOT_OP ||
|
||||
Iterator->Operand == 0) {
|
||||
return 0x1;
|
||||
} else if (Iterator->Operand == EFI_IFR_EQ_VAR_VAL_OP ||
|
||||
Iterator->Operand == EFI_IFR_EQ_ID_VAL_OP ||
|
||||
Iterator->Operand == EFI_IFR_EQ_ID_ID_OP ||
|
||||
Iterator->Operand == EFI_IFR_EQ_ID_LIST_OP) {
|
||||
} else if (Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP ||
|
||||
Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP ||
|
||||
Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_ID_ID_OP ||
|
||||
Iterator->Operand == FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP) {
|
||||
Iterator++;
|
||||
if (Iterator->Operand == EFI_IFR_AND_OP ||
|
||||
Iterator->Operand == EFI_IFR_OR_OP) {
|
||||
if (Iterator->Operand == FRAMEWORK_EFI_IFR_AND_OP ||
|
||||
Iterator->Operand == FRAMEWORK_EFI_IFR_OR_OP) {
|
||||
Iterator--;
|
||||
return 0x1;
|
||||
}
|
||||
@@ -507,7 +507,7 @@ Returns:
|
||||
}
|
||||
|
||||
switch ((*PIterator)->Operand) {
|
||||
case EFI_IFR_EQ_VAR_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
|
||||
UnicodeValueToString (
|
||||
VariableName,
|
||||
FALSE,
|
||||
@@ -539,9 +539,9 @@ Returns:
|
||||
//
|
||||
MapValue2 = (*PIterator)->Value;
|
||||
(*PIterator)++;
|
||||
if ((*PIterator)->Operand == EFI_IFR_GT_OP) {
|
||||
if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GT_OP) {
|
||||
PushValue = (BOOLEAN) (MapValue > MapValue2);
|
||||
} else if ((*PIterator)->Operand == EFI_IFR_GE_OP) {
|
||||
} else if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GE_OP) {
|
||||
PushValue = (BOOLEAN) (MapValue >= MapValue2);
|
||||
} else {
|
||||
(*PIterator)--;
|
||||
@@ -552,15 +552,15 @@ Returns:
|
||||
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
|
||||
//
|
||||
// Do operation after knowing the compare operator.
|
||||
//
|
||||
MapValue2 = (*PIterator)->Value;
|
||||
(*PIterator)++;
|
||||
if ((*PIterator)->Operand == EFI_IFR_GT_OP) {
|
||||
if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GT_OP) {
|
||||
PushValue = (BOOLEAN) (MapValue > MapValue2);
|
||||
} else if ((*PIterator)->Operand == EFI_IFR_GE_OP) {
|
||||
} else if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GE_OP) {
|
||||
PushValue = (BOOLEAN) (MapValue >= MapValue2);
|
||||
} else {
|
||||
(*PIterator)--;
|
||||
@@ -569,14 +569,14 @@ Returns:
|
||||
PushBool (StackPtr, PushValue);
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_ID_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
|
||||
//
|
||||
// Do operation after knowing the compare operator.
|
||||
//
|
||||
(*PIterator)++;
|
||||
if ((*PIterator)->Operand == EFI_IFR_GT_OP) {
|
||||
if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GT_OP) {
|
||||
PushValue = (BOOLEAN) (MapValue > MapValue2);
|
||||
} else if ((*PIterator)->Operand == EFI_IFR_GE_OP) {
|
||||
} else if ((*PIterator)->Operand == FRAMEWORK_EFI_IFR_GE_OP) {
|
||||
PushValue = (BOOLEAN) (MapValue >= MapValue2);
|
||||
} else {
|
||||
(*PIterator)--;
|
||||
@@ -585,7 +585,7 @@ Returns:
|
||||
PushBool (StackPtr, PushValue);
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
|
||||
for (Index = 0; Index < (*PIterator)->ListLength; Index++) {
|
||||
Operator = (BOOLEAN) (MapValue == (*PIterator)->ValueList[Index]);
|
||||
if (Operator) {
|
||||
@@ -596,32 +596,32 @@ Returns:
|
||||
PushBool (StackPtr, Operator);
|
||||
break;
|
||||
|
||||
case EFI_IFR_TRUE_OP:
|
||||
case FRAMEWORK_EFI_IFR_TRUE_OP:
|
||||
PushBool (StackPtr, TRUE);
|
||||
break;
|
||||
|
||||
case EFI_IFR_FALSE_OP:
|
||||
case FRAMEWORK_EFI_IFR_FALSE_OP:
|
||||
PushBool (StackPtr, FALSE);
|
||||
break;
|
||||
|
||||
case EFI_IFR_AND_OP:
|
||||
case FRAMEWORK_EFI_IFR_AND_OP:
|
||||
Operator = PopBool (StackPtr);
|
||||
Operator2 = PopBool (StackPtr);
|
||||
PushBool (StackPtr, (BOOLEAN) (Operator && Operator2));
|
||||
break;
|
||||
case EFI_IFR_OR_OP:
|
||||
case FRAMEWORK_EFI_IFR_OR_OP:
|
||||
Operator = PopBool (StackPtr);
|
||||
Operator2 = PopBool (StackPtr);
|
||||
PushBool (StackPtr, (BOOLEAN) (Operator || Operator2));
|
||||
break;
|
||||
case EFI_IFR_NOT_OP:
|
||||
case FRAMEWORK_EFI_IFR_NOT_OP:
|
||||
Operator = PopBool (StackPtr);
|
||||
PushBool (StackPtr, (BOOLEAN) (!Operator));
|
||||
break;
|
||||
|
||||
case EFI_IFR_SUPPRESS_IF_OP:
|
||||
case EFI_IFR_GRAYOUT_IF_OP:
|
||||
case EFI_IFR_INCONSISTENT_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:
|
||||
default:
|
||||
//
|
||||
// Return to the previous tag if runs out of boolean expression.
|
||||
@@ -750,7 +750,7 @@ Returns:
|
||||
}
|
||||
|
||||
switch (Iterator->Operand) {
|
||||
case EFI_IFR_SUPPRESS_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:
|
||||
//
|
||||
// Must have hit a suppress followed by a grayout or vice-versa
|
||||
//
|
||||
@@ -768,7 +768,7 @@ Returns:
|
||||
*PopUp = Iterator->Popup;
|
||||
break;
|
||||
|
||||
case EFI_IFR_GRAYOUT_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:
|
||||
//
|
||||
// Must have hit a suppress followed by a grayout or vice-versa
|
||||
//
|
||||
@@ -786,7 +786,7 @@ Returns:
|
||||
*PopUp = Iterator->Popup;
|
||||
break;
|
||||
|
||||
case EFI_IFR_INCONSISTENT_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:
|
||||
CosmeticConsistency = FALSE;
|
||||
*PopUp = Iterator->Popup;
|
||||
break;
|
||||
@@ -795,7 +795,7 @@ Returns:
|
||||
// In the case of external variable values, we must read the variable which is
|
||||
// named by the human readable version of the OpCode->VariableId and the guid of the formset
|
||||
//
|
||||
case EFI_IFR_EQ_VAR_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
|
||||
//
|
||||
// To check whether Ifr is legacy. Once every boolean expression.
|
||||
//
|
||||
@@ -838,7 +838,7 @@ Returns:
|
||||
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
|
||||
//
|
||||
// To check whether Ifr is legacy. Once every boolean expression.
|
||||
//
|
||||
@@ -853,7 +853,7 @@ Returns:
|
||||
PushBool (&StackPtr, (BOOLEAN) (MapValue == Iterator->Value));
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_ID_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
|
||||
//
|
||||
// To check whether Ifr is legacy. Once every boolean expression.
|
||||
//
|
||||
@@ -868,7 +868,7 @@ Returns:
|
||||
PushBool (&StackPtr, (BOOLEAN) (MapValue == MapValue2));
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
|
||||
//
|
||||
// To check whether Ifr is legacy. Once every boolean expression.
|
||||
//
|
||||
@@ -890,9 +890,9 @@ Returns:
|
||||
PushBool (&StackPtr, Operator);
|
||||
break;
|
||||
|
||||
case EFI_IFR_AND_OP:
|
||||
case FRAMEWORK_EFI_IFR_AND_OP:
|
||||
Iterator++;
|
||||
if (Iterator->Operand == EFI_IFR_NOT_OP) {
|
||||
if (Iterator->Operand == FRAMEWORK_EFI_IFR_NOT_OP) {
|
||||
NotOperator = TRUE;
|
||||
Iterator++;
|
||||
}
|
||||
@@ -922,7 +922,7 @@ Returns:
|
||||
}
|
||||
|
||||
switch (Iterator->Operand) {
|
||||
case EFI_IFR_EQ_ID_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
|
||||
//
|
||||
// If Not - flip the results
|
||||
//
|
||||
@@ -939,7 +939,7 @@ Returns:
|
||||
// In the case of external variable values, we must read the variable which is
|
||||
// named by the human readable version of the OpCode->VariableId and the guid of the formset
|
||||
//
|
||||
case EFI_IFR_EQ_VAR_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
|
||||
UnicodeValueToString (
|
||||
VariableName,
|
||||
FALSE,
|
||||
@@ -976,7 +976,7 @@ Returns:
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_ID_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
|
||||
//
|
||||
// If Not - flip the results
|
||||
//
|
||||
@@ -989,7 +989,7 @@ Returns:
|
||||
PushBool (&StackPtr, Operator);
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
|
||||
for (Index = 0; Index < Iterator->ListLength; Index++) {
|
||||
//
|
||||
// If Not - flip the results
|
||||
@@ -1026,9 +1026,9 @@ Returns:
|
||||
PushBool (&StackPtr, (BOOLEAN) (Operator && Operator2));
|
||||
break;
|
||||
|
||||
case EFI_IFR_OR_OP:
|
||||
case FRAMEWORK_EFI_IFR_OR_OP:
|
||||
Iterator++;
|
||||
if (Iterator->Operand == EFI_IFR_NOT_OP) {
|
||||
if (Iterator->Operand == FRAMEWORK_EFI_IFR_NOT_OP) {
|
||||
NotOperator = TRUE;
|
||||
Iterator++;
|
||||
}
|
||||
@@ -1058,7 +1058,7 @@ Returns:
|
||||
}
|
||||
|
||||
switch (Iterator->Operand) {
|
||||
case EFI_IFR_EQ_ID_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
|
||||
//
|
||||
// If Not - flip the results
|
||||
//
|
||||
@@ -1075,7 +1075,7 @@ Returns:
|
||||
// In the case of external variable values, we must read the variable which is
|
||||
// named by the human readable version of the OpCode->VariableId and the guid of the formset
|
||||
//
|
||||
case EFI_IFR_EQ_VAR_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
|
||||
UnicodeValueToString (
|
||||
VariableName,
|
||||
FALSE,
|
||||
@@ -1112,7 +1112,7 @@ Returns:
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_ID_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
|
||||
//
|
||||
// If Not - flip the results
|
||||
//
|
||||
@@ -1125,7 +1125,7 @@ Returns:
|
||||
PushBool (&StackPtr, Operator);
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
|
||||
for (Index = 0; Index < Iterator->ListLength; Index++) {
|
||||
//
|
||||
// If Not - flip the results
|
||||
@@ -1162,7 +1162,7 @@ Returns:
|
||||
PushBool (&StackPtr, (BOOLEAN) (Operator || Operator2));
|
||||
break;
|
||||
|
||||
case EFI_IFR_NOT_OP:
|
||||
case FRAMEWORK_EFI_IFR_NOT_OP:
|
||||
//
|
||||
// To check whether Ifr is legacy. Once every boolean expression.
|
||||
//
|
||||
@@ -1179,12 +1179,12 @@ Returns:
|
||||
//
|
||||
Iterator++;
|
||||
|
||||
if (Iterator->Operand == EFI_IFR_OR_OP) {
|
||||
if (Iterator->Operand == FRAMEWORK_EFI_IFR_OR_OP) {
|
||||
OrOperator = TRUE;
|
||||
Iterator++;
|
||||
}
|
||||
|
||||
if (Iterator->Operand == EFI_IFR_AND_OP) {
|
||||
if (Iterator->Operand == FRAMEWORK_EFI_IFR_AND_OP) {
|
||||
AndOperator = TRUE;
|
||||
Iterator++;
|
||||
}
|
||||
@@ -1214,7 +1214,7 @@ Returns:
|
||||
}
|
||||
|
||||
switch (Iterator->Operand) {
|
||||
case EFI_IFR_EQ_ID_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
|
||||
Operator = (BOOLEAN)!(MapValue == Iterator->Value);
|
||||
PushBool (&StackPtr, Operator);
|
||||
break;
|
||||
@@ -1223,7 +1223,7 @@ Returns:
|
||||
// In the case of external variable values, we must read the variable which is
|
||||
// named by the human readable version of the OpCode->VariableId and the guid of the formset
|
||||
//
|
||||
case EFI_IFR_EQ_VAR_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
|
||||
UnicodeValueToString (
|
||||
VariableName,
|
||||
FALSE,
|
||||
@@ -1254,12 +1254,12 @@ Returns:
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_ID_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
|
||||
Operator = (BOOLEAN)!(MapValue == MapValue2);
|
||||
PushBool (&StackPtr, Operator);
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
|
||||
for (Index = 0; Index < Iterator->ListLength; Index++) {
|
||||
Operator = (BOOLEAN)!(MapValue == Iterator->ValueList[Index]);
|
||||
if (Operator) {
|
||||
@@ -1290,7 +1290,7 @@ Returns:
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_TRUE_OP:
|
||||
case FRAMEWORK_EFI_IFR_TRUE_OP:
|
||||
//
|
||||
// To check whether Ifr is legacy. Once every boolean expression.
|
||||
//
|
||||
@@ -1303,7 +1303,7 @@ Returns:
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_FALSE_OP:
|
||||
case FRAMEWORK_EFI_IFR_FALSE_OP:
|
||||
//
|
||||
// To check whether Ifr is legacy. Once every boolean expression.
|
||||
//
|
||||
@@ -1316,7 +1316,7 @@ Returns:
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_END_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_END_IF_OP:
|
||||
Operator = PopBool (&StackPtr);
|
||||
//
|
||||
// If there is an error, return, otherwise keep looking - there might
|
||||
|
@@ -195,7 +195,7 @@ ReadPassword (
|
||||
IN UI_MENU_OPTION *MenuOption,
|
||||
IN BOOLEAN PromptForPassword,
|
||||
IN EFI_TAG *Tag,
|
||||
IN EFI_IFR_DATA_ARRAY *PageData,
|
||||
IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,
|
||||
IN BOOLEAN SecondEntry,
|
||||
IN EFI_FILE_FORM_TAGS *FileFormTags,
|
||||
OUT CHAR16 *StringPtr
|
||||
@@ -219,7 +219,7 @@ ReadPassword (
|
||||
EFI_VARIABLE_DEFINITION *VariableDefinition;
|
||||
UINTN DimensionsWidth;
|
||||
UINTN DimensionsHeight;
|
||||
EFI_IFR_DATA_ENTRY *DataEntry;
|
||||
FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;
|
||||
UINTN WidthOfString;
|
||||
|
||||
DimensionsWidth = gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn;
|
||||
@@ -252,12 +252,12 @@ ReadPassword (
|
||||
ASSERT (TempString);
|
||||
ASSERT (TempString2);
|
||||
|
||||
if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {
|
||||
if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
|
||||
//
|
||||
// Password requires a callback to determine if a password exists
|
||||
//
|
||||
DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);
|
||||
DataEntry->OpCode = EFI_IFR_PASSWORD_OP;
|
||||
DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);
|
||||
DataEntry->OpCode = FRAMEWORK_EFI_IFR_PASSWORD_OP;
|
||||
DataEntry->Length = 3;
|
||||
|
||||
ExtractRequestedNvMap (FileFormTags, Tag->VariableNumber, &VariableDefinition);
|
||||
@@ -347,12 +347,12 @@ Error:
|
||||
break;
|
||||
|
||||
case CHAR_CARRIAGE_RETURN:
|
||||
if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {
|
||||
if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
|
||||
//
|
||||
// User just typed a string in
|
||||
//
|
||||
DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);
|
||||
DataEntry->OpCode = EFI_IFR_PASSWORD_OP;
|
||||
DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);
|
||||
DataEntry->OpCode = FRAMEWORK_EFI_IFR_PASSWORD_OP;
|
||||
|
||||
//
|
||||
// If the user just typed in a password, Data = 1
|
||||
@@ -371,7 +371,7 @@ Error:
|
||||
);
|
||||
}
|
||||
|
||||
DataEntry->Length = sizeof (EFI_IFR_DATA_ENTRY);
|
||||
DataEntry->Length = sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY);
|
||||
DataEntry->Data = (VOID *) TempString;
|
||||
} else {
|
||||
DataEntry->Length = 3;
|
||||
@@ -386,7 +386,7 @@ Error:
|
||||
);
|
||||
}
|
||||
|
||||
DataEntry->Length = sizeof (EFI_IFR_DATA_ENTRY);
|
||||
DataEntry->Length = sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY);
|
||||
DataEntry->Data = (VOID *) TempString2;
|
||||
}
|
||||
|
||||
@@ -661,7 +661,7 @@ Returns:
|
||||
if (ManualInput) {
|
||||
PrintAt (Column, Row, (CHAR16 *) L"[ ]");
|
||||
Column++;
|
||||
if (Tag->Operand != EFI_IFR_TIME_OP) {
|
||||
if (Tag->Operand != FRAMEWORK_EFI_IFR_TIME_OP) {
|
||||
*Value = BackupValue;
|
||||
}
|
||||
}
|
||||
@@ -683,7 +683,7 @@ TheKey2:
|
||||
switch (Key.UnicodeChar) {
|
||||
case '+':
|
||||
case '-':
|
||||
if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {
|
||||
if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
|
||||
Key.UnicodeChar = CHAR_NULL;
|
||||
if (Key.UnicodeChar == '+') {
|
||||
Key.ScanCode = SCAN_RIGHT;
|
||||
@@ -699,7 +699,7 @@ TheKey2:
|
||||
switch (Key.ScanCode) {
|
||||
case SCAN_LEFT:
|
||||
case SCAN_RIGHT:
|
||||
if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {
|
||||
if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
|
||||
//
|
||||
// By setting this value, we will return back to the caller.
|
||||
// We need to do this since an auto-refresh will destroy the adjustment
|
||||
@@ -734,7 +734,7 @@ TheKey2:
|
||||
Number = (UINT16) GetStringWidth (FormattedNumber);
|
||||
|
||||
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);
|
||||
if ((Tag->Operand == EFI_IFR_DATE_OP) || (Tag->Operand == EFI_IFR_TIME_OP)) {
|
||||
if ((Tag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Tag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
|
||||
for (Loop = 0; Loop < (UINTN) ((Number >= 8) ? 4 : 2); Loop++) {
|
||||
PrintAt (MenuOption->OptCol + Loop, MenuOption->Row, (CHAR16 *) L" ");
|
||||
}
|
||||
@@ -847,7 +847,7 @@ EnterCarriageReturn:
|
||||
// if two questions are bound by consistency checks and each only has two possible choices, there
|
||||
// would be no way for a user to switch the values. Thus we require late checking.
|
||||
//
|
||||
if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) {
|
||||
if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {
|
||||
CopyMem (&Tag->OldValue, &BackupValue, Tag->StorageWidth);
|
||||
} else {
|
||||
//
|
||||
@@ -1015,7 +1015,7 @@ GetSelectionInputPopUp (
|
||||
ShowDownArrow = FALSE;
|
||||
ShowUpArrow = FALSE;
|
||||
|
||||
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
ValueArrayBackup = AllocateZeroPool (Tag->StorageWidth);
|
||||
ASSERT (ValueArrayBackup != NULL);
|
||||
CopyMem (ValueArrayBackup, ValueArray, ValueCount);
|
||||
@@ -1045,8 +1045,8 @@ GetSelectionInputPopUp (
|
||||
//
|
||||
// Get the number of one of options present and its size
|
||||
//
|
||||
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) {
|
||||
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP &&
|
||||
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {
|
||||
if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&
|
||||
!MenuOption->Tags[Index].Suppress) {
|
||||
if (!FirstOptionFoundFlag) {
|
||||
FirstOptionFoundFlag = TRUE;
|
||||
@@ -1060,7 +1060,7 @@ GetSelectionInputPopUp (
|
||||
//
|
||||
if (Initialized) {
|
||||
for (ValueBackup = (UINT8) MenuOption->TagIndex;
|
||||
MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_OP;
|
||||
MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_OP;
|
||||
ValueBackup++
|
||||
) {
|
||||
if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) {
|
||||
@@ -1123,9 +1123,9 @@ GetSelectionInputPopUp (
|
||||
break;
|
||||
}
|
||||
|
||||
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
for (ValueBackup = (UINT8) MenuOption->TagIndex;
|
||||
MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_ONE_OF_OP;
|
||||
MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;
|
||||
ValueBackup++
|
||||
) {
|
||||
//
|
||||
@@ -1190,14 +1190,14 @@ GetSelectionInputPopUp (
|
||||
//
|
||||
Index2 = Top + 1;
|
||||
for (Index = MenuOption->TagIndex + TopOptionIndex;
|
||||
(MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP) && (Index2 < Bottom);
|
||||
(MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) && (Index2 < Bottom);
|
||||
Index++
|
||||
) {
|
||||
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
Token = MenuOption->Tags[Index].Text;
|
||||
if (Initialized) {
|
||||
for (ValueBackup = (UINT8) MenuOption->TagIndex;
|
||||
MenuOption->Tags[ValueBackup].Operand != EFI_IFR_END_ONE_OF_OP;
|
||||
MenuOption->Tags[ValueBackup].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;
|
||||
ValueBackup++
|
||||
) {
|
||||
if (MenuOption->Tags[ValueBackup].Value == ((UINT8 *) ValueArrayBackup)[Index - MenuOption->TagIndex - 1]) {
|
||||
@@ -1282,7 +1282,7 @@ GetSelectionInputPopUp (
|
||||
}
|
||||
|
||||
if (!KeyInitialized) {
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_ONE_OF_OP) {
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_ONE_OF_OP) {
|
||||
*KeyValue = MenuOption->Tags[MenuOption->TagIndex + 1].Key;
|
||||
} else {
|
||||
*KeyValue = MenuOption->ThisTag->Key;
|
||||
@@ -1301,7 +1301,7 @@ TheKey:
|
||||
// If an ordered list op-code, we will allow for a popup of +/- keys
|
||||
// to create an ordered list of items
|
||||
//
|
||||
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (Key.UnicodeChar == '+') {
|
||||
if ((TopOptionIndex > 1) && (HighlightPosition == (Top + 1))) {
|
||||
//
|
||||
@@ -1329,10 +1329,10 @@ TheKey:
|
||||
}
|
||||
|
||||
for (Index = MenuOption->TagIndex + TopOptionIndex;
|
||||
MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP;
|
||||
MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;
|
||||
Index++
|
||||
) {
|
||||
if (MenuOption->Tags[Index].Operand == EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -1348,7 +1348,7 @@ TheKey:
|
||||
//
|
||||
// Is this prior tag a valid choice? If not, bail out
|
||||
//
|
||||
if (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
if (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
//
|
||||
// Copy the destination tag to the local variable
|
||||
//
|
||||
@@ -1434,10 +1434,10 @@ TheKey:
|
||||
}
|
||||
|
||||
for (Index = MenuOption->TagIndex + TopOptionIndex;
|
||||
MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP;
|
||||
MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;
|
||||
Index++
|
||||
) {
|
||||
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
if (Initialized) {
|
||||
for (Index = 0; (ValueArrayBackup[Index] != TempValue) && (Index < ValueCount); Index++)
|
||||
;
|
||||
@@ -1466,11 +1466,11 @@ TheKey:
|
||||
//
|
||||
// Keep going until meets meaningful tag.
|
||||
//
|
||||
while ((MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OPTION_OP &&
|
||||
MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OP &&
|
||||
MenuOption->Tags[TempIndex].Operand != EFI_IFR_END_ONE_OF_OP)
|
||||
while ((MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&
|
||||
MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OP &&
|
||||
MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP)
|
||||
||
|
||||
(MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP &&
|
||||
(MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&
|
||||
(MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) {
|
||||
TempIndex--;
|
||||
}
|
||||
@@ -1480,11 +1480,11 @@ TheKey:
|
||||
//
|
||||
// Keep going until meets meaningful tag.
|
||||
//
|
||||
while ((MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OPTION_OP &&
|
||||
MenuOption->Tags[TempIndex].Operand != EFI_IFR_ONE_OF_OP &&
|
||||
MenuOption->Tags[TempIndex].Operand != EFI_IFR_END_ONE_OF_OP)
|
||||
while ((MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&
|
||||
MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_ONE_OF_OP &&
|
||||
MenuOption->Tags[TempIndex].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP)
|
||||
||
|
||||
(MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP &&
|
||||
(MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP &&
|
||||
(MenuOption->Tags[TempIndex].Suppress || MenuOption->Tags[TempIndex].GrayOut))) {
|
||||
TempIndex++;
|
||||
}
|
||||
@@ -1496,7 +1496,7 @@ TheKey:
|
||||
//
|
||||
// Only if the previous op-code is an option can we select it, otherwise we are at the left-most option
|
||||
//
|
||||
if (MenuOption->Tags[TempIndex].Operand == EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
if (MenuOption->Tags[TempIndex].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
TempValue = MenuOption->Tags[TempIndex].Value;
|
||||
*KeyValue = MenuOption->Tags[TempIndex].Key;
|
||||
} else {
|
||||
@@ -1528,7 +1528,7 @@ TheKey:
|
||||
//
|
||||
// return the current selection
|
||||
//
|
||||
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
CopyMem (ValueArray, ValueArrayBackup, ValueCount);
|
||||
FreePool (ValueArrayBackup);
|
||||
} else {
|
||||
|
@@ -356,7 +356,7 @@ DisplayForm (
|
||||
UINTN Index;
|
||||
UINTN Count;
|
||||
UINT16 MenuItemCount;
|
||||
EFI_HII_HANDLE Handle;
|
||||
FRAMEWORK_EFI_HII_HANDLE Handle;
|
||||
UINT16 FormId;
|
||||
STRING_REF String;
|
||||
EFI_FILE_FORM_TAGS *FileFormTags;
|
||||
@@ -432,14 +432,14 @@ DisplayForm (
|
||||
//
|
||||
FreePool (StringPtr);
|
||||
|
||||
for (Index = 0; FormTags.Tags[Index].Operand != EFI_IFR_END_FORM_OP; Index++) {
|
||||
for (Index = 0; FormTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP; Index++) {
|
||||
GrayOut = FALSE;
|
||||
Suppress = FALSE;
|
||||
SuppressIf = FALSE;
|
||||
Conditional = FALSE;
|
||||
FileFormTags = FileFormTagsHead;
|
||||
|
||||
if (FormTags.Tags[Index].Operand == EFI_IFR_FORM_OP) {
|
||||
if (FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_FORM_OP) {
|
||||
FormId = FormTags.Tags[Index].Id;
|
||||
}
|
||||
//
|
||||
@@ -465,10 +465,10 @@ DisplayForm (
|
||||
|
||||
do {
|
||||
switch (FormTags.Tags[Index].Operand) {
|
||||
case EFI_IFR_SUPPRESS_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:
|
||||
SuppressIf = TRUE;
|
||||
|
||||
case EFI_IFR_GRAYOUT_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:
|
||||
|
||||
Conditional = TRUE;
|
||||
|
||||
@@ -482,11 +482,11 @@ DisplayForm (
|
||||
// through the AND/OR/NOT data to come up with some meaningful ID data.
|
||||
//
|
||||
for (;
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_AND_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_OR_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_GT_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_GE_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_NOT_OP;
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_AND_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_OR_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GT_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GE_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_NOT_OP;
|
||||
Index++
|
||||
)
|
||||
;
|
||||
@@ -518,18 +518,18 @@ DisplayForm (
|
||||
// Advance to the end of the expression (Will land us at a grayoutif/suppressif or the op-code being affected)
|
||||
//
|
||||
for (;
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_EQ_ID_VAL_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_EQ_VAR_VAL_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_EQ_ID_ID_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_EQ_ID_LIST_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_NOT_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_AND_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_OR_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_TRUE_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_FALSE_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_GT_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_GE_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_LABEL_OP;
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_ID_ID_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_NOT_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_AND_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_OR_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_TRUE_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_FALSE_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GT_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_GE_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_LABEL_OP;
|
||||
Index++
|
||||
)
|
||||
;
|
||||
@@ -551,7 +551,7 @@ GetOut:
|
||||
} else {
|
||||
FormTags.Tags[Index].GrayOut = FALSE;
|
||||
}
|
||||
if (Suppress && FormTags.Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
if (Suppress && FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
//
|
||||
// Only need .Suppress field when the tag is a one_of_option. For other cases, omit them directly.
|
||||
//
|
||||
@@ -562,8 +562,8 @@ GetOut:
|
||||
|
||||
if ((
|
||||
FormTags.Tags[Index].NumberOfLines > 0 ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_DATE_OP ||
|
||||
FormTags.Tags[Index].Operand == EFI_IFR_TIME_OP
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_DATE_OP ||
|
||||
FormTags.Tags[Index].Operand == FRAMEWORK_EFI_IFR_TIME_OP
|
||||
) &&
|
||||
!Suppress
|
||||
) {
|
||||
@@ -604,7 +604,7 @@ GetOut:
|
||||
// Keep processing menu entries based on the resultant suppress/grayout results until we hit an end-if
|
||||
//
|
||||
Index++;
|
||||
} while (FormTags.Tags[Index].Operand != EFI_IFR_END_IF_OP && Conditional);
|
||||
} while (FormTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_IF_OP && Conditional);
|
||||
|
||||
//
|
||||
// We advanced the index for the above conditional, rewind it to keep harmony with the for loop logic
|
||||
@@ -612,7 +612,7 @@ GetOut:
|
||||
Index--;
|
||||
}
|
||||
|
||||
Selection = UiDisplayMenu (TRUE, FileFormTagsHead, (EFI_IFR_DATA_ARRAY *) CallbackData);
|
||||
Selection = UiDisplayMenu (TRUE, FileFormTagsHead, (FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData);
|
||||
|
||||
return Selection;
|
||||
}
|
||||
@@ -693,11 +693,11 @@ Returns:
|
||||
gST->ConOut->SetAttribute (gST->ConOut, KEYHELP_TEXT | KEYHELP_BACKGROUND);
|
||||
|
||||
switch (Selection->ThisTag->Operand) {
|
||||
case EFI_IFR_ORDERED_LIST_OP:
|
||||
case EFI_IFR_ONE_OF_OP:
|
||||
case EFI_IFR_NUMERIC_OP:
|
||||
case EFI_IFR_TIME_OP:
|
||||
case EFI_IFR_DATE_OP:
|
||||
case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_ONE_OF_OP:
|
||||
case FRAMEWORK_EFI_IFR_NUMERIC_OP:
|
||||
case FRAMEWORK_EFI_IFR_TIME_OP:
|
||||
case FRAMEWORK_EFI_IFR_DATE_OP:
|
||||
ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND);
|
||||
|
||||
if (!Selected) {
|
||||
@@ -709,7 +709,7 @@ Returns:
|
||||
|
||||
}
|
||||
|
||||
if ((Selection->ThisTag->Operand == EFI_IFR_DATE_OP) || (Selection->ThisTag->Operand == EFI_IFR_TIME_OP)) {
|
||||
if ((Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
|
||||
PrintAt (
|
||||
StartColumnOfHelp,
|
||||
BottomRowOfHelp,
|
||||
@@ -731,13 +731,13 @@ Returns:
|
||||
//
|
||||
// If it is a selected numeric with manual input, display different message
|
||||
//
|
||||
if ((Selection->ThisTag->Operand == EFI_IFR_NUMERIC_OP) && (Selection->ThisTag->Step == 0)) {
|
||||
if ((Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_NUMERIC_OP) && (Selection->ThisTag->Step == 0)) {
|
||||
PrintStringAt (SecCol, TopRowOfHelp, gNumericInput);
|
||||
} else if (Selection->ThisTag->Operand != EFI_IFR_ORDERED_LIST_OP) {
|
||||
} else if (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
PrintAt (StartColumnOfHelp, BottomRowOfHelp, L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight);
|
||||
}
|
||||
|
||||
if (Selection->ThisTag->Operand == EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
PrintStringAt (StartColumnOfHelp, TopRowOfHelp, gPlusString);
|
||||
PrintStringAt (ThdCol, TopRowOfHelp, gMinusString);
|
||||
}
|
||||
@@ -746,7 +746,7 @@ Returns:
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_CHECKBOX_OP:
|
||||
case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
|
||||
ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND);
|
||||
|
||||
if (gClassOfVfr == EFI_SETUP_APPLICATION_SUBCLASS) {
|
||||
@@ -760,9 +760,9 @@ Returns:
|
||||
PrintStringAt (SecCol, BottomRowOfHelp, gToggleCheckBox);
|
||||
break;
|
||||
|
||||
case EFI_IFR_REF_OP:
|
||||
case EFI_IFR_PASSWORD_OP:
|
||||
case EFI_IFR_STRING_OP:
|
||||
case FRAMEWORK_EFI_IFR_REF_OP:
|
||||
case FRAMEWORK_EFI_IFR_PASSWORD_OP:
|
||||
case FRAMEWORK_EFI_IFR_STRING_OP:
|
||||
ClearLines (LeftColumnOfHelp, RightColumnOfHelp, TopRowOfHelp, BottomRowOfHelp, KEYHELP_TEXT | KEYHELP_BACKGROUND);
|
||||
|
||||
if (!Selected) {
|
||||
@@ -776,7 +776,7 @@ Returns:
|
||||
PrintAt (StartColumnOfHelp, BottomRowOfHelp, (CHAR16 *) L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight);
|
||||
PrintStringAt (SecCol, BottomRowOfHelp, gEnterString);
|
||||
} else {
|
||||
if (Selection->ThisTag->Operand != EFI_IFR_REF_OP) {
|
||||
if (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_REF_OP) {
|
||||
PrintStringAt (
|
||||
(LocalScreen.RightColumn - GetStringWidth (gEnterCommitString) / 2) / 2,
|
||||
BottomRowOfHelp,
|
||||
@@ -823,14 +823,14 @@ ExtractFormHandle (
|
||||
//
|
||||
// Advance Index to the first FormOp tag information
|
||||
//
|
||||
for (Index = 0; FileFormTags->FormTags.Tags[Index].Operand != EFI_IFR_FORM_OP; Index++)
|
||||
for (Index = 0; FileFormTags->FormTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_FORM_OP; Index++)
|
||||
;
|
||||
} else {
|
||||
//
|
||||
// Advance Index to the FormOp with the correct ID value
|
||||
//
|
||||
for (; LocalTags.Next != NULL; LocalTags = *LocalTags.Next) {
|
||||
for (Index = 0; LocalTags.Tags[Index].Operand != EFI_IFR_FORM_OP; Index++)
|
||||
for (Index = 0; LocalTags.Tags[Index].Operand != FRAMEWORK_EFI_IFR_FORM_OP; Index++)
|
||||
;
|
||||
if (LocalTags.Tags[Index].Id == IdValue) {
|
||||
break;
|
||||
@@ -886,7 +886,7 @@ UpdateNewTagData (
|
||||
FormTags->Tags = AllocateZeroPool (NumberOfTags * sizeof (EFI_TAG));
|
||||
ASSERT (FormTags->Tags != NULL);
|
||||
|
||||
for (CurrTag = 0; FormData[Index] != EFI_IFR_END_FORM_SET_OP; CurrTag++) {
|
||||
for (CurrTag = 0; FormData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {
|
||||
//
|
||||
// Operand = IFR OpCode
|
||||
//
|
||||
@@ -909,27 +909,27 @@ UpdateNewTagData (
|
||||
//
|
||||
switch (FormData[Index]) {
|
||||
|
||||
case EFI_IFR_FORM_OP:
|
||||
case EFI_IFR_SUBTITLE_OP:
|
||||
case EFI_IFR_TEXT_OP:
|
||||
case EFI_IFR_REF_OP:
|
||||
case FRAMEWORK_EFI_IFR_FORM_OP:
|
||||
case FRAMEWORK_EFI_IFR_SUBTITLE_OP:
|
||||
case FRAMEWORK_EFI_IFR_TEXT_OP:
|
||||
case FRAMEWORK_EFI_IFR_REF_OP:
|
||||
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
|
||||
break;
|
||||
|
||||
case EFI_IFR_VARSTORE_SELECT_OP:
|
||||
case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:
|
||||
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
|
||||
CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) &FormData[Index])->VarId, sizeof (UINT16));
|
||||
CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) &FormData[Index])->VarId, sizeof (UINT16));
|
||||
break;
|
||||
|
||||
case EFI_IFR_END_FORM_OP:
|
||||
case FRAMEWORK_EFI_IFR_END_FORM_OP:
|
||||
FormTags->Tags[CurrTag].Operand = FormData[Index];
|
||||
FormTags->Tags[CurrTag].NumberOfLines = 0;
|
||||
|
||||
Finished = TRUE;
|
||||
break;
|
||||
|
||||
case EFI_IFR_ORDERED_LIST_OP:
|
||||
case EFI_IFR_ONE_OF_OP:
|
||||
case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_ONE_OF_OP:
|
||||
GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable);
|
||||
|
||||
//
|
||||
@@ -942,23 +942,23 @@ UpdateNewTagData (
|
||||
QuestionIndex = (UINT16) CurrTag;
|
||||
break;
|
||||
|
||||
case EFI_IFR_ONE_OF_OPTION_OP:
|
||||
case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:
|
||||
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
|
||||
FormTags->Tags[QuestionIndex].Key = ((EFI_IFR_ONE_OF_OPTION *) &FormData[Index])->Key;
|
||||
FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
FormTags->Tags[QuestionIndex].Key = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &FormData[Index])->Key;
|
||||
FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
break;
|
||||
|
||||
case EFI_IFR_CHECKBOX_OP:
|
||||
case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
|
||||
GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable);
|
||||
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
|
||||
break;
|
||||
|
||||
case EFI_IFR_NUMERIC_OP:
|
||||
case FRAMEWORK_EFI_IFR_NUMERIC_OP:
|
||||
GetNumericHeader (&FormTags->Tags[CurrTag], FormData, Index, (UINT16) 1, FileFormTags, CurrentVariable);
|
||||
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
|
||||
break;
|
||||
|
||||
case EFI_IFR_DATE_OP:
|
||||
case FRAMEWORK_EFI_IFR_DATE_OP:
|
||||
//
|
||||
// Date elements come in as a Year, Month, Day. We need to process them as a country-based
|
||||
// Order. It is much easier to do it here than anywhere else.
|
||||
@@ -1007,7 +1007,7 @@ UpdateNewTagData (
|
||||
TagLength = FormData[Index + 1];
|
||||
break;
|
||||
|
||||
case EFI_IFR_TIME_OP:
|
||||
case FRAMEWORK_EFI_IFR_TIME_OP:
|
||||
GetNumericHeader (&FormTags->Tags[CurrTag], FormData, Index, (UINT16) 0, FileFormTags, CurrentVariable);
|
||||
|
||||
if (Count == 2) {
|
||||
@@ -1025,44 +1025,44 @@ UpdateNewTagData (
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_PASSWORD_OP:
|
||||
case EFI_IFR_STRING_OP:
|
||||
case FRAMEWORK_EFI_IFR_PASSWORD_OP:
|
||||
case FRAMEWORK_EFI_IFR_STRING_OP:
|
||||
GetQuestionHeader (&FormTags->Tags[CurrTag], FormData, Index, FileFormTags, CurrentVariable);
|
||||
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
|
||||
break;
|
||||
|
||||
case EFI_IFR_INCONSISTENT_IF_OP:
|
||||
case EFI_IFR_SUPPRESS_IF_OP:
|
||||
case EFI_IFR_GRAYOUT_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:
|
||||
ConsistencyId++;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
|
||||
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
|
||||
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_VAR_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
|
||||
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
|
||||
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_ID_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
|
||||
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
|
||||
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;
|
||||
break;
|
||||
|
||||
case EFI_IFR_AND_OP:
|
||||
case EFI_IFR_OR_OP:
|
||||
case EFI_IFR_NOT_OP:
|
||||
case EFI_IFR_TRUE_OP:
|
||||
case EFI_IFR_FALSE_OP:
|
||||
case EFI_IFR_GT_OP:
|
||||
case EFI_IFR_GE_OP:
|
||||
case FRAMEWORK_EFI_IFR_AND_OP:
|
||||
case FRAMEWORK_EFI_IFR_OR_OP:
|
||||
case FRAMEWORK_EFI_IFR_NOT_OP:
|
||||
case FRAMEWORK_EFI_IFR_TRUE_OP:
|
||||
case FRAMEWORK_EFI_IFR_FALSE_OP:
|
||||
case FRAMEWORK_EFI_IFR_GT_OP:
|
||||
case FRAMEWORK_EFI_IFR_GE_OP:
|
||||
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
|
||||
IfrToFormTag (FormData[Index], &FormTags->Tags[CurrTag], (VOID *) &FormData[Index], NULL);
|
||||
|
||||
FormTags->Tags[CurrTag].ConsistencyId = ConsistencyId;
|
||||
@@ -1104,7 +1104,7 @@ ExtractDynamicFormHandle (
|
||||
Routine Description:
|
||||
|
||||
The function does the most of the works when the EFI_TAG that
|
||||
user selects on is EFI_IFR_FLAG_INTERACTIVE or EFI_IFR_PASSWORD_OP:
|
||||
user selects on is FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE or FRAMEWORK_EFI_IFR_PASSWORD_OP:
|
||||
invoke CallBack, update the new form data.
|
||||
|
||||
Arguments:
|
||||
@@ -1140,7 +1140,7 @@ Returns:
|
||||
UINT16 ConsistencyId;
|
||||
UINT16 CurrentVariable;
|
||||
EFI_VARIABLE_DEFINITION *VariableDefinition;
|
||||
EFI_IFR_DATA_ENTRY *DataEntry;
|
||||
FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;
|
||||
|
||||
VariableDefinition = NULL;
|
||||
NullCharacter = CHAR_NULL;
|
||||
@@ -1174,7 +1174,7 @@ Returns:
|
||||
CopyMem (&TagGuid, &LocalTags->Tags[0].GuidValue, sizeof (EFI_GUID));
|
||||
}
|
||||
|
||||
for (Index = 0; LocalTags->Tags[Index].Operand != EFI_IFR_FORM_OP; Index++)
|
||||
for (Index = 0; LocalTags->Tags[Index].Operand != FRAMEWORK_EFI_IFR_FORM_OP; Index++)
|
||||
;
|
||||
if (LocalTags->Tags[Index].Id == IdValue) {
|
||||
break;
|
||||
@@ -1183,7 +1183,7 @@ Returns:
|
||||
//
|
||||
// If we are going to callback on a non-goto opcode, make sure we don't change pages
|
||||
//
|
||||
if (Selection->ThisTag->Operand != EFI_IFR_REF_OP) {
|
||||
if (Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_REF_OP) {
|
||||
TargetPage = Selection->FormId;
|
||||
}
|
||||
//
|
||||
@@ -1211,17 +1211,17 @@ Returns:
|
||||
|
||||
ExtractRequestedNvMap (FileFormTags, CurrentVariable, &VariableDefinition);
|
||||
|
||||
if (Selection->ThisTag->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS)) {
|
||||
((EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = VariableDefinition->NvRamMap;
|
||||
if (Selection->ThisTag->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS)) {
|
||||
((FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = VariableDefinition->NvRamMap;
|
||||
} else {
|
||||
((EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = NULL;
|
||||
((FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData)->NvRamMap = NULL;
|
||||
}
|
||||
|
||||
if ((FormCallback != NULL) && (FormCallback->Callback != NULL)) {
|
||||
Status = FormCallback->Callback (
|
||||
FormCallback,
|
||||
Selection->ThisTag->Key,
|
||||
(EFI_IFR_DATA_ARRAY *) CallbackData,
|
||||
(FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData,
|
||||
&Packet
|
||||
);
|
||||
}
|
||||
@@ -1261,14 +1261,14 @@ Returns:
|
||||
// location associated with the op-code specified there. This is used on single op-code instances
|
||||
// and not for when a hyperlink sent us a whole page of data.
|
||||
//
|
||||
DataEntry = (EFI_IFR_DATA_ENTRY *) (&Packet->DataArray + 1);
|
||||
DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (&Packet->DataArray + 1);
|
||||
if (Packet->DataArray.EntryCount == 1) {
|
||||
switch (DataEntry->OpCode) {
|
||||
case EFI_IFR_STRING_OP:
|
||||
case EFI_IFR_NUMERIC_OP:
|
||||
case EFI_IFR_ORDERED_LIST_OP:
|
||||
case EFI_IFR_ONE_OF_OP:
|
||||
case EFI_IFR_CHECKBOX_OP:
|
||||
case FRAMEWORK_EFI_IFR_STRING_OP:
|
||||
case FRAMEWORK_EFI_IFR_NUMERIC_OP:
|
||||
case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_ONE_OF_OP:
|
||||
case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
|
||||
CopyMem (
|
||||
&VariableDefinition->NvRamMap[Selection->ThisTag->StorageStart],
|
||||
&DataEntry->Data,
|
||||
@@ -1276,11 +1276,11 @@ Returns:
|
||||
);
|
||||
break;
|
||||
|
||||
case EFI_IFR_NV_ACCESS_COMMAND:
|
||||
case FRAMEWORK_EFI_IFR_NV_ACCESS_COMMAND:
|
||||
CopyMem (
|
||||
&VariableDefinition->NvRamMap[((EFI_IFR_NV_DATA *) Packet)->QuestionId],
|
||||
((EFI_IFR_NV_DATA *) Packet) + 1,
|
||||
((EFI_IFR_NV_DATA *) Packet)->StorageWidth
|
||||
&VariableDefinition->NvRamMap[((FRAMEWORK_EFI_IFR_NV_DATA *) Packet)->QuestionId],
|
||||
((FRAMEWORK_EFI_IFR_NV_DATA *) Packet) + 1,
|
||||
((FRAMEWORK_EFI_IFR_NV_DATA *) Packet)->StorageWidth
|
||||
);
|
||||
break;
|
||||
|
||||
@@ -1313,19 +1313,19 @@ Returns:
|
||||
FreePool (Packet);
|
||||
}
|
||||
|
||||
for (BackupIndex = 0; LocalTags->Tags[BackupIndex].Operand != EFI_IFR_END_FORM_OP; BackupIndex++) {
|
||||
for (BackupIndex = 0; LocalTags->Tags[BackupIndex].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP; BackupIndex++) {
|
||||
switch (LocalTags->Tags[BackupIndex].Operand) {
|
||||
case EFI_IFR_EQ_VAR_VAL_OP:
|
||||
case EFI_IFR_EQ_ID_VAL_OP:
|
||||
case EFI_IFR_EQ_ID_ID_OP:
|
||||
case EFI_IFR_AND_OP:
|
||||
case EFI_IFR_OR_OP:
|
||||
case EFI_IFR_NOT_OP:
|
||||
case EFI_IFR_TRUE_OP:
|
||||
case EFI_IFR_FALSE_OP:
|
||||
case EFI_IFR_GT_OP:
|
||||
case EFI_IFR_GE_OP:
|
||||
case EFI_IFR_EQ_ID_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
|
||||
case FRAMEWORK_EFI_IFR_AND_OP:
|
||||
case FRAMEWORK_EFI_IFR_OR_OP:
|
||||
case FRAMEWORK_EFI_IFR_NOT_OP:
|
||||
case FRAMEWORK_EFI_IFR_TRUE_OP:
|
||||
case FRAMEWORK_EFI_IFR_FALSE_OP:
|
||||
case FRAMEWORK_EFI_IFR_GT_OP:
|
||||
case FRAMEWORK_EFI_IFR_GE_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
|
||||
//
|
||||
// If we encountered a ConsistencyId value, on this page they will be incremental
|
||||
// So register the first value we encounter. We will pass this in when we re-create this page
|
||||
@@ -1426,8 +1426,8 @@ SetupBrowser (
|
||||
//
|
||||
// True if a hyperlink/jump is selected
|
||||
//
|
||||
if (Selection->ThisTag->Operand == EFI_IFR_REF_OP && Selection->ThisTag->Id != 0x0000) {
|
||||
if (Selection->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE) {
|
||||
if (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_REF_OP && Selection->ThisTag->Id != 0x0000) {
|
||||
if (Selection->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
|
||||
ExtractDynamicFormHandle (
|
||||
Selection,
|
||||
CallbackData,
|
||||
@@ -1444,8 +1444,8 @@ SetupBrowser (
|
||||
}
|
||||
}
|
||||
|
||||
if ((Selection->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE) &&
|
||||
(Selection->ThisTag->Operand != EFI_IFR_PASSWORD_OP)
|
||||
if ((Selection->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) &&
|
||||
(Selection->ThisTag->Operand != FRAMEWORK_EFI_IFR_PASSWORD_OP)
|
||||
) {
|
||||
ExtractDynamicFormHandle (
|
||||
Selection,
|
||||
|
@@ -103,31 +103,31 @@ AdjustNvMap (
|
||||
// Remember, the only time we come here is because we are in the NVPlus section of the NvRamMap
|
||||
//
|
||||
for (Index = MenuOption->TagIndex;
|
||||
(MenuOption->Tags[Index].Operand != EFI_IFR_END_FORM_OP) && (MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP);
|
||||
(MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP) && (MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP);
|
||||
Index++
|
||||
) {
|
||||
|
||||
switch (MenuOption->Tags[Index].Operand) {
|
||||
case EFI_IFR_ORDERED_LIST_OP:
|
||||
case EFI_IFR_ONE_OF_OP:
|
||||
case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_ONE_OF_OP:
|
||||
CachedStart = MenuOption->Tags[Index].StorageStart;
|
||||
break;
|
||||
|
||||
case EFI_IFR_ONE_OF_OPTION_OP:
|
||||
if (MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_DEFAULT) {
|
||||
case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:
|
||||
if (MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) {
|
||||
CopyMem (&NvRamMap[CachedStart], &MenuOption->Tags[Index].Value, 2);
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_CHECKBOX_OP:
|
||||
case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
|
||||
CopyMem (&NvRamMap[MenuOption->Tags[Index].StorageStart], &MenuOption->Tags[Index].Flags, 1);
|
||||
break;
|
||||
|
||||
case EFI_IFR_NUMERIC_OP:
|
||||
case EFI_IFR_DATE_OP:
|
||||
case EFI_IFR_TIME_OP:
|
||||
case EFI_IFR_STRING_OP:
|
||||
case EFI_IFR_PASSWORD_OP:
|
||||
case FRAMEWORK_EFI_IFR_NUMERIC_OP:
|
||||
case FRAMEWORK_EFI_IFR_DATE_OP:
|
||||
case FRAMEWORK_EFI_IFR_TIME_OP:
|
||||
case FRAMEWORK_EFI_IFR_STRING_OP:
|
||||
case FRAMEWORK_EFI_IFR_PASSWORD_OP:
|
||||
CopyMem (
|
||||
&NvRamMap[MenuOption->Tags[Index].StorageStart],
|
||||
&MenuOption->Tags[Index].Value,
|
||||
@@ -148,7 +148,7 @@ ProcessOptions (
|
||||
IN UI_MENU_OPTION *MenuOption,
|
||||
IN BOOLEAN Selected,
|
||||
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,
|
||||
IN EFI_IFR_DATA_ARRAY *PageData,
|
||||
IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,
|
||||
OUT CHAR16 **OptionString
|
||||
)
|
||||
{
|
||||
@@ -210,7 +210,7 @@ ProcessOptions (
|
||||
NullCharacter = CHAR_NULL;
|
||||
FormCallback = NULL;
|
||||
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
OrderedList = TRUE;
|
||||
if (((UINT8 *) NvRamMap)[0] != 0x00) {
|
||||
Initialized = TRUE;
|
||||
@@ -232,8 +232,8 @@ ProcessOptions (
|
||||
|
||||
switch (Tag->Operand) {
|
||||
|
||||
case EFI_IFR_ORDERED_LIST_OP:
|
||||
case EFI_IFR_ONE_OF_OP:
|
||||
case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_ONE_OF_OP:
|
||||
//
|
||||
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
|
||||
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
|
||||
@@ -247,23 +247,23 @@ ProcessOptions (
|
||||
CachedIndex = MenuOption->TagIndex;
|
||||
|
||||
//
|
||||
// search for EFI_IFR_ONE_OF_OPTION_OP until you hit the EFI_IFR_END_ONE_OF_OP,
|
||||
// search for FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP until you hit the FRAMEWORK_EFI_IFR_END_ONE_OF_OP,
|
||||
// each of the .Text in the options are going to be what gets displayed. Break each into 26 char chunks
|
||||
// when hit right/left arrow allows for selection - then repopulate Tag[TagIndex] with the choice
|
||||
//
|
||||
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) {
|
||||
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {
|
||||
//
|
||||
// We found an option - which assumedly has a string. We will eventually have to support
|
||||
// wrapping of strings. For now, let's pretend they don't wrap and code that up.
|
||||
//
|
||||
// Count how many strings there are
|
||||
//
|
||||
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
//
|
||||
// If one of the options for the one-of has an interactive flag, back-define the oneof to have one too
|
||||
//
|
||||
if (MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_INTERACTIVE) {
|
||||
MenuOption->Tags[CachedIndex].Flags = (UINT8) (MenuOption->Tags[CachedIndex].Flags | EFI_IFR_FLAG_INTERACTIVE);
|
||||
if (MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
|
||||
MenuOption->Tags[CachedIndex].Flags = (UINT8) (MenuOption->Tags[CachedIndex].Flags | FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE);
|
||||
}
|
||||
|
||||
StringCount++;
|
||||
@@ -292,7 +292,7 @@ ProcessOptions (
|
||||
//
|
||||
// Copy current setting to the seed Value
|
||||
//
|
||||
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
ValueArray = AllocateZeroPool (MenuOption->ThisTag->StorageWidth);
|
||||
ASSERT (ValueArray != NULL);
|
||||
CopyMem (ValueArray, NvRamMap, MenuOption->ThisTag->StorageWidth);
|
||||
@@ -302,14 +302,14 @@ ProcessOptions (
|
||||
}
|
||||
|
||||
Number = Value;
|
||||
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
Status = GetSelectionInputPopUp (MenuOption, Tag, MenuOption->ThisTag->StorageWidth, ValueArray, &KeyValue);
|
||||
} else {
|
||||
Status = GetSelectionInputPopUp (MenuOption, Tag, 1, &Value, &KeyValue);
|
||||
}
|
||||
|
||||
if (!EFI_ERROR (Status)) {
|
||||
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
CopyMem (NvRamMap, ValueArray, MenuOption->ThisTag->StorageWidth);
|
||||
FreePool (ValueArray);
|
||||
} else {
|
||||
@@ -325,7 +325,7 @@ ProcessOptions (
|
||||
// if two questions are bound by consistency checks and each only has two possible choices, there
|
||||
// would be no way for a user to switch the values. Thus we require late checking.
|
||||
//
|
||||
if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) {
|
||||
if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {
|
||||
CopyMem (&Tag->OldValue, &Value, Tag->StorageWidth);
|
||||
} else {
|
||||
//
|
||||
@@ -372,19 +372,19 @@ ProcessOptions (
|
||||
|
||||
UpdateStatusBar (NV_UPDATE_REQUIRED, Tag->Flags, TRUE);
|
||||
} else {
|
||||
if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {
|
||||
if (Tag->Operand == FRAMEWORK_EFI_IFR_ORDERED_LIST_OP) {
|
||||
FreePool (ValueArray);
|
||||
}
|
||||
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
} else {
|
||||
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != EFI_IFR_END_ONE_OF_OP; Index++) {
|
||||
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP; Index++) {
|
||||
//
|
||||
// We found an option - which assumedly has a string. We will eventually have to support
|
||||
// wrapping of strings. For now, let's pretend they don't wrap and code that up.
|
||||
//
|
||||
if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
if (MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP) {
|
||||
if (OrderedList) {
|
||||
if (!Initialized) {
|
||||
//
|
||||
@@ -410,7 +410,7 @@ ProcessOptions (
|
||||
StringPtr = GetToken (MenuOption->Tags[Index].Text, MenuOption->Handle);
|
||||
} else {
|
||||
for (Value = (UINT16) (MenuOption->TagIndex + 1);
|
||||
MenuOption->Tags[Value].Operand != EFI_IFR_END_ONE_OF_OP;
|
||||
MenuOption->Tags[Value].Operand != FRAMEWORK_EFI_IFR_END_ONE_OF_OP;
|
||||
Value++
|
||||
) {
|
||||
if (MenuOption->Tags[Value].Value == ((UINT8 *) NvRamMap)[Index - MenuOption->TagIndex - 1]) {
|
||||
@@ -419,7 +419,7 @@ ProcessOptions (
|
||||
}
|
||||
}
|
||||
|
||||
if (MenuOption->Tags[Value].Operand == EFI_IFR_END_ONE_OF_OP) {
|
||||
if (MenuOption->Tags[Value].Operand == FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {
|
||||
Skip = TRUE;
|
||||
continue;
|
||||
}
|
||||
@@ -453,7 +453,7 @@ ProcessOptions (
|
||||
break;
|
||||
}
|
||||
|
||||
if ((MenuOption->Tags[Index].Flags & EFI_IFR_FLAG_DEFAULT) == 1) {
|
||||
if ((MenuOption->Tags[Index].Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) == 1) {
|
||||
Default = MenuOption->Tags[Index].Text;
|
||||
Value = MenuOption->Tags[Index].Value;
|
||||
};
|
||||
@@ -481,7 +481,7 @@ ProcessOptions (
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_CHECKBOX_OP:
|
||||
case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
|
||||
//
|
||||
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
|
||||
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
|
||||
@@ -533,7 +533,7 @@ ProcessOptions (
|
||||
NewStrCat (OptionString[0], StringPtr);
|
||||
break;
|
||||
|
||||
case EFI_IFR_NUMERIC_OP:
|
||||
case FRAMEWORK_EFI_IFR_NUMERIC_OP:
|
||||
//
|
||||
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
|
||||
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
|
||||
@@ -649,7 +649,7 @@ ProcessOptions (
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_DATE_OP:
|
||||
case FRAMEWORK_EFI_IFR_DATE_OP:
|
||||
//
|
||||
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
|
||||
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
|
||||
@@ -677,7 +677,7 @@ ProcessOptions (
|
||||
//
|
||||
// Also, we want to internationalize the order of the date information. We need to code for it as well.
|
||||
//
|
||||
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == EFI_IFR_DATE_OP; Index++)
|
||||
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_DATE_OP; Index++)
|
||||
;
|
||||
|
||||
//
|
||||
@@ -828,7 +828,7 @@ ProcessOptions (
|
||||
// might want to set an alarm and actually preserve the data in NVRam so a driver can pick up the instruction
|
||||
// BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG BUGBUG
|
||||
//
|
||||
case EFI_IFR_TIME_OP:
|
||||
case FRAMEWORK_EFI_IFR_TIME_OP:
|
||||
//
|
||||
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
|
||||
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
|
||||
@@ -858,7 +858,7 @@ ProcessOptions (
|
||||
// to 53 and found it to no longer point to a date operand, we were pointing to the last of 3
|
||||
// date operands.
|
||||
//
|
||||
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == EFI_IFR_TIME_OP; Index++)
|
||||
for (Index = MenuOption->TagIndex; MenuOption->Tags[Index].Operand == FRAMEWORK_EFI_IFR_TIME_OP; Index++)
|
||||
;
|
||||
//
|
||||
// Count 0 = We entered on the first Date operand
|
||||
@@ -1002,7 +1002,7 @@ ProcessOptions (
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_STRING_OP:
|
||||
case FRAMEWORK_EFI_IFR_STRING_OP:
|
||||
//
|
||||
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
|
||||
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
|
||||
@@ -1047,7 +1047,7 @@ ProcessOptions (
|
||||
return Status;
|
||||
}
|
||||
|
||||
case EFI_IFR_PASSWORD_OP:
|
||||
case FRAMEWORK_EFI_IFR_PASSWORD_OP:
|
||||
//
|
||||
// If the op-code we are looking at is larger than the latest created NvMap - we likely encountered a dynamically
|
||||
// created entry which has an expanded NvMap requirement. We won't save this information - but we need to adjust
|
||||
@@ -1067,7 +1067,7 @@ ProcessOptions (
|
||||
// Since interactive passwords assume to handle the password data in a separate variable
|
||||
// storage, we don't need to do more than what is below for password callbacks
|
||||
//
|
||||
if (Tag->Flags & EFI_IFR_FLAG_INTERACTIVE) {
|
||||
if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
|
||||
MenuOption->Tags[0].CallbackHandle = FileFormTags->FormTags.Tags[0].CallbackHandle;
|
||||
Status = ReadPassword (MenuOption, TRUE, Tag, PageData, FALSE, FileFormTags, StringPtr);
|
||||
ZeroMem (StringPtr, Tag->Maximum);
|
||||
@@ -1424,9 +1424,9 @@ IfrToFormTag (
|
||||
UINTN Index;
|
||||
|
||||
switch (OpCode) {
|
||||
case EFI_IFR_FORM_OP:
|
||||
CopyMem (&TargetTag->Id, &((EFI_IFR_FORM *) FormData)->FormId, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Text, &((EFI_IFR_FORM *) FormData)->FormTitle, sizeof (UINT16));
|
||||
case FRAMEWORK_EFI_IFR_FORM_OP:
|
||||
CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_FORM *) FormData)->FormId, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_FORM *) FormData)->FormTitle, sizeof (UINT16));
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
if (VariableDefinitionsHead != NULL) {
|
||||
VariableName = AllocateZeroPool (12);
|
||||
@@ -1438,16 +1438,16 @@ IfrToFormTag (
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_SUBTITLE_OP:
|
||||
case FRAMEWORK_EFI_IFR_SUBTITLE_OP:
|
||||
TargetTag->NumberOfLines = 1;
|
||||
CopyMem (&TargetTag->Text, &((EFI_IFR_SUBTITLE *) FormData)->SubTitle, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_SUBTITLE *) FormData)->SubTitle, sizeof (UINT16));
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_TEXT_OP:
|
||||
case FRAMEWORK_EFI_IFR_TEXT_OP:
|
||||
TargetTag->NumberOfLines = 1;
|
||||
CopyMem (&TargetTag->Text, &((EFI_IFR_TEXT *) FormData)->Text, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Help, &((EFI_IFR_TEXT *) FormData)->Help, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Text, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Help, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Help, sizeof (UINT16));
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
|
||||
//
|
||||
@@ -1455,78 +1455,78 @@ IfrToFormTag (
|
||||
// inside the if() statement. If the encoded length is the complete size, then we
|
||||
// know we have valid data encoded that we want to integrate
|
||||
//
|
||||
if (((EFI_IFR_TEXT *) FormData)->Header.Length == sizeof (EFI_IFR_TEXT)) {
|
||||
if (((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Header.Length == sizeof (FRAMEWORK_EFI_IFR_TEXT)) {
|
||||
//
|
||||
// Text has no help associated with it, but in case there is a second entry due to
|
||||
// dynamic/interactive flags being active, bring this data over.
|
||||
//
|
||||
CopyMem (&TargetTag->TextTwo, &((EFI_IFR_TEXT *) FormData)->TextTwo, sizeof (UINT16));
|
||||
TargetTag->Flags = ((EFI_IFR_TEXT *) FormData)->Flags;
|
||||
CopyMem (&TargetTag->Key, &((EFI_IFR_TEXT *) FormData)->Key, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->TextTwo, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->TextTwo, sizeof (UINT16));
|
||||
TargetTag->Flags = ((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Flags;
|
||||
CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_TEXT *) FormData)->Key, sizeof (UINT16));
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_ONE_OF_OPTION_OP:
|
||||
CopyMem (&TargetTag->Text, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Option, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Value, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Value, sizeof (UINT16));
|
||||
TargetTag->Flags = ((EFI_IFR_ONE_OF_OPTION *) FormData)->Flags;
|
||||
CopyMem (&TargetTag->Key, &((EFI_IFR_ONE_OF_OPTION *) FormData)->Key, sizeof (UINT16));
|
||||
case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:
|
||||
CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Option, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Value, sizeof (UINT16));
|
||||
TargetTag->Flags = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Flags;
|
||||
CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FormData)->Key, sizeof (UINT16));
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_CHECKBOX_OP:
|
||||
TargetTag->Flags = ((EFI_IFR_CHECKBOX *) FormData)->Flags;
|
||||
TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
CopyMem (&TargetTag->Key, &((EFI_IFR_CHECKBOX *) FormData)->Key, sizeof (UINT16));
|
||||
case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
|
||||
TargetTag->Flags = ((FRAMEWORK_EFI_IFR_CHECKBOX *) FormData)->Flags;
|
||||
TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_CHECKBOX *) FormData)->Key, sizeof (UINT16));
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_NUMERIC_OP:
|
||||
TargetTag->Flags = ((EFI_IFR_NUMERIC *) FormData)->Flags;
|
||||
CopyMem (&TargetTag->Key, &((EFI_IFR_NUMERIC *) FormData)->Key, sizeof (UINT16));
|
||||
case FRAMEWORK_EFI_IFR_NUMERIC_OP:
|
||||
TargetTag->Flags = ((FRAMEWORK_EFI_IFR_NUMERIC *) FormData)->Flags;
|
||||
CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_NUMERIC *) FormData)->Key, sizeof (UINT16));
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_STRING_OP:
|
||||
case FRAMEWORK_EFI_IFR_STRING_OP:
|
||||
//
|
||||
// Convert EFI_IFR_STRING.MinSize and EFI_IFR_STRING.MaxSize to actual minimum and maximum bytes
|
||||
// Convert FRAMEWORK_EFI_IFR_STRING.MinSize and FRAMEWORK_EFI_IFR_STRING.MaxSize to actual minimum and maximum bytes
|
||||
// and store to EFI_TAG.Minimum and EFI_TAG.Maximum
|
||||
//
|
||||
TempValue = 0;
|
||||
CopyMem (&TempValue, &((EFI_IFR_STRING *) FormData)->MinSize, sizeof (UINT8));
|
||||
CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->MinSize, sizeof (UINT8));
|
||||
TempValue = (UINT16) (TempValue * 2);
|
||||
CopyMem (&TargetTag->Minimum, &TempValue, sizeof (UINT16));
|
||||
|
||||
TempValue = 0;
|
||||
CopyMem (&TempValue, &((EFI_IFR_STRING *) FormData)->MaxSize, sizeof (UINT8));
|
||||
CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->MaxSize, sizeof (UINT8));
|
||||
TempValue = (UINT16) (TempValue * 2);
|
||||
CopyMem (&TargetTag->Maximum, &TempValue, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->StorageWidth, &TempValue, sizeof (UINT16));
|
||||
TargetTag->Flags = (UINT8) (((EFI_IFR_STRING *) FormData)->Flags);
|
||||
TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
CopyMem (&TargetTag->Key, &((EFI_IFR_STRING *) FormData)->Key, sizeof (UINT16));
|
||||
TargetTag->Flags = (UINT8) (((FRAMEWORK_EFI_IFR_STRING *) FormData)->Flags);
|
||||
TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_STRING *) FormData)->Key, sizeof (UINT16));
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_PASSWORD_OP:
|
||||
case FRAMEWORK_EFI_IFR_PASSWORD_OP:
|
||||
TempValue = 0;
|
||||
CopyMem (&TempValue, &((EFI_IFR_PASSWORD *) FormData)->MinSize, sizeof (UINT8));
|
||||
CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->MinSize, sizeof (UINT8));
|
||||
TempValue = (UINT16) (TempValue * 2);
|
||||
CopyMem (&TargetTag->Minimum, &TempValue, sizeof (UINT16));
|
||||
|
||||
TempValue = 0;
|
||||
CopyMem (&TempValue, &((EFI_IFR_PASSWORD *) FormData)->MaxSize, sizeof (UINT8));
|
||||
CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->MaxSize, sizeof (UINT8));
|
||||
TempValue = (UINT16) (TempValue * 2);
|
||||
CopyMem (&TargetTag->Maximum, &TempValue, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->StorageWidth, &TempValue, sizeof (UINT16));
|
||||
TargetTag->Flags = ((EFI_IFR_PASSWORD *) FormData)->Flags;
|
||||
TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
CopyMem (&TargetTag->Key, &((EFI_IFR_PASSWORD *) FormData)->Key, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Encoding, &((EFI_IFR_PASSWORD *) FormData)->Encoding, sizeof (UINT16));
|
||||
TargetTag->Flags = ((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Flags;
|
||||
TargetTag->ResetRequired = (BOOLEAN) (TargetTag->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Key, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Encoding, &((FRAMEWORK_EFI_IFR_PASSWORD *) FormData)->Encoding, sizeof (UINT16));
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_VARSTORE_OP:
|
||||
case FRAMEWORK_EFI_IFR_VARSTORE_OP:
|
||||
//
|
||||
// It should NEVER be NULL
|
||||
//
|
||||
@@ -1544,8 +1544,8 @@ IfrToFormTag (
|
||||
//
|
||||
// If there is a variable with this GUID and ID already, we need to bail out
|
||||
//
|
||||
if (!CompareMem (&VariableDefinitions->Guid, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID)) &&
|
||||
!CompareMem (&VariableDefinitions->VariableId, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16))
|
||||
if (!CompareMem (&VariableDefinitions->Guid, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID)) &&
|
||||
!CompareMem (&VariableDefinitions->VariableId, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16))
|
||||
) {
|
||||
return ;
|
||||
}
|
||||
@@ -1567,16 +1567,16 @@ IfrToFormTag (
|
||||
//
|
||||
// Copy the Variable data to our linked list
|
||||
//
|
||||
CopyMem (&VariableDefinitions->VariableId, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));
|
||||
CopyMem (&VariableDefinitions->VariableSize, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));
|
||||
CopyMem (&VariableDefinitions->Guid, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));
|
||||
CopyMem (&VariableDefinitions->VariableId, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));
|
||||
CopyMem (&VariableDefinitions->VariableSize, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));
|
||||
CopyMem (&VariableDefinitions->Guid, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));
|
||||
|
||||
//
|
||||
// The ASCII String which is immediately past the EFI_IFR_VARSTORE is inferred by the structure definition
|
||||
// The ASCII String which is immediately past the FRAMEWORK_EFI_IFR_VARSTORE is inferred by the structure definition
|
||||
// due to it being variable sized. There are rules preventing it from being > 40 characters long and should
|
||||
// be enforced by the compiler.
|
||||
//
|
||||
AsciiString = (CHAR8 *) (&((EFI_IFR_VARSTORE *) FormData)->Size);
|
||||
AsciiString = (CHAR8 *) (&((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size);
|
||||
AsciiString = AsciiString + 2;
|
||||
VariableDefinitions->VariableName = AllocateZeroPool ((AsciiStrLen (AsciiString) + 1) * 2);
|
||||
ASSERT (VariableDefinitions->VariableName != NULL);
|
||||
@@ -1589,64 +1589,64 @@ IfrToFormTag (
|
||||
//
|
||||
// Propogate the tag information for this op-code
|
||||
//
|
||||
CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->GuidValue, &((EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));
|
||||
CopyMem (&TargetTag->StorageWidth, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Maximum, &((EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->VarId, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->GuidValue, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Guid, sizeof (EFI_GUID));
|
||||
CopyMem (&TargetTag->StorageWidth, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Maximum, &((FRAMEWORK_EFI_IFR_VARSTORE *) FormData)->Size, sizeof (UINT16));
|
||||
break;
|
||||
|
||||
case EFI_IFR_VARSTORE_SELECT_OP:
|
||||
CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));
|
||||
CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));
|
||||
case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:
|
||||
CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));
|
||||
CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) FormData)->VarId, sizeof (UINT16));
|
||||
CurrentVariable2 = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_VARSTORE_SELECT_PAIR_OP:
|
||||
CopyMem (&TargetTag->VariableNumber, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));
|
||||
case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP:
|
||||
CopyMem (&TargetTag->VariableNumber, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));
|
||||
CopyMem (
|
||||
&TargetTag->VariableNumber2,
|
||||
&((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId,
|
||||
&((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));
|
||||
CopyMem (&CurrentVariable2, &((EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId, sizeof (UINT16));
|
||||
CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->VarId, sizeof (UINT16));
|
||||
CopyMem (&CurrentVariable2, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) FormData)->SecondaryVarId, sizeof (UINT16));
|
||||
break;
|
||||
|
||||
case EFI_IFR_REF_OP:
|
||||
case FRAMEWORK_EFI_IFR_REF_OP:
|
||||
TargetTag->NumberOfLines = 1;
|
||||
CopyMem (&TargetTag->Id, &((EFI_IFR_REF *) FormData)->FormId, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Key, &((EFI_IFR_REF *) FormData)->Key, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Text, &((EFI_IFR_REF *) FormData)->Prompt, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Help, &((EFI_IFR_REF *) FormData)->Help, sizeof (UINT16));
|
||||
TargetTag->Flags = ((EFI_IFR_REF *) FormData)->Flags;
|
||||
CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_REF *) FormData)->FormId, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Key, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Key, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Text, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Prompt, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Help, &((FRAMEWORK_EFI_IFR_REF *) FormData)->Help, sizeof (UINT16));
|
||||
TargetTag->Flags = ((FRAMEWORK_EFI_IFR_REF *) FormData)->Flags;
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_VAL_OP:
|
||||
CopyMem (&TargetTag->Value, &((EFI_IFR_EQ_ID_VAL *) FormData)->Value, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_VAL *) FormData)->QuestionId, sizeof (UINT16));
|
||||
TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_VAL *) FormData)->Width;
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
|
||||
CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->Value, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->QuestionId, sizeof (UINT16));
|
||||
TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) FormData)->Width;
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_VAR_VAL_OP:
|
||||
CopyMem (&TargetTag->Value, &((EFI_IFR_EQ_VAR_VAL *) FormData)->Value, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_VAR_VAL *) FormData)->VariableId, sizeof (UINT16));
|
||||
case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
|
||||
CopyMem (&TargetTag->Value, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) FormData)->Value, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) FormData)->VariableId, sizeof (UINT16));
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_ID_OP:
|
||||
CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_ID *) FormData)->QuestionId1, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Id2, &((EFI_IFR_EQ_ID_ID *) FormData)->QuestionId2, sizeof (UINT16));
|
||||
TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_ID *) FormData)->Width;
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
|
||||
CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->QuestionId1, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Id2, &((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->QuestionId2, sizeof (UINT16));
|
||||
TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_ID *) FormData)->Width;
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
TargetTag->VariableNumber = CurrentVariable2;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_LIST_OP:
|
||||
CopyMem (&TargetTag->Id, &((EFI_IFR_EQ_ID_LIST *) FormData)->QuestionId, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Id2, &((EFI_IFR_EQ_ID_LIST *) FormData)->ListLength, sizeof (UINT16));
|
||||
TargetTag->StorageWidth = ((EFI_IFR_EQ_ID_LIST *) FormData)->Width;
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
|
||||
CopyMem (&TargetTag->Id, &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->QuestionId, sizeof (UINT16));
|
||||
CopyMem (&TargetTag->Id2, &((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->ListLength, sizeof (UINT16));
|
||||
TargetTag->StorageWidth = ((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->Width;
|
||||
|
||||
TargetTag->IntList = AllocateZeroPool (TargetTag->Id2 * sizeof (UINT16));
|
||||
ASSERT (TargetTag->IntList);
|
||||
@@ -1654,7 +1654,7 @@ IfrToFormTag (
|
||||
for (TempValue = 0; TempValue < TargetTag->Id2; TempValue++) {
|
||||
CopyMem (
|
||||
&TargetTag->IntList[TempValue],
|
||||
&((EFI_IFR_EQ_ID_LIST *) FormData)->ValueList[TempValue],
|
||||
&((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) FormData)->ValueList[TempValue],
|
||||
sizeof (UINT16)
|
||||
);
|
||||
}
|
||||
@@ -1662,9 +1662,9 @@ IfrToFormTag (
|
||||
TargetTag->VariableNumber = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_FORM_SET_OP:
|
||||
CopyMem (&VariableSize, &((EFI_IFR_FORM_SET *) FormData)->NvDataSize, sizeof (UINT16));
|
||||
CopyMem (&Guid, &((EFI_IFR_FORM_SET *) FormData)->Guid, sizeof (EFI_GUID));
|
||||
case FRAMEWORK_EFI_IFR_FORM_SET_OP:
|
||||
CopyMem (&VariableSize, &((FRAMEWORK_EFI_IFR_FORM_SET *) FormData)->NvDataSize, sizeof (UINT16));
|
||||
CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) FormData)->Guid, sizeof (EFI_GUID));
|
||||
//
|
||||
// If there is a size specified in the formste, we will establish a "default" variable
|
||||
//
|
||||
@@ -1678,7 +1678,7 @@ IfrToFormTag (
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_END_FORM_SET_OP:
|
||||
case FRAMEWORK_EFI_IFR_END_FORM_SET_OP:
|
||||
CurrentVariable = 0;
|
||||
CurrentVariable2 = 0;
|
||||
break;
|
||||
|
@@ -106,9 +106,9 @@ FUNCTIION_KEY_SETTING gFunctionKeySettingTable[] = {
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
InitializeBinaryStructures (
|
||||
IN EFI_HII_HANDLE *Handle,
|
||||
IN FRAMEWORK_EFI_HII_HANDLE *Handle,
|
||||
IN BOOLEAN UseDatabase,
|
||||
IN EFI_IFR_PACKET *Packet,
|
||||
IN FRAMEWORK_EFI_IFR_PACKET *Packet,
|
||||
IN UINT8 *NvMapOverride,
|
||||
IN UINTN NumberOfIfrImages,
|
||||
EFI_FILE_FORM_TAGS **FileFormTagsHead
|
||||
@@ -117,7 +117,7 @@ InitializeBinaryStructures (
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
InitializeTagStructures (
|
||||
IN EFI_IFR_BINARY *BinaryData,
|
||||
IN FRAMEWORK_EFI_IFR_BINARY *BinaryData,
|
||||
OUT EFI_FILE_FORM_TAGS *FileFormTags
|
||||
);
|
||||
|
||||
@@ -133,9 +133,9 @@ STATIC
|
||||
EFI_STATUS
|
||||
GetIfrBinaryData (
|
||||
IN EFI_HII_PROTOCOL *Hii,
|
||||
IN EFI_HII_HANDLE HiiHandle,
|
||||
IN EFI_IFR_PACKET *Packet,
|
||||
IN EFI_IFR_BINARY *BinaryData
|
||||
IN FRAMEWORK_EFI_HII_HANDLE HiiHandle,
|
||||
IN FRAMEWORK_EFI_IFR_PACKET *Packet,
|
||||
IN FRAMEWORK_EFI_IFR_BINARY *BinaryData
|
||||
);
|
||||
|
||||
STATIC
|
||||
@@ -150,9 +150,9 @@ EFIAPI
|
||||
SendForm (
|
||||
IN EFI_FORM_BROWSER_PROTOCOL * This,
|
||||
IN BOOLEAN UseDatabase,
|
||||
IN EFI_HII_HANDLE * Handle,
|
||||
IN FRAMEWORK_EFI_HII_HANDLE * Handle,
|
||||
IN UINTN HandleCount,
|
||||
IN EFI_IFR_PACKET * Packet,
|
||||
IN FRAMEWORK_EFI_IFR_PACKET * Packet,
|
||||
IN EFI_HANDLE CallbackHandle,
|
||||
IN UINT8 *NvMapOverride,
|
||||
IN EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL
|
||||
@@ -197,7 +197,7 @@ Returns:
|
||||
EFI_STATUS Status;
|
||||
BOOLEAN Callback;
|
||||
VOID *CallbackData;
|
||||
EFI_HII_HANDLE BackupHandle;
|
||||
FRAMEWORK_EFI_HII_HANDLE BackupHandle;
|
||||
|
||||
ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));
|
||||
|
||||
@@ -542,11 +542,11 @@ Returns:
|
||||
|
||||
Tag->NumberOfLines = 1;
|
||||
Tag->VariableNumber = CurrentVariable;
|
||||
CopyMem (&Tag->Id, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
|
||||
CopyMem (&Tag->StorageStart, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
|
||||
CopyMem (&Tag->StorageWidth, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));
|
||||
CopyMem (&Tag->Text, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));
|
||||
CopyMem (&Tag->Help, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));
|
||||
CopyMem (&Tag->Id, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
|
||||
CopyMem (&Tag->StorageStart, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
|
||||
CopyMem (&Tag->StorageWidth, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));
|
||||
CopyMem (&Tag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));
|
||||
CopyMem (&Tag->Help, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));
|
||||
|
||||
VariableDefinition = FileFormTags->VariableDefinitions;
|
||||
|
||||
@@ -615,16 +615,16 @@ Returns:
|
||||
|
||||
Tag->NumberOfLines = NumberOfLines;
|
||||
Tag->VariableNumber = CurrentVariable;
|
||||
CopyMem (&Tag->Id, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
|
||||
CopyMem (&Tag->StorageStart, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
|
||||
CopyMem (&Tag->StorageWidth, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));
|
||||
CopyMem (&Tag->Text, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));
|
||||
CopyMem (&Tag->Help, &((EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));
|
||||
CopyMem (&Tag->Minimum, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Minimum, sizeof (UINT16));
|
||||
CopyMem (&Tag->Maximum, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Maximum, sizeof (UINT16));
|
||||
CopyMem (&Tag->Step, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Step, sizeof (UINT16));
|
||||
CopyMem (&Tag->Default, &((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Default, sizeof (UINT16));
|
||||
Tag->ResetRequired = (BOOLEAN) (((EFI_IFR_NUMERIC *) &RawFormSet[Index])->Flags & EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
CopyMem (&Tag->Id, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
|
||||
CopyMem (&Tag->StorageStart, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->QuestionId, sizeof (UINT16));
|
||||
CopyMem (&Tag->StorageWidth, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Width, sizeof (UINT8));
|
||||
CopyMem (&Tag->Text, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Prompt, sizeof (UINT16));
|
||||
CopyMem (&Tag->Help, &((FRAMEWORK_EFI_IFR_ONE_OF *) &RawFormSet[Index])->Help, sizeof (UINT16));
|
||||
CopyMem (&Tag->Minimum, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Minimum, sizeof (UINT16));
|
||||
CopyMem (&Tag->Maximum, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Maximum, sizeof (UINT16));
|
||||
CopyMem (&Tag->Step, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Step, sizeof (UINT16));
|
||||
CopyMem (&Tag->Default, &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Default, sizeof (UINT16));
|
||||
Tag->ResetRequired = (BOOLEAN) (((FRAMEWORK_EFI_IFR_NUMERIC *) &RawFormSet[Index])->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
|
||||
VariableDefinition = FileFormTags->VariableDefinitions;
|
||||
|
||||
@@ -678,17 +678,17 @@ GetTagCount (
|
||||
// Assume on entry we are pointing to an OpCode - reasonably this should
|
||||
// be a FormOp since the purpose is to count the tags in a particular Form.
|
||||
//
|
||||
for (Index = 0; RawFormSet[Index] != EFI_IFR_END_FORM_OP;) {
|
||||
for (Index = 0; RawFormSet[Index] != FRAMEWORK_EFI_IFR_END_FORM_OP;) {
|
||||
//
|
||||
// If we encounter the end of a form set, bail out
|
||||
//
|
||||
if (RawFormSet[Index] == EFI_IFR_END_FORM_SET_OP) {
|
||||
if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_END_FORM_SET_OP) {
|
||||
break;
|
||||
}
|
||||
//
|
||||
// We treat date/time internally as three op-codes
|
||||
//
|
||||
if (RawFormSet[Index] == EFI_IFR_DATE_OP || RawFormSet[Index] == EFI_IFR_TIME_OP) {
|
||||
if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_DATE_OP || RawFormSet[Index] == FRAMEWORK_EFI_IFR_TIME_OP) {
|
||||
*NumberOfTags = (UINT16) (*NumberOfTags + 3);
|
||||
} else {
|
||||
//
|
||||
@@ -758,7 +758,7 @@ Returns:
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
InitializeTagStructures (
|
||||
IN EFI_IFR_BINARY *BinaryData,
|
||||
IN FRAMEWORK_EFI_IFR_BINARY *BinaryData,
|
||||
OUT EFI_FILE_FORM_TAGS *FileFormTags
|
||||
)
|
||||
{
|
||||
@@ -876,7 +876,7 @@ InitializeTagStructures (
|
||||
|
||||
ZeroMem (FormTags->Tags, NumberOfTags * sizeof (EFI_TAG));
|
||||
|
||||
for (CurrTag = 0; RawFormSet[Index] != EFI_IFR_END_FORM_SET_OP; CurrTag++) {
|
||||
for (CurrTag = 0; RawFormSet[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {
|
||||
//
|
||||
// Operand = IFR OpCode
|
||||
//
|
||||
@@ -901,7 +901,7 @@ InitializeTagStructures (
|
||||
//
|
||||
switch (RawFormSet[Index]) {
|
||||
|
||||
case EFI_IFR_FORM_OP:
|
||||
case FRAMEWORK_EFI_IFR_FORM_OP:
|
||||
//
|
||||
// If there was no variable op-code defined, create a dummy entry for one
|
||||
//
|
||||
@@ -919,13 +919,13 @@ InitializeTagStructures (
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_SUBTITLE_OP:
|
||||
case EFI_IFR_TEXT_OP:
|
||||
case EFI_IFR_REF_OP:
|
||||
case FRAMEWORK_EFI_IFR_SUBTITLE_OP:
|
||||
case FRAMEWORK_EFI_IFR_TEXT_OP:
|
||||
case FRAMEWORK_EFI_IFR_REF_OP:
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
break;
|
||||
|
||||
case EFI_IFR_VARSTORE_OP:
|
||||
case FRAMEWORK_EFI_IFR_VARSTORE_OP:
|
||||
if (FileFormTags->VariableDefinitions == NULL) {
|
||||
VariableDefinitions = AllocateZeroPool (sizeof (EFI_VARIABLE_DEFINITION));
|
||||
ASSERT (VariableDefinitions != NULL);
|
||||
@@ -940,23 +940,23 @@ InitializeTagStructures (
|
||||
);
|
||||
break;
|
||||
|
||||
case EFI_IFR_VARSTORE_SELECT_OP:
|
||||
case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP:
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
CopyMem (&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT *) &RawFormSet[Index])->VarId, sizeof (UINT16));
|
||||
CopyMem (&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT *) &RawFormSet[Index])->VarId, sizeof (UINT16));
|
||||
CurrentVariable2 = CurrentVariable;
|
||||
break;
|
||||
|
||||
case EFI_IFR_VARSTORE_SELECT_PAIR_OP:
|
||||
case FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP:
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
CopyMem(&CurrentVariable, &((EFI_IFR_VARSTORE_SELECT_PAIR *)&RawFormSet[Index])->VarId, sizeof (UINT16));
|
||||
CopyMem(&CurrentVariable, &((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *)&RawFormSet[Index])->VarId, sizeof (UINT16));
|
||||
CopyMem (
|
||||
&CurrentVariable2,
|
||||
&((EFI_IFR_VARSTORE_SELECT_PAIR *) &RawFormSet[Index])->SecondaryVarId,
|
||||
&((FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR *) &RawFormSet[Index])->SecondaryVarId,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
break;
|
||||
|
||||
case EFI_IFR_END_FORM_OP:
|
||||
case FRAMEWORK_EFI_IFR_END_FORM_OP:
|
||||
//
|
||||
// Test for an allocated buffer. If already allocated this is due to having called this routine
|
||||
// once for sizing of the NV storage. We then loaded the NV variable and can correctly initialize
|
||||
@@ -1002,8 +1002,8 @@ InitializeTagStructures (
|
||||
// Two types of tags constitute the One Of question: a one-of header and
|
||||
// several one-of options.
|
||||
//
|
||||
case EFI_IFR_ONE_OF_OP:
|
||||
case EFI_IFR_ORDERED_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_ONE_OF_OP:
|
||||
case FRAMEWORK_EFI_IFR_ORDERED_LIST_OP:
|
||||
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);
|
||||
|
||||
//
|
||||
@@ -1016,28 +1016,28 @@ InitializeTagStructures (
|
||||
QuestionIndex = (UINT16) CurrTag;
|
||||
break;
|
||||
|
||||
case EFI_IFR_ONE_OF_OPTION_OP:
|
||||
case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
FormTags->Tags[QuestionIndex].Flags = ((EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Flags;
|
||||
FormTags->Tags[QuestionIndex].Flags = ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Flags;
|
||||
CopyMem (
|
||||
&FormTags->Tags[QuestionIndex].Key,
|
||||
&((EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Key,
|
||||
&((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawFormSet[Index])->Key,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
FormTags->Tags[QuestionIndex].ResetRequired = (BOOLEAN) (FormTags->Tags[QuestionIndex].Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED);
|
||||
break;
|
||||
|
||||
case EFI_IFR_CHECKBOX_OP:
|
||||
case FRAMEWORK_EFI_IFR_CHECKBOX_OP:
|
||||
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
break;
|
||||
|
||||
case EFI_IFR_NUMERIC_OP:
|
||||
case FRAMEWORK_EFI_IFR_NUMERIC_OP:
|
||||
GetNumericHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, (UINT16) 1, FileFormTags, CurrentVariable);
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
break;
|
||||
|
||||
case EFI_IFR_DATE_OP:
|
||||
case FRAMEWORK_EFI_IFR_DATE_OP:
|
||||
//
|
||||
// Date elements come in as a Year, Month, Day. We need to process them as a country-based
|
||||
// Order. It is much easier to do it here than anywhere else.
|
||||
@@ -1086,7 +1086,7 @@ InitializeTagStructures (
|
||||
TagLength = RawFormSet[Index + 1];
|
||||
break;
|
||||
|
||||
case EFI_IFR_TIME_OP:
|
||||
case FRAMEWORK_EFI_IFR_TIME_OP:
|
||||
GetNumericHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, (UINT16) 0, FileFormTags, CurrentVariable);
|
||||
|
||||
if (Count == 2) {
|
||||
@@ -1104,15 +1104,15 @@ InitializeTagStructures (
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_PASSWORD_OP:
|
||||
case EFI_IFR_STRING_OP:
|
||||
case FRAMEWORK_EFI_IFR_PASSWORD_OP:
|
||||
case FRAMEWORK_EFI_IFR_STRING_OP:
|
||||
GetQuestionHeader (&FormTags->Tags[CurrTag], RawFormSet, Index, FileFormTags, CurrentVariable);
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
break;
|
||||
|
||||
case EFI_IFR_SUPPRESS_IF_OP:
|
||||
case EFI_IFR_GRAYOUT_IF_OP:
|
||||
InconsistentTags->Operand = ((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;
|
||||
case FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP:
|
||||
InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;
|
||||
gConsistencyId++;
|
||||
|
||||
//
|
||||
@@ -1135,30 +1135,30 @@ InitializeTagStructures (
|
||||
InconsistentTags = InconsistentTags->Next;
|
||||
break;
|
||||
|
||||
case EFI_IFR_FORM_SET_OP:
|
||||
case FRAMEWORK_EFI_IFR_FORM_SET_OP:
|
||||
CopyMem (
|
||||
&FormTags->Tags[CurrTag].GuidValue,
|
||||
&((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Guid,
|
||||
&((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Guid,
|
||||
sizeof (EFI_GUID)
|
||||
);
|
||||
CopyMem (
|
||||
&FormTags->Tags[CurrTag].CallbackHandle,
|
||||
&((EFI_IFR_FORM_SET *) &RawFormSet[Index])->CallbackHandle,
|
||||
&((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->CallbackHandle,
|
||||
sizeof (EFI_PHYSICAL_ADDRESS)
|
||||
);
|
||||
CopyMem (&FormTags->Tags[CurrTag].Class, &((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class, sizeof (UINT8));
|
||||
CopyMem (&FormTags->Tags[CurrTag].Class, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class, sizeof (UINT8));
|
||||
CopyMem (
|
||||
&FormTags->Tags[CurrTag].SubClass,
|
||||
&((EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass,
|
||||
&((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass,
|
||||
sizeof (UINT8)
|
||||
);
|
||||
CopyMem (
|
||||
&FormTags->Tags[CurrTag].NvDataSize,
|
||||
&((EFI_IFR_FORM_SET *) &RawFormSet[Index])->NvDataSize,
|
||||
&((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->NvDataSize,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
Class = ((EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class;
|
||||
SubClass = ((EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass;
|
||||
Class = ((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->Class;
|
||||
SubClass = ((FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormSet[Index])->SubClass;
|
||||
//
|
||||
// If the formset has a size value, that means someone must be using this, so create a variable
|
||||
// We also shall reserve the formid of 0 for this specific purpose.
|
||||
@@ -1177,41 +1177,41 @@ InitializeTagStructures (
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_BANNER_OP:
|
||||
case FRAMEWORK_EFI_IFR_BANNER_OP:
|
||||
if (gClassOfVfr == EFI_FRONT_PAGE_SUBCLASS) {
|
||||
TempValue = 0;
|
||||
CopyMem (&TempValue, &((EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment, sizeof (UINT8));
|
||||
CopyMem (&TempValue, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment, sizeof (UINT8));
|
||||
//
|
||||
// If this is the special timeout value, we will dynamically figure out where to put it
|
||||
// Also the least significant byte refers to the TimeOut desired.
|
||||
//
|
||||
if (TempValue == EFI_IFR_BANNER_TIMEOUT) {
|
||||
CopyMem (&FrontPageTimeOutTitle, &((EFI_IFR_BANNER *) &RawFormSet[Index])->Title, sizeof (UINT16));
|
||||
if (TempValue == FRAMEWORK_EFI_IFR_BANNER_TIMEOUT) {
|
||||
CopyMem (&FrontPageTimeOutTitle, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Title, sizeof (UINT16));
|
||||
if (FrontPageTimeOutValue != (INT16) -1) {
|
||||
CopyMem (&FrontPageTimeOutValue, &((EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber, sizeof (UINT16));
|
||||
CopyMem (&FrontPageTimeOutValue, &((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber, sizeof (UINT16));
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
CopyMem (
|
||||
&BannerData->Banner[((EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber][
|
||||
((EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment],
|
||||
&((EFI_IFR_BANNER *) &RawFormSet[Index])->Title,
|
||||
&BannerData->Banner[((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->LineNumber][
|
||||
((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Alignment],
|
||||
&((FRAMEWORK_EFI_IFR_BANNER *) &RawFormSet[Index])->Title,
|
||||
sizeof (STRING_REF)
|
||||
);
|
||||
}
|
||||
break;
|
||||
|
||||
case EFI_IFR_INCONSISTENT_IF_OP:
|
||||
case FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP:
|
||||
CopyMem (
|
||||
&FormTags->Tags[CurrTag].Text,
|
||||
&((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup,
|
||||
&((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
gConsistencyId++;
|
||||
|
||||
InconsistentTags->Operand = ((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;
|
||||
CopyMem (&InconsistentTags->Popup, &((EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup, sizeof (UINT16));
|
||||
InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Header.OpCode;
|
||||
CopyMem (&InconsistentTags->Popup, &((FRAMEWORK_EFI_IFR_INCONSISTENT *) &RawFormSet[Index])->Popup, sizeof (UINT16));
|
||||
|
||||
//
|
||||
// Since this op-code doesn't use the next field(s), initialize them with something invalid.
|
||||
@@ -1235,14 +1235,14 @@ InitializeTagStructures (
|
||||
InconsistentTags = InconsistentTags->Next;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP:
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
|
||||
InconsistentTags->Operand = ((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Header.OpCode;
|
||||
CopyMem (&InconsistentTags->Value, &((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));
|
||||
InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Header.OpCode;
|
||||
CopyMem (&InconsistentTags->Value, &((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));
|
||||
CopyMem (
|
||||
&InconsistentTags->QuestionId1,
|
||||
&((EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->QuestionId,
|
||||
&((FRAMEWORK_EFI_IFR_EQ_ID_VAL *) &RawFormSet[Index])->QuestionId,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
|
||||
@@ -1270,14 +1270,14 @@ InitializeTagStructures (
|
||||
InconsistentTags = InconsistentTags->Next;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_VAR_VAL_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP:
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
|
||||
InconsistentTags->Operand = ((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Header.OpCode;
|
||||
CopyMem (&InconsistentTags->Value, &((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));
|
||||
InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Header.OpCode;
|
||||
CopyMem (&InconsistentTags->Value, &((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->Value, sizeof (UINT16));
|
||||
CopyMem (
|
||||
&InconsistentTags->QuestionId1,
|
||||
&((EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->VariableId,
|
||||
&((FRAMEWORK_EFI_IFR_EQ_VAR_VAL *) &RawFormSet[Index])->VariableId,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
|
||||
@@ -1304,18 +1304,18 @@ InitializeTagStructures (
|
||||
InconsistentTags = InconsistentTags->Next;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_ID_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_ID_OP:
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
|
||||
InconsistentTags->Operand = ((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->Header.OpCode;
|
||||
InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->Header.OpCode;
|
||||
CopyMem (
|
||||
&InconsistentTags->QuestionId1,
|
||||
&((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId1,
|
||||
&((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId1,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
CopyMem (
|
||||
&InconsistentTags->QuestionId2,
|
||||
&((EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId2,
|
||||
&((FRAMEWORK_EFI_IFR_EQ_ID_ID *) &RawFormSet[Index])->QuestionId2,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
|
||||
@@ -1339,14 +1339,14 @@ InitializeTagStructures (
|
||||
InconsistentTags = InconsistentTags->Next;
|
||||
break;
|
||||
|
||||
case EFI_IFR_AND_OP:
|
||||
case EFI_IFR_OR_OP:
|
||||
case EFI_IFR_NOT_OP:
|
||||
case EFI_IFR_GT_OP:
|
||||
case EFI_IFR_GE_OP:
|
||||
case EFI_IFR_TRUE_OP:
|
||||
case EFI_IFR_FALSE_OP:
|
||||
InconsistentTags->Operand = ((EFI_IFR_NOT *) &RawFormSet[Index])->Header.OpCode;
|
||||
case FRAMEWORK_EFI_IFR_AND_OP:
|
||||
case FRAMEWORK_EFI_IFR_OR_OP:
|
||||
case FRAMEWORK_EFI_IFR_NOT_OP:
|
||||
case FRAMEWORK_EFI_IFR_GT_OP:
|
||||
case FRAMEWORK_EFI_IFR_GE_OP:
|
||||
case FRAMEWORK_EFI_IFR_TRUE_OP:
|
||||
case FRAMEWORK_EFI_IFR_FALSE_OP:
|
||||
InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_NOT *) &RawFormSet[Index])->Header.OpCode;
|
||||
|
||||
//
|
||||
// Since this op-code doesn't use the next field(s), initialize them with something invalid.
|
||||
@@ -1357,8 +1357,8 @@ InitializeTagStructures (
|
||||
// Reserve INVALID_OFFSET_VALUE - 1 for TRUE or FALSE because they are inconsistency tags also, but
|
||||
// have no coresponding id. The examination of id is needed by evaluating boolean expression.
|
||||
//
|
||||
if (RawFormSet[Index] == EFI_IFR_TRUE_OP ||
|
||||
RawFormSet[Index] == EFI_IFR_FALSE_OP) {
|
||||
if (RawFormSet[Index] == FRAMEWORK_EFI_IFR_TRUE_OP ||
|
||||
RawFormSet[Index] == FRAMEWORK_EFI_IFR_FALSE_OP) {
|
||||
InconsistentTags->QuestionId1 = INVALID_OFFSET_VALUE - 1;
|
||||
} else {
|
||||
InconsistentTags->QuestionId1 = INVALID_OFFSET_VALUE;
|
||||
@@ -1380,18 +1380,18 @@ InitializeTagStructures (
|
||||
InconsistentTags = InconsistentTags->Next;
|
||||
break;
|
||||
|
||||
case EFI_IFR_EQ_ID_LIST_OP:
|
||||
case FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP:
|
||||
IfrToFormTag (RawFormSet[Index], &FormTags->Tags[CurrTag], (VOID *) &RawFormSet[Index], NULL);
|
||||
|
||||
InconsistentTags->Operand = ((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->Header.OpCode;
|
||||
InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->Header.OpCode;
|
||||
CopyMem (
|
||||
&InconsistentTags->QuestionId1,
|
||||
&((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->QuestionId,
|
||||
&((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->QuestionId,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
CopyMem (
|
||||
&InconsistentTags->ListLength,
|
||||
&((EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->ListLength,
|
||||
&((FRAMEWORK_EFI_IFR_EQ_ID_LIST *) &RawFormSet[Index])->ListLength,
|
||||
sizeof (UINT16)
|
||||
);
|
||||
InconsistentTags->ValueList = FormTags->Tags[CurrTag].IntList;
|
||||
@@ -1418,8 +1418,8 @@ InitializeTagStructures (
|
||||
InconsistentTags = InconsistentTags->Next;
|
||||
break;
|
||||
|
||||
case EFI_IFR_END_IF_OP:
|
||||
InconsistentTags->Operand = ((EFI_IFR_END_EXPR *) &RawFormSet[Index])->Header.OpCode;
|
||||
case FRAMEWORK_EFI_IFR_END_IF_OP:
|
||||
InconsistentTags->Operand = ((FRAMEWORK_EFI_IFR_END_EXPR *) &RawFormSet[Index])->Header.OpCode;
|
||||
|
||||
//
|
||||
// Since this op-code doesn't use the next field(s), initialize them with something invalid.
|
||||
@@ -1441,7 +1441,7 @@ InitializeTagStructures (
|
||||
InconsistentTags = InconsistentTags->Next;
|
||||
break;
|
||||
|
||||
case EFI_IFR_END_ONE_OF_OP:
|
||||
case FRAMEWORK_EFI_IFR_END_ONE_OF_OP:
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -1479,12 +1479,12 @@ InitializeTagStructures (
|
||||
//
|
||||
// Search the tags for the tag which corresponds to this ID
|
||||
//
|
||||
for (CurrTag = 0; FormTags->Tags[0].Operand != EFI_IFR_END_FORM_SET_OP; CurrTag++) {
|
||||
for (CurrTag = 0; FormTags->Tags[0].Operand != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {
|
||||
//
|
||||
// If we hit the end of a form, go to the next set of Tags.
|
||||
// Remember - EndFormSet op-codes sit on their own page after an end form.
|
||||
//
|
||||
if (FormTags->Tags[CurrTag].Operand == EFI_IFR_END_FORM_OP) {
|
||||
if (FormTags->Tags[CurrTag].Operand == FRAMEWORK_EFI_IFR_END_FORM_OP) {
|
||||
//
|
||||
// Reset the CurrTag value (it will be incremented, after this case statement
|
||||
// so set to a negative one so that we get the desired effect.) Fish can beat me later.
|
||||
@@ -1506,12 +1506,12 @@ InitializeTagStructures (
|
||||
//
|
||||
// Search the tags for the tag which corresponds to this ID
|
||||
//
|
||||
for (CurrTag = 0; FormTags->Tags[CurrTag].Operand != EFI_IFR_END_FORM_SET_OP; CurrTag++) {
|
||||
for (CurrTag = 0; FormTags->Tags[CurrTag].Operand != FRAMEWORK_EFI_IFR_END_FORM_SET_OP; CurrTag++) {
|
||||
//
|
||||
// If we hit the end of a form, go to the next set of Tags.
|
||||
// Remember - EndFormSet op-codes sit on their own page after an end form.
|
||||
//
|
||||
if (FormTags->Tags[CurrTag].Operand == EFI_IFR_END_FORM_OP) {
|
||||
if (FormTags->Tags[CurrTag].Operand == FRAMEWORK_EFI_IFR_END_FORM_OP) {
|
||||
//
|
||||
// Reset the CurrTag value (it will be incremented, after this case statement
|
||||
// so set to a negative one so that we get the desired effect.) Fish can beat me later.
|
||||
@@ -1582,7 +1582,7 @@ InitPage (
|
||||
CHAR16 *
|
||||
GetToken (
|
||||
IN STRING_REF Token,
|
||||
IN EFI_HII_HANDLE HiiHandle
|
||||
IN FRAMEWORK_EFI_HII_HANDLE HiiHandle
|
||||
)
|
||||
/*++
|
||||
|
||||
@@ -1650,7 +1650,7 @@ PopulateHomePage (
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
UINTN Index;
|
||||
EFI_IFR_BINARY *IfrBinary;
|
||||
FRAMEWORK_EFI_IFR_BINARY *IfrBinary;
|
||||
CHAR16 *StringPtr;
|
||||
EFI_FILE_FORM_TAGS *FileFormTags;
|
||||
EFI_FORM_TAGS LocalTags;
|
||||
@@ -1727,7 +1727,7 @@ DisplayHomePage (
|
||||
return Selection;
|
||||
}
|
||||
|
||||
Selection = UiDisplayMenu (FALSE, FileFormTagsHead, (EFI_IFR_DATA_ARRAY *) CallbackData);
|
||||
Selection = UiDisplayMenu (FALSE, FileFormTagsHead, (FRAMEWORK_EFI_IFR_DATA_ARRAY *) CallbackData);
|
||||
|
||||
return Selection;
|
||||
}
|
||||
@@ -1735,9 +1735,9 @@ DisplayHomePage (
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
InitializeBinaryStructures (
|
||||
IN EFI_HII_HANDLE *Handle,
|
||||
IN FRAMEWORK_EFI_HII_HANDLE *Handle,
|
||||
IN BOOLEAN UseDatabase,
|
||||
IN EFI_IFR_PACKET *Packet,
|
||||
IN FRAMEWORK_EFI_IFR_PACKET *Packet,
|
||||
IN UINT8 *NvMapOverride,
|
||||
IN UINTN NumberOfIfrImages,
|
||||
OUT EFI_FILE_FORM_TAGS **FileFormTagsHead
|
||||
@@ -1745,7 +1745,7 @@ InitializeBinaryStructures (
|
||||
{
|
||||
UINTN HandleIndex;
|
||||
EFI_STATUS Status;
|
||||
EFI_IFR_BINARY *BinaryData;
|
||||
FRAMEWORK_EFI_IFR_BINARY *BinaryData;
|
||||
EFI_FILE_FORM_TAGS *FileFormTags;
|
||||
UINTN SizeOfNvStore;
|
||||
EFI_FORM_CALLBACK_PROTOCOL *FormCallback;
|
||||
@@ -1780,7 +1780,7 @@ InitializeBinaryStructures (
|
||||
//
|
||||
// Allocate memory for our Binary Data
|
||||
//
|
||||
BinaryData = AllocateZeroPool (sizeof (EFI_IFR_BINARY));
|
||||
BinaryData = AllocateZeroPool (sizeof (FRAMEWORK_EFI_IFR_BINARY));
|
||||
ASSERT (BinaryData);
|
||||
|
||||
//
|
||||
@@ -1811,7 +1811,7 @@ InitializeBinaryStructures (
|
||||
// Allocate memory for our Binary Data linked-list
|
||||
// Each handle represents a Binary and we will store that data away.
|
||||
//
|
||||
BinaryData->Next = AllocateZeroPool (sizeof (EFI_IFR_BINARY));
|
||||
BinaryData->Next = AllocateZeroPool (sizeof (FRAMEWORK_EFI_IFR_BINARY));
|
||||
ASSERT (BinaryData->Next);
|
||||
|
||||
BinaryData = BinaryData->Next;
|
||||
@@ -1993,7 +1993,7 @@ InitializeBinaryStructures (
|
||||
|
||||
NvMapListHead = NULL;
|
||||
|
||||
Status = Hii->GetDefaultImage (Hii, Handle[HandleIndex], EFI_IFR_FLAG_DEFAULT, &NvMapListHead);
|
||||
Status = Hii->GetDefaultImage (Hii, Handle[HandleIndex], FRAMEWORK_EFI_IFR_FLAG_DEFAULT, &NvMapListHead);
|
||||
|
||||
if (!EFI_ERROR (Status)) {
|
||||
ASSERT_EFI_ERROR (NULL != NvMapListHead);
|
||||
@@ -2048,9 +2048,9 @@ STATIC
|
||||
EFI_STATUS
|
||||
GetIfrBinaryData (
|
||||
IN EFI_HII_PROTOCOL *Hii,
|
||||
IN EFI_HII_HANDLE HiiHandle,
|
||||
IN EFI_IFR_PACKET *Packet,
|
||||
IN OUT EFI_IFR_BINARY *BinaryData
|
||||
IN FRAMEWORK_EFI_HII_HANDLE HiiHandle,
|
||||
IN FRAMEWORK_EFI_IFR_PACKET *Packet,
|
||||
IN OUT FRAMEWORK_EFI_IFR_BINARY *BinaryData
|
||||
)
|
||||
/*++
|
||||
|
||||
@@ -2074,7 +2074,7 @@ Returns:
|
||||
UINTN BufferSize;
|
||||
VOID *Buffer;
|
||||
UINT8 *RawFormBinary;
|
||||
EFI_IFR_FORM_SET *FormOp;
|
||||
FRAMEWORK_EFI_IFR_FORM_SET *FormOp;
|
||||
UINT16 Index;
|
||||
UINT16 Index2;
|
||||
UINT16 TitleToken;
|
||||
@@ -2147,13 +2147,13 @@ Returns:
|
||||
}
|
||||
//
|
||||
// Walk through the FormSet Opcodes looking for the FormSet opcode
|
||||
// If we hit EFI_IFR_END_SET_OP we know we hit the end of the FormSet.
|
||||
// If we hit FRAMEWORK_EFI_IFR_END_SET_OP we know we hit the end of the FormSet.
|
||||
//
|
||||
for (Index = 0; RawFormBinary[Index] != EFI_IFR_END_FORM_SET_OP;) {
|
||||
FormOp = (EFI_IFR_FORM_SET *) &RawFormBinary[Index];
|
||||
for (Index = 0; RawFormBinary[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {
|
||||
FormOp = (FRAMEWORK_EFI_IFR_FORM_SET *) &RawFormBinary[Index];
|
||||
Index = (UINT16) (Index + FormOp->Header.Length);
|
||||
|
||||
if (FormOp->Header.OpCode == EFI_IFR_FORM_SET_OP) {
|
||||
if (FormOp->Header.OpCode == FRAMEWORK_EFI_IFR_FORM_SET_OP) {
|
||||
TitleToken = FormOp->FormSetTitle;
|
||||
//
|
||||
// If displaying FrontPage - set the flag signifying it
|
||||
|
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#define _SETUP_H
|
||||
|
||||
|
||||
#include <PiDxe.h>
|
||||
#include <FrameworkDxe.h>
|
||||
|
||||
#include <Protocol/FrameworkFormCallback.h>
|
||||
#include <Protocol/FrameworkFormBrowser.h>
|
||||
@@ -275,14 +275,14 @@ typedef struct {
|
||||
//
|
||||
// This encapsulates all the pointers associated with found IFR binaries
|
||||
//
|
||||
typedef struct _EFI_IFR_BINARY {
|
||||
struct _EFI_IFR_BINARY *Next;
|
||||
typedef struct _FRAMEWORK_EFI_IFR_BINARY {
|
||||
struct _FRAMEWORK_EFI_IFR_BINARY *Next;
|
||||
VOID *IfrPackage; // Handy for use in freeing the data later since this is the header of the buffer
|
||||
VOID *FormBinary;
|
||||
EFI_HII_HANDLE Handle;
|
||||
FRAMEWORK_EFI_HII_HANDLE Handle;
|
||||
STRING_REF TitleToken;
|
||||
BOOLEAN UnRegisterOnExit;
|
||||
} EFI_IFR_BINARY;
|
||||
} FRAMEWORK_EFI_IFR_BINARY;
|
||||
|
||||
//
|
||||
// This encapsulates all the questions (tags) for a particular Form Set
|
||||
@@ -334,7 +334,7 @@ typedef struct {
|
||||
//
|
||||
// Head of the Binary structures
|
||||
//
|
||||
EFI_IFR_BINARY *gBinaryDataHead;
|
||||
FRAMEWORK_EFI_IFR_BINARY *gBinaryDataHead;
|
||||
|
||||
//
|
||||
// The IFR binary that the user chose to run
|
||||
@@ -345,7 +345,7 @@ EFI_HII_PROTOCOL *Hii;
|
||||
|
||||
VOID *CachedNVEntry;
|
||||
BANNER_DATA *BannerData;
|
||||
EFI_HII_HANDLE FrontPageHandle;
|
||||
FRAMEWORK_EFI_HII_HANDLE FrontPageHandle;
|
||||
STRING_REF FrontPageTimeOutTitle;
|
||||
INT16 FrontPageTimeOutValue;
|
||||
UINTN gClassOfVfr;
|
||||
@@ -356,7 +356,7 @@ BOOLEAN gSaveRequired;
|
||||
BOOLEAN gNvUpdateRequired;
|
||||
UINT16 gConsistencyId;
|
||||
UINTN gPriorMenuEntry;
|
||||
EFI_HII_HANDLE gHiiHandle;
|
||||
FRAMEWORK_EFI_HII_HANDLE gHiiHandle;
|
||||
BOOLEAN gFirstIn;
|
||||
VOID *gPreviousValue;
|
||||
UINT16 gDirection;
|
||||
@@ -460,7 +460,7 @@ DisplayPageFrame (
|
||||
CHAR16 *
|
||||
GetToken (
|
||||
IN STRING_REF IfrBinaryTitle,
|
||||
IN EFI_HII_HANDLE HiiHandle
|
||||
IN FRAMEWORK_EFI_HII_HANDLE HiiHandle
|
||||
)
|
||||
;
|
||||
|
||||
|
@@ -361,7 +361,7 @@ Returns:
|
||||
VOID
|
||||
UiAddMenuOption (
|
||||
IN CHAR16 *String,
|
||||
IN EFI_HII_HANDLE Handle,
|
||||
IN FRAMEWORK_EFI_HII_HANDLE Handle,
|
||||
IN EFI_TAG *Tags,
|
||||
IN VOID *FormBinary,
|
||||
IN UINTN IfrNumber
|
||||
@@ -401,7 +401,7 @@ Returns:
|
||||
VOID
|
||||
UiAddSubMenuOption (
|
||||
IN CHAR16 *String,
|
||||
IN EFI_HII_HANDLE Handle,
|
||||
IN FRAMEWORK_EFI_HII_HANDLE Handle,
|
||||
IN EFI_TAG *Tags,
|
||||
IN UINTN TagIndex,
|
||||
IN UINT16 FormId,
|
||||
@@ -798,7 +798,7 @@ UpdateStatusBar (
|
||||
gScreenDimensions.BottomRow - 1,
|
||||
NvUpdateMessage
|
||||
);
|
||||
gResetRequired = (BOOLEAN) (gResetRequired | ((Flags & EFI_IFR_FLAG_RESET_REQUIRED) == EFI_IFR_FLAG_RESET_REQUIRED));
|
||||
gResetRequired = (BOOLEAN) (gResetRequired | ((Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) == FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));
|
||||
|
||||
gNvUpdateRequired = TRUE;
|
||||
} else {
|
||||
@@ -857,8 +857,8 @@ Returns:
|
||||
EFI_FILE_FORM_TAGS *PreviousFileForm;
|
||||
EFI_FORM_TAGS *FormTags;
|
||||
EFI_FORM_TAGS *PreviousFormTags;
|
||||
EFI_IFR_BINARY *IfrBinary;
|
||||
EFI_IFR_BINARY *PreviousIfrBinary;
|
||||
FRAMEWORK_EFI_IFR_BINARY *IfrBinary;
|
||||
FRAMEWORK_EFI_IFR_BINARY *PreviousIfrBinary;
|
||||
EFI_INCONSISTENCY_DATA *Inconsistent;
|
||||
EFI_VARIABLE_DEFINITION *VariableDefinition;
|
||||
EFI_VARIABLE_DEFINITION *PreviousVariableDefinition;
|
||||
@@ -900,11 +900,11 @@ Returns:
|
||||
//
|
||||
// Walk through each of the tags and free the IntList allocation
|
||||
//
|
||||
for (Index = 0; FormTags->Tags[Index].Operand != EFI_IFR_END_FORM_OP; Index++) {
|
||||
for (Index = 0; FormTags->Tags[Index].Operand != FRAMEWORK_EFI_IFR_END_FORM_OP; Index++) {
|
||||
//
|
||||
// It is more than likely that the very last page will contain an end formset
|
||||
//
|
||||
if (FormTags->Tags[Index].Operand == EFI_IFR_END_FORM_SET_OP) {
|
||||
if (FormTags->Tags[Index].Operand == FRAMEWORK_EFI_IFR_END_FORM_SET_OP) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1093,7 +1093,7 @@ Returns:
|
||||
//
|
||||
// If the op-code has a late check, ensure consistency checks are now applied
|
||||
//
|
||||
if (Tag->Flags & EFI_IFR_FLAG_LATE_CHECK) {
|
||||
if (Tag->Flags & FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK) {
|
||||
if (ValueIsNotValid (TRUE, 0, Tag, FileFormTags, &PopUp)) {
|
||||
if (PopUp != 0x0000) {
|
||||
StringPtr = GetToken (PopUp, MenuOption->Handle);
|
||||
@@ -1130,7 +1130,7 @@ Returns:
|
||||
UINT16
|
||||
GetWidth (
|
||||
IN EFI_TAG *Tag,
|
||||
IN EFI_HII_HANDLE Handle
|
||||
IN FRAMEWORK_EFI_HII_HANDLE Handle
|
||||
)
|
||||
/*++
|
||||
|
||||
@@ -1155,21 +1155,21 @@ Returns:
|
||||
//
|
||||
// See if the second text parameter is really NULL
|
||||
//
|
||||
if ((Tag->Operand == EFI_IFR_TEXT_OP) && (Tag->TextTwo != 0)) {
|
||||
if ((Tag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (Tag->TextTwo != 0)) {
|
||||
String = GetToken (Tag->TextTwo, Handle);
|
||||
Size = StrLen (String);
|
||||
FreePool (String);
|
||||
}
|
||||
|
||||
if ((Tag->Operand == EFI_IFR_SUBTITLE_OP) ||
|
||||
(Tag->Operand == EFI_IFR_REF_OP) ||
|
||||
(Tag->Operand == EFI_IFR_PASSWORD_OP) ||
|
||||
(Tag->Operand == EFI_IFR_STRING_OP) ||
|
||||
(Tag->Operand == EFI_IFR_INVENTORY_OP) ||
|
||||
if ((Tag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) ||
|
||||
(Tag->Operand == FRAMEWORK_EFI_IFR_REF_OP) ||
|
||||
(Tag->Operand == FRAMEWORK_EFI_IFR_PASSWORD_OP) ||
|
||||
(Tag->Operand == FRAMEWORK_EFI_IFR_STRING_OP) ||
|
||||
(Tag->Operand == FRAMEWORK_EFI_IFR_INVENTORY_OP) ||
|
||||
//
|
||||
// Allow a wide display if text op-code and no secondary text op-code
|
||||
//
|
||||
((Tag->Operand == EFI_IFR_TEXT_OP) && (Size == 0x0000))
|
||||
((Tag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (Size == 0x0000))
|
||||
) {
|
||||
return (UINT16) (gPromptBlockWidth + gOptionBlockWidth);
|
||||
} else {
|
||||
@@ -1285,7 +1285,7 @@ Returns:
|
||||
STATIC
|
||||
VOID
|
||||
UpdateOptionSkipLines (
|
||||
IN EFI_IFR_DATA_ARRAY *PageData,
|
||||
IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,
|
||||
IN UI_MENU_OPTION *MenuOption,
|
||||
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,
|
||||
IN CHAR16 **OptionalString,
|
||||
@@ -1376,7 +1376,7 @@ UI_MENU_OPTION *
|
||||
UiDisplayMenu (
|
||||
IN BOOLEAN SubMenu,
|
||||
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,
|
||||
OUT EFI_IFR_DATA_ARRAY *PageData
|
||||
OUT FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData
|
||||
)
|
||||
/*++
|
||||
|
||||
@@ -1388,7 +1388,7 @@ Routine Description:
|
||||
Arguments:
|
||||
SubMenu - Indicate is sub menu.
|
||||
FileFormTagsHead - A pointer to the EFI_FILE_FORM_TAGS structure.
|
||||
PageData - A pointer to the EFI_IFR_DATA_ARRAY.
|
||||
PageData - A pointer to the FRAMEWORK_EFI_IFR_DATA_ARRAY.
|
||||
|
||||
Returns:
|
||||
Return the pointer of the menu which selected,
|
||||
@@ -1433,7 +1433,7 @@ Returns:
|
||||
UI_MENU_OPTION *NextMenuOption;
|
||||
UI_MENU_OPTION *SavedMenuOption;
|
||||
UI_MENU_OPTION *PreviousMenuOption;
|
||||
EFI_IFR_BINARY *IfrBinary;
|
||||
FRAMEWORK_EFI_IFR_BINARY *IfrBinary;
|
||||
UI_CONTROL_FLAG ControlFlag;
|
||||
EFI_SCREEN_DESCRIPTOR LocalScreen;
|
||||
EFI_FILE_FORM_TAGS *FileFormTags;
|
||||
@@ -1572,7 +1572,7 @@ Returns:
|
||||
if (MenuOption->ThisTag->GrayOut) {
|
||||
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);
|
||||
} else {
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP) {
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) {
|
||||
gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);
|
||||
}
|
||||
}
|
||||
@@ -1608,8 +1608,8 @@ Returns:
|
||||
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);
|
||||
|
||||
if (OptionString != NULL) {
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||
|
||||
MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||
|
||||
MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP
|
||||
) {
|
||||
//
|
||||
// If leading spaces on OptionString - remove the spaces
|
||||
@@ -1629,8 +1629,8 @@ Returns:
|
||||
//
|
||||
// If this is a date or time op-code and is used to reflect an RTC, register the op-code
|
||||
//
|
||||
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||
|
||||
MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP) &&
|
||||
if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||
|
||||
MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP) &&
|
||||
(MenuOption->ThisTag->StorageStart >= FileFormTags->FormTags.Tags[0].NvDataSize)) {
|
||||
|
||||
if (gMenuRefreshHead == NULL) {
|
||||
@@ -1701,7 +1701,7 @@ Returns:
|
||||
//
|
||||
// If this is a text op with secondary text information
|
||||
//
|
||||
if ((MenuOption->ThisTag->Operand == EFI_IFR_TEXT_OP) && (MenuOption->ThisTag->TextTwo != 0)) {
|
||||
if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP) && (MenuOption->ThisTag->TextTwo != 0)) {
|
||||
StringPtr = GetToken (MenuOption->ThisTag->TextTwo, MenuOption->Handle);
|
||||
|
||||
Width = (UINT16) gOptionBlockWidth;
|
||||
@@ -1824,8 +1824,8 @@ Returns:
|
||||
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);
|
||||
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);
|
||||
if (OptionString != NULL) {
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||
|
||||
MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||
|
||||
MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP
|
||||
) {
|
||||
//
|
||||
// If leading spaces on OptionString - remove the spaces
|
||||
@@ -1865,7 +1865,7 @@ Returns:
|
||||
if (MenuOption->ThisTag->GrayOut) {
|
||||
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);
|
||||
} else {
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP) {
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP) {
|
||||
gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);
|
||||
}
|
||||
}
|
||||
@@ -1909,7 +1909,7 @@ Returns:
|
||||
// This is only possible if we entered this page and the first menu option is
|
||||
// a "non-menu" item. In that case, force it UiDown
|
||||
//
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {
|
||||
//
|
||||
// If we previously hit an UP command and we are still sitting on a text operation
|
||||
// we must continue going up
|
||||
@@ -1946,8 +1946,8 @@ Returns:
|
||||
if (SubMenu) {
|
||||
ProcessOptions (MenuOption, FALSE, FileFormTagsHead, PageData, &OptionString);
|
||||
if (OptionString != NULL) {
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP ||
|
||||
MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP ||
|
||||
MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP
|
||||
) {
|
||||
//
|
||||
// If leading spaces on OptionString - remove the spaces
|
||||
@@ -2032,8 +2032,8 @@ Returns:
|
||||
|
||||
if (SubMenu &&
|
||||
(Repaint || NewLine ||
|
||||
(MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) ||
|
||||
(MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) &&
|
||||
(MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) ||
|
||||
(MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) &&
|
||||
!(gClassOfVfr == EFI_GENERAL_APPLICATION_SUBCLASS)) {
|
||||
//
|
||||
// Don't print anything if it is a NULL help token
|
||||
@@ -2107,9 +2107,9 @@ Returns:
|
||||
|
||||
Status = UiWaitForSingleEvent (gST->ConIn->WaitForKey, ONE_SECOND);
|
||||
if (Status == EFI_TIMEOUT) {
|
||||
EFI_IFR_DATA_ENTRY *DataEntry;
|
||||
FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry;
|
||||
|
||||
DataEntry = (EFI_IFR_DATA_ENTRY *) (PageData + 1);
|
||||
DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (PageData + 1);
|
||||
|
||||
PageData->EntryCount = 1;
|
||||
Count = (UINT32) ((OriginalTimeOut - FrontPageTimeOutValue) * 100 / OriginalTimeOut);
|
||||
@@ -2119,7 +2119,7 @@ Returns:
|
||||
FormCallback->Callback (
|
||||
FormCallback,
|
||||
0xFFFF,
|
||||
(EFI_IFR_DATA_ARRAY *) PageData,
|
||||
(FRAMEWORK_EFI_IFR_DATA_ARRAY *) PageData,
|
||||
NULL
|
||||
);
|
||||
}
|
||||
@@ -2135,7 +2135,7 @@ Returns:
|
||||
FormCallback->Callback (
|
||||
FormCallback,
|
||||
0xFFFE,
|
||||
(EFI_IFR_DATA_ARRAY *) PageData,
|
||||
(FRAMEWORK_EFI_IFR_DATA_ARRAY *) PageData,
|
||||
NULL
|
||||
);
|
||||
}
|
||||
@@ -2181,7 +2181,7 @@ Returns:
|
||||
//
|
||||
case '+':
|
||||
case '-':
|
||||
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {
|
||||
if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
|
||||
|
||||
if (Key.UnicodeChar == '+') {
|
||||
gDirection = SCAN_RIGHT;
|
||||
@@ -2205,7 +2205,7 @@ Returns:
|
||||
case ' ':
|
||||
if (gClassOfVfr != EFI_FRONT_PAGE_SUBCLASS) {
|
||||
if (SubMenu) {
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_CHECKBOX_OP && !(MenuOption->ThisTag->GrayOut)) {
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_CHECKBOX_OP && !(MenuOption->ThisTag->GrayOut)) {
|
||||
gST->ConOut->SetCursorPosition (gST->ConOut, MenuOption->Col, MenuOption->Row);
|
||||
gST->ConOut->OutputString (gST->ConOut, MenuOption->Description);
|
||||
Selection = MenuOption;
|
||||
@@ -2265,7 +2265,7 @@ Returns:
|
||||
//
|
||||
for (Link = Menu.ForwardLink; Link != &Menu; Link = Link->ForwardLink) {
|
||||
NextMenuOption = CR (Link, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);
|
||||
if (!(NextMenuOption->ThisTag->GrayOut) && (NextMenuOption->ThisTag->Operand != EFI_IFR_SUBTITLE_OP)) {
|
||||
if (!(NextMenuOption->ThisTag->GrayOut) && (NextMenuOption->ThisTag->Operand != FRAMEWORK_EFI_IFR_SUBTITLE_OP)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -2336,11 +2336,11 @@ Returns:
|
||||
ExtractRequestedNvMap (FileFormTags, MenuOption->ThisTag->VariableNumber, &VariableDefinition);
|
||||
|
||||
if (SubMenu) {
|
||||
if ((MenuOption->ThisTag->Operand == EFI_IFR_TEXT_OP &&
|
||||
!(MenuOption->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE)) ||
|
||||
if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TEXT_OP &&
|
||||
!(MenuOption->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE)) ||
|
||||
(MenuOption->ThisTag->GrayOut) ||
|
||||
(MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) ||
|
||||
(MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {
|
||||
(MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) ||
|
||||
(MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
|
||||
Selection = NULL;
|
||||
break;
|
||||
}
|
||||
@@ -2359,7 +2359,7 @@ Returns:
|
||||
PrintStringAt (LocalScreen.LeftColumn + gPromptBlockWidth + 1, MenuOption->Row, OptionString);
|
||||
}
|
||||
|
||||
if (MenuOption->ThisTag->Flags & EFI_IFR_FLAG_INTERACTIVE) {
|
||||
if (MenuOption->ThisTag->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) {
|
||||
Selection = MenuOption;
|
||||
}
|
||||
|
||||
@@ -2372,7 +2372,7 @@ Returns:
|
||||
//
|
||||
// If not a goto, dump single piece of data, otherwise dump everything
|
||||
//
|
||||
if (Selection->ThisTag->Operand == EFI_IFR_REF_OP) {
|
||||
if (Selection->ThisTag->Operand == FRAMEWORK_EFI_IFR_REF_OP) {
|
||||
//
|
||||
// Check for tags that might have LATE_CHECK enabled. If they do, we can't switch pages or save NV data.
|
||||
//
|
||||
@@ -2532,7 +2532,7 @@ Returns:
|
||||
|
||||
case CfUiLeft:
|
||||
ControlFlag = CfCheckSelection;
|
||||
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {
|
||||
if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
|
||||
if (MenuOption->Skip == 1) {
|
||||
//
|
||||
// In the tail of the Date/Time op-code set, go left.
|
||||
@@ -2553,7 +2553,7 @@ Returns:
|
||||
case CfUiRight:
|
||||
ControlFlag = CfCheckSelection;
|
||||
if ((MenuOption->Skip == 0) &&
|
||||
((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP))
|
||||
((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP))
|
||||
) {
|
||||
//
|
||||
// We are in the head or middle of the Date/Time op-code set, advance right.
|
||||
@@ -2593,7 +2593,7 @@ Returns:
|
||||
//
|
||||
// If the previous MenuOption contains a display-only op-code, skip to the next one
|
||||
//
|
||||
if (PreviousMenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || PreviousMenuOption->ThisTag->GrayOut) {
|
||||
if (PreviousMenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || PreviousMenuOption->ThisTag->GrayOut) {
|
||||
//
|
||||
// This is ok as long as not at the end of the list
|
||||
//
|
||||
@@ -2648,7 +2648,7 @@ Returns:
|
||||
if (SubMenu) {
|
||||
SavedMenuOption = MenuOption;
|
||||
MenuOption = CR (NewPos, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {
|
||||
//
|
||||
// If we are at the end of the list and sitting on a text op, we need to more forward
|
||||
//
|
||||
@@ -2754,7 +2754,7 @@ Returns:
|
||||
// If the next MenuOption contains a display-only op-code, skip to the next one
|
||||
// Also if the next MenuOption is date or time,
|
||||
//
|
||||
if (NextMenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || NextMenuOption->ThisTag->GrayOut) {
|
||||
if (NextMenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || NextMenuOption->ThisTag->GrayOut) {
|
||||
//
|
||||
// This is ok as long as not at the end of the list
|
||||
//
|
||||
@@ -2880,7 +2880,7 @@ Returns:
|
||||
if (SubMenu) {
|
||||
SavedMenuOption = MenuOption;
|
||||
MenuOption = CR (NewPos, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);
|
||||
if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {
|
||||
if (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut) {
|
||||
//
|
||||
// If we are at the end of the list and sitting on a text op, we need to more forward
|
||||
//
|
||||
@@ -2970,7 +2970,7 @@ Returns:
|
||||
|
||||
NvMapListHead = NULL;
|
||||
|
||||
Status = Hii->GetDefaultImage (Hii, MenuOption->Handle, EFI_IFR_FLAG_DEFAULT, &NvMapListHead);
|
||||
Status = Hii->GetDefaultImage (Hii, MenuOption->Handle, FRAMEWORK_EFI_IFR_FLAG_DEFAULT, &NvMapListHead);
|
||||
|
||||
if (!EFI_ERROR (Status)) {
|
||||
ASSERT_EFI_ERROR (NULL != NvMapListHead);
|
||||
@@ -3079,7 +3079,7 @@ Returns:
|
||||
|
||||
for (; Temp != &Menu; Temp = Direction ? Temp->BackLink : Temp->ForwardLink) {
|
||||
MenuOption = CR (Temp, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);
|
||||
if (!(MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut)) {
|
||||
if (!(MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_SUBTITLE_OP || MenuOption->ThisTag->GrayOut)) {
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
@@ -3116,7 +3116,7 @@ Returns:
|
||||
NewPosition = *CurrentPosition;
|
||||
MenuOption = CR (NewPosition, UI_MENU_OPTION, Link, UI_MENU_OPTION_SIGNATURE);
|
||||
|
||||
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {
|
||||
if ((MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == FRAMEWORK_EFI_IFR_TIME_OP)) {
|
||||
//
|
||||
// Calculate the distance from current position to the last Date/Time op-code.
|
||||
//
|
||||
|
@@ -80,7 +80,7 @@ typedef struct {
|
||||
|
||||
UINTN IfrNumber;
|
||||
VOID *FormBinary;
|
||||
EFI_HII_HANDLE Handle;
|
||||
FRAMEWORK_EFI_HII_HANDLE Handle;
|
||||
EFI_TAG *Tags;
|
||||
UINTN TagIndex;
|
||||
EFI_TAG *ThisTag;
|
||||
@@ -167,7 +167,7 @@ UiFreeMenu (
|
||||
VOID
|
||||
UiAddMenuOption (
|
||||
IN CHAR16 *String,
|
||||
IN EFI_HII_HANDLE Handle,
|
||||
IN FRAMEWORK_EFI_HII_HANDLE Handle,
|
||||
IN EFI_TAG *Tag,
|
||||
IN VOID *FormBinary,
|
||||
IN UINTN IfrNumber
|
||||
@@ -177,7 +177,7 @@ UiAddMenuOption (
|
||||
VOID
|
||||
UiAddSubMenuOption (
|
||||
IN CHAR16 *String,
|
||||
IN EFI_HII_HANDLE Handle,
|
||||
IN FRAMEWORK_EFI_HII_HANDLE Handle,
|
||||
IN EFI_TAG *Tag,
|
||||
IN UINTN TagIndex,
|
||||
IN UINT16 FormId,
|
||||
@@ -189,7 +189,7 @@ UI_MENU_OPTION *
|
||||
UiDisplayMenu (
|
||||
IN BOOLEAN SubMenu,
|
||||
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,
|
||||
OUT EFI_IFR_DATA_ARRAY *PageData
|
||||
OUT FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData
|
||||
)
|
||||
;
|
||||
|
||||
@@ -245,7 +245,7 @@ ReadPassword (
|
||||
IN UI_MENU_OPTION *MenuOption,
|
||||
IN BOOLEAN PromptForPassword,
|
||||
IN EFI_TAG *Tag,
|
||||
IN EFI_IFR_DATA_ARRAY *PageData,
|
||||
IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,
|
||||
IN BOOLEAN SecondEntry,
|
||||
IN EFI_FILE_FORM_TAGS *FileFormTags,
|
||||
OUT CHAR16 *StringPtr
|
||||
@@ -302,7 +302,7 @@ ProcessOptions (
|
||||
IN UI_MENU_OPTION *MenuOption,
|
||||
IN BOOLEAN Selected,
|
||||
IN EFI_FILE_FORM_TAGS *FileFormTagsHead,
|
||||
IN EFI_IFR_DATA_ARRAY *PageData,
|
||||
IN FRAMEWORK_EFI_IFR_DATA_ARRAY *PageData,
|
||||
OUT CHAR16 **OptionString
|
||||
)
|
||||
;
|
||||
@@ -368,7 +368,7 @@ GetLineByWidth (
|
||||
UINT16
|
||||
GetWidth (
|
||||
IN EFI_TAG *Tag,
|
||||
IN EFI_HII_HANDLE Handle
|
||||
IN FRAMEWORK_EFI_HII_HANDLE Handle
|
||||
)
|
||||
;
|
||||
|
||||
|
Reference in New Issue
Block a user