\r
SET_LINE_INFO (*FSObj, L);\r
FSObj->SetGuid (&Guid);\r
- //\r
- // for framework vfr to store formset guid used by varstore and efivarstore\r
- //\r
- if (mCompatibleMode) {\r
- memcpy (&mFormsetGuid, &Guid, sizeof (EFI_GUID));\r
- }\r
FSObj->SetFormSetTitle (_STOSID(S1->getText(), S1->getLine()));\r
FSObj->SetHelp (_STOSID(S2->getText(), S2->getLine()));\r
>>\r
| T:"EFI_HII_TIME" "," << TypeName = T->getText(); LineNum = T->getLine(); >>\r
| R:"EFI_HII_REF" "," << TypeName = R->getText(); LineNum = R->getLine(); >>\r
)\r
- { Key "=" FID:Number "," << // Key is used to assign Varid in Framework VFR but no use in UEFI2.1 VFR\r
- if (mCompatibleMode) {\r
- VarStoreId = _STOU16(FID->getText(), FID->getLine());\r
- }\r
- >>\r
- }\r
{\r
VarId "=" ID:Number "," <<\r
_PCATCH(\r
Name "=" SN:StringIdentifier ","\r
Uuid "=" guidDefinition[Guid]\r
<<\r
- if (mCompatibleMode) {\r
- StoreName = TypeName;\r
- } else {\r
- StoreName = SN->getText();\r
- }\r
+\r
+ StoreName = SN->getText();\r
_PCATCH(gCVfrDataStorage.DeclareBufferVarStore (\r
StoreName,\r
&Guid,\r
vfrStatementSuppressIfFormSet :\r
<< CIfrSuppressIf SIObj;>>\r
L:SuppressIf <<\r
- if (mCompatibleMode) {\r
- _PCATCH (VFR_RETURN_UNSUPPORTED, L);\r
- }\r
SIObj.SetLineNo(L->getLine()); \r
>>\r
{ FLAGS "=" flagsField ( "\|" flagsField )* "," }\r
| InteractiveFlag << $Flags |= 0x04; >>\r
| ResetRequiredFlag << $Flags |= 0x10; >>\r
| ReconnectRequiredFlag << $Flags |= 0x40; >>\r
- | O:OptionOnlyFlag << \r
- if (mCompatibleMode) {\r
- $Flags |= 0x80;\r
- } else {\r
- gCVfrErrorHandle.HandleWarning (\r
- VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
- O->getLine(),\r
- O->getText()\r
- );\r
- }\r
+ | O:OptionOnlyFlag <<\r
+ gCVfrErrorHandle.HandleWarning (\r
+ VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
+ O->getLine(),\r
+ O->getText()\r
+ );\r
>>\r
- | N:NVAccessFlag << \r
- if (!mCompatibleMode) {\r
- gCVfrErrorHandle.HandleWarning (\r
- VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
- N->getLine(),\r
- N->getText()\r
- );\r
- }\r
+ | N:NVAccessFlag <<\r
+ gCVfrErrorHandle.HandleWarning (\r
+ VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
+ N->getLine(),\r
+ N->getText()\r
+ );\r
>>\r
- | L:LateCheckFlag << \r
- if (!mCompatibleMode) {\r
- gCVfrErrorHandle.HandleWarning (\r
- VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
- L->getLine(),\r
- L->getText()\r
- );\r
- }\r
+ | L:LateCheckFlag <<\r
+ gCVfrErrorHandle.HandleWarning (\r
+ VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
+ L->getLine(),\r
+ L->getText()\r
+ );\r
>>\r
;\r
\r
>>\r
<<\r
VfrReturnCode = gCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId);\r
- if (mCompatibleMode && VfrReturnCode == VFR_RETURN_UNDEFINED) {\r
- gCVfrDataStorage.DeclareBufferVarStore (\r
- SName,\r
- &mFormsetGuid,\r
- &gCVfrVarDataTypeDB,\r
- SName,\r
- EFI_VARSTORE_ID_INVALID,\r
- FALSE,\r
- FALSE\r
- );\r
- VfrReturnCode = gCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId, &mFormsetGuid);\r
- }\r
if (CheckFlag || VfrReturnCode == VFR_RETURN_SUCCESS) {\r
_PCATCH(VfrReturnCode, SN1);\r
_PCATCH(gCVfrDataStorage.GetNameVarStoreInfo (&$Info, Idx), SN1);\r
SN2:StringIdentifier << SName = SN2->getText(); _STRCAT(&VarIdStr, SName); >>\r
<<\r
VfrReturnCode = gCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId);\r
- if (mCompatibleMode && VfrReturnCode == VFR_RETURN_UNDEFINED) {\r
- gCVfrDataStorage.DeclareBufferVarStore (\r
- SName,\r
- &mFormsetGuid,\r
- &gCVfrVarDataTypeDB,\r
- SName,\r
- EFI_VARSTORE_ID_INVALID,\r
- FALSE\r
- );\r
- VfrReturnCode = gCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId, &mFormsetGuid);\r
- }\r
if (CheckFlag || VfrReturnCode == VFR_RETURN_SUCCESS) {\r
_PCATCH(VfrReturnCode, SN2);\r
VarStoreType = gCVfrDataStorage.GetVarStoreType ($Info.mVarStoreId);\r
{\r
OpenBracket I2:Number CloseBracket <<\r
Idx = _STOU32(I2->getText(), I2->getLine());\r
- if (mCompatibleMode) Idx --;\r
if (Idx > 0) {\r
//\r
// Idx == 0, [0] can be ignored.\r
{\r
OpenBracket I2:Number CloseBracket <<\r
Idx = _STOU32(I2->getText(), I2->getLine());\r
- if (mCompatibleMode) Idx --;\r
if (Idx > 0) {\r
//\r
// Idx == 0, [0] can be ignored.\r
vfrStatementRefreshEvent ";"\r
)*\r
E:EndForm <<\r
- if (mCompatibleMode) {\r
- //\r
- // Add Label for Framework Vfr\r
- //\r
- CIfrLabel LObj1;\r
- LObj1.SetLineNo(E->getLine());\r
- LObj1.SetNumber (0xffff); //add end label for UEFI, label number hardcode 0xffff\r
- CIfrLabel LObj2;\r
- LObj2.SetLineNo(E->getLine());\r
- LObj2.SetNumber (0x0); //add dummy label for UEFI, label number hardcode 0x0\r
- CIfrLabel LObj3;\r
- LObj3.SetLineNo(E->getLine());\r
- LObj3.SetNumber (0xffff); //add end label for UEFI, label number hardcode 0xffff\r
- }\r
-\r
{CIfrEnd EObj; EObj.SetLineNo (E->getLine()); mLastFormEndAddr = EObj.GetObjBinAddr<CHAR8>(); gAdjustOpcodeOffset = EObj.GetObjBinOffset ();}\r
>>\r
";"\r
;\r
\r
vfrStatementSuppressIfStat :\r
- <<mCompatibleMode>>? vfrStatementSuppressIfStatOld\r
- | vfrStatementSuppressIfStatNew\r
+ vfrStatementSuppressIfStatNew\r
;\r
\r
vfrStatementGrayOutIfStat :\r
- <<mCompatibleMode>>? vfrStatementGrayOutIfStatOld\r
- | vfrStatementGrayOutIfStatNew\r
+ vfrStatementGrayOutIfStatNew\r
;\r
\r
vfrStatementInvalid :\r
| DefaultFlag \r
| ResetRequiredFlag \r
| ReconnectRequiredFlag\r
- | N:NVAccessFlag << \r
- if (!mCompatibleMode) {\r
- gCVfrErrorHandle.HandleWarning (\r
- VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
- N->getLine(),\r
- N->getText()\r
- );\r
- }\r
+ | N:NVAccessFlag <<\r
+ gCVfrErrorHandle.HandleWarning (\r
+ VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
+ N->getLine(),\r
+ N->getText()\r
+ );\r
>>\r
- | L:LateCheckFlag << \r
- if (!mCompatibleMode) {\r
- gCVfrErrorHandle.HandleWarning (\r
- VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
- L->getLine(),\r
- L->getText()\r
- );\r
- }\r
+ | L:LateCheckFlag <<\r
+ gCVfrErrorHandle.HandleWarning (\r
+ VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
+ L->getLine(),\r
+ L->getText()\r
+ );\r
>> \r
;\r
\r
\r
checkboxFlagsField[UINT8 & LFlags, UINT8 & HFlags] :\r
N:Number <<\r
- if (mCompatibleMode) {\r
- //\r
- // set question flag\r
- //\r
- $LFlags |= _STOU8(N->getText(), N->getLine());\r
- } else {\r
- _PCATCH(_STOU8(N->getText(), N->getLine()) == 0 ? VFR_RETURN_SUCCESS : VFR_RETURN_UNSUPPORTED, N->getLine());\r
- }\r
+ _PCATCH(_STOU8(N->getText(), N->getLine()) == 0 ? VFR_RETURN_SUCCESS : VFR_RETURN_UNSUPPORTED, N->getLine());\r
>>\r
| D:"DEFAULT" <<\r
- if (mCompatibleMode) {\r
- //\r
- // set question Default flag\r
- //\r
- $LFlags |= 0x01;\r
- } else {\r
- _PCATCH (VFR_RETURN_UNSUPPORTED, D);\r
- }\r
+ _PCATCH (VFR_RETURN_UNSUPPORTED, D);\r
>>\r
| M:"MANUFACTURING" <<\r
- if (mCompatibleMode) {\r
- //\r
- // set question MFG flag\r
- //\r
- $LFlags |= 0x02;\r
- } else {\r
- _PCATCH (VFR_RETURN_UNSUPPORTED, M);\r
- }\r
+ _PCATCH (VFR_RETURN_UNSUPPORTED, M);\r
>>\r
| "CHECKBOX_DEFAULT" << $LFlags |= 0x01; >>\r
| "CHECKBOX_DEFAULT_MFG" << $LFlags |= 0x02; >>\r
vfrStatementInconsistentIfStat :\r
<< CIfrInconsistentIf IIObj; >>\r
L:InconsistentIf <<\r
- if (!mCompatibleMode) {\r
- _PCATCH (VFR_RETURN_UNSUPPORTED, L);\r
- }\r
+ _PCATCH (VFR_RETURN_UNSUPPORTED, L);\r
IIObj.SetLineNo(L->getLine());\r
>>\r
Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << IIObj.SetError (_STOSID(S->getText(), S->getLine())); >>\r
E: EndIf ";" << CRT_END_OP (E); >>\r
;\r
\r
-vfrStatementSuppressIfStatOld :\r
- <<\r
- CIfrSuppressIf SIObj;\r
- BOOLEAN GrayOutExist = FALSE;\r
- >>\r
- L:SuppressIf << SIObj.SetLineNo(L->getLine()); >>\r
- { FLAGS "=" flagsField ( "\|" flagsField )* "," }\r
- vfrStatementExpression[0]\r
- ";"\r
- {\r
- vfrStatementsuppressIfGrayOutIf\r
- << GrayOutExist = TRUE; >>\r
- }\r
- ( vfrStatementStatListOld )*\r
- E: EndIf ";" << if (GrayOutExist) CRT_END_OP (E); CRT_END_OP (E);>>\r
- ;\r
-\r
-vfrStatementGrayOutIfStatOld :\r
- <<\r
- CIfrGrayOutIf GOIObj;\r
- BOOLEAN SuppressExist = FALSE;\r
- >>\r
- L:GrayOutIf << GOIObj.SetLineNo(L->getLine()); >>\r
- { FLAGS "=" flagsField ( "\|" flagsField )* "," }\r
- vfrStatementExpression[0]\r
- ";"\r
- {\r
- vfrStatementgrayoutIfSuppressIf\r
- << SuppressExist = TRUE; >>\r
- }\r
- ( vfrStatementStatListOld )*\r
- E: EndIf ";" << if (SuppressExist) CRT_END_OP (E); CRT_END_OP (E); >>\r
- ;\r
-\r
vfrImageTag :\r
<< CIfrImage IObj; >>\r
L:Image "=" "IMAGE_TOKEN" "\(" S1:Number "\)" << IObj.SetImageId (_STOSID(S1->getText(), S1->getLine())); IObj.SetLineNo(L->getLine()); >>\r
>>\r
{\r
"," Key "=" KN:Number <<\r
- if (!mCompatibleMode) {\r
- _PCATCH (VFR_RETURN_UNSUPPORTED, KN);\r
- }\r
+ _PCATCH (VFR_RETURN_UNSUPPORTED, KN);\r
//\r
// Guid Option Key\r
//\r
| ReconnectRequiredFlag << $HFlags |= 0x40; >>\r
| ManufacturingFlag << $LFlags |= 0x20; >>\r
| DefaultFlag << $LFlags |= 0x10; >>\r
- | A:NVAccessFlag << \r
- if (mCompatibleMode) {\r
- $HFlags |= 0x08;\r
- } else {\r
- gCVfrErrorHandle.HandleWarning (\r
- VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
- A->getLine(),\r
- A->getText()\r
- );\r
- }\r
+ | A:NVAccessFlag <<\r
+ gCVfrErrorHandle.HandleWarning (\r
+ VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
+ A->getLine(),\r
+ A->getText()\r
+ );\r
>>\r
- | L:LateCheckFlag << \r
- if (mCompatibleMode) {\r
- $HFlags |= 0x20;\r
- } else {\r
- gCVfrErrorHandle.HandleWarning (\r
- VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
- L->getLine(),\r
- L->getText()\r
- );\r
- }\r
+ | L:LateCheckFlag <<\r
+ gCVfrErrorHandle.HandleWarning (\r
+ VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
+ L->getLine(),\r
+ L->getText()\r
+ );\r
>>\r
;\r
\r
vfrStatementLabel :\r
L:Label\r
N:Number <<\r
- if (mCompatibleMode) {\r
- //\r
- // Add end Label for Framework Vfr\r
- //\r
- CIfrLabel LObj1;\r
- LObj1.SetLineNo(L->getLine());\r
- LObj1.SetNumber (0xffff); //add end label for UEFI, label number hardcode 0xffff\r
- }\r
-\r
{\r
CIfrLabel LObj2;\r
LObj2.SetLineNo(L->getLine());\r
//\r
vfrStatementInvalidHidden :\r
L:Hidden <<\r
- if (!mCompatibleMode) {\r
- _PCATCH (VFR_RETURN_UNSUPPORTED, L);\r
- }\r
+ _PCATCH (VFR_RETURN_UNSUPPORTED, L);\r
>>\r
Value "=" Number ","\r
Key "=" Number ";"\r
\r
vfrStatementInvalidInventory :\r
L:Inventory <<\r
- if (!mCompatibleMode) {\r
- _PCATCH (VFR_RETURN_UNSUPPORTED, L);\r
- }\r
+ _PCATCH (VFR_RETURN_UNSUPPORTED, L);\r
>>\r
Help "=" "STRING_TOKEN" "\(" Number "\)" ","\r
Text "=" "STRING_TOKEN" "\(" Number "\)" ","\r
vfrStatementInvalidSaveRestoreDefaults :\r
(\r
L:Save <<\r
- if (!mCompatibleMode) {\r
- _PCATCH (VFR_RETURN_UNSUPPORTED, L);\r
- }\r
+ _PCATCH (VFR_RETURN_UNSUPPORTED, L);\r
>>\r
|\r
K:Restore <<\r
- if (!mCompatibleMode) {\r
- _PCATCH (VFR_RETURN_UNSUPPORTED, K);\r
- }\r
+ _PCATCH (VFR_RETURN_UNSUPPORTED, K);\r
>>\r
)\r
Defaults ","\r
EFI_VARSTORE_ID VarStoreId = EFI_VARSTORE_ID_INVALID;\r
>>\r
L:VarEqVal <<\r
- if (!mCompatibleMode) {\r
_PCATCH (VFR_RETURN_UNSUPPORTED, L);\r
- }\r
>>\r
VK:Var\r
OpenParen\r
UINT16 mUsedDefaultArray[EFI_IFR_MAX_DEFAULT_TYPE];\r
UINT16 mUsedDefaultCount;\r
\r
-//\r
-// For framework vfr compatibility\r
-//\r
- BOOLEAN mCompatibleMode;\r
EFI_GUID mFormsetGuid;\r
\r
VOID _CRT_OP (IN BOOLEAN);\r
projects / mirror_edk2.git / blobdiff