From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: liming.gao@intel.com) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by groups.io with SMTP; Fri, 10 May 2019 00:36:35 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 May 2019 00:36:34 -0700 X-ExtLoop1: 1 Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga001.fm.intel.com with ESMTP; 10 May 2019 00:36:34 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 10 May 2019 00:36:34 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.33]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.129]) with mapi id 14.03.0415.000; Fri, 10 May 2019 15:36:32 +0800 From: "Liming Gao" To: "devel@edk2.groups.io" , "Bi, Dandan" CC: "Feng, Bob C" Subject: Re: [edk2-devel] [patch] BaseTools/VfrCompile: clean Framework Vfr support Thread-Topic: [edk2-devel] [patch] BaseTools/VfrCompile: clean Framework Vfr support Thread-Index: AQHVBvOGytyRMY02NEm+cnzUVvqRIqZj+CUQ Date: Fri, 10 May 2019 07:36:31 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E446702@SHSMSX104.ccr.corp.intel.com> References: <20190510054423.19900-1-dandan.bi@intel.com> In-Reply-To: <20190510054423.19900-1-dandan.bi@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This change is good. Reviewed-by: Liming Gao >-----Original Message----- >From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of >Dandan Bi >Sent: Friday, May 10, 2019 1:44 PM >To: devel@edk2.groups.io >Cc: Feng, Bob C ; Gao, Liming >Subject: [edk2-devel] [patch] BaseTools/VfrCompile: clean Framework Vfr >support > >REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 > >This commit is to do the cleanup which are missing in >previous commit 1b72fd5121b5b31918be0a9a0868a39070d4c8d4 >BaseTools/VfrCompile: Remove framework VFR support > >Cc: Bob Feng >Cc: Liming Gao >Signed-off-by: Dandan Bi >--- > BaseTools/Source/C/VfrCompile/VfrSyntax.g | 272 +++++----------------- > 1 file changed, 55 insertions(+), 217 deletions(-) > >diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g >b/BaseTools/Source/C/VfrCompile/VfrSyntax.g >index 24b30e3825..127cb8b2b2 100644 >--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g >+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g >@@ -652,16 +652,10 @@ vfrFormSetDefinition : > break; > } > > SET_LINE_INFO (*FS= Obj, L); > FSObj->SetGuid (&G= uid); >- // >- // for framework v= fr to store formset guid used by >varstore and efivarstore >- // >- if (mCompatibleMod= e) { >- memcpy (&mFormse= tGuid, &Guid, sizeof >(EFI_GUID)); >- } > FSObj->SetFormSetT= itle (_STOSID(S1->getText(), >S1->getLine())); > FSObj->SetHelp (_S= TOSID(S2->getText(), S2- >>getLine())); > >> > { > FC:Class "=3D" classDefinition[C] "," << {CIfrClass CObj= ;SET_LINE_INFO >(CObj, FC); CObj.SetClass(C);} >> >@@ -1004,16 +998,10 @@ vfrStatementVarStoreLinear : > | U64:"UINT64" "," << TypeName =3D U64-= >getText(); LineNum >=3D U64->getLine(); >> > | D:"EFI_HII_DATE" "," << TypeName =3D D->g= etText(); LineNum >=3D D->getLine(); >> > | T:"EFI_HII_TIME" "," << TypeName =3D T->g= etText(); LineNum >=3D T->getLine(); >> > | R:"EFI_HII_REF" "," << TypeName =3D R->g= etText(); LineNum =3D >R->getLine(); >> > ) >- { Key "=3D" FID:Number "," << // Key is used = to assign Varid in >Framework VFR but no use in UEFI2.1 VFR >- if (mCompatibleMo= de) { >- VarStoreId =3D = _STOU16(FID->getText(), FID- >>getLine()); >- } >- >> >- } > { > VarId "=3D" ID:Number "," << > _PCATCH( > (INTN)(VarStore= Id =3D _STOU16(ID->getText(), ID- >>getLine())) !=3D 0, > (INTN)TRUE, >@@ -1023,15 +1011,12 @@ vfrStatementVarStoreLinear : > >> > } > Name "=3D" SN:StringIdentifier "," > Uuid "=3D" guidDefinition[Guid] > << >- if (mCompatibleMo= de) { >- StoreName =3D T= ypeName; >- } else { >- StoreName =3D S= N->getText(); >- } >+ >+ StoreName =3D SN-= >getText(); > >_PCATCH(gCVfrDataStorage.DeclareBufferVarStore ( > = StoreName, > = &Guid, > = &gCVfrVarDataTypeDB, > = TypeName, >@@ -1241,13 +1226,10 @@ vfrStatementDisableIfFormSet : > ; > > vfrStatementSuppressIfFormSet : > << CIfrSuppressIf SIObj;>> > L:SuppressIf << >- if (mCompatib= leMode) { >- _PCATCH (VF= R_RETURN_UNSUPPORTED, L); >- } > SIObj.SetLine= No(L->getLine()); > >> > { FLAGS "=3D" flagsField ( "\|" flagsField )* "," } > vfrStatementExpression[0] ";" > vfrFormSetList >@@ -1338,38 +1320,30 @@ vfrQuestionHeader[CIfrQuestionHeader & QHObj, >EFI_QUESION_TYPE QType =3D QUESTION_ > questionheaderFlagsField[UINT8 & Flags] : > ReadOnlyFlag << $Flags |=3D 0x01;= >> > | InteractiveFlag << $Flags |=3D 0x04;= >> > | ResetRequiredFlag << $Flags |=3D 0x10;= >> > | ReconnectRequiredFlag << $Flags |=3D 0x40;= >> >- | O:OptionOnlyFlag << >- if (mCompatibleMo= de) { >- $Flags |=3D 0x8= 0; >- } else { >- gCVfrErrorHandl= e.HandleWarning ( >- >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >- O->getLine()= , >- O->getText() >- ); >- } >+ | O:OptionOnlyFlag << >+ gCVfrErrorHandle.= HandleWarning ( >+ >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >+ O->getLine(), >+ O->getText() >+ ); > >> >- | N:NVAccessFlag << >- if (!mCompatibleM= ode) { >- gCVfrErrorHand= le.HandleWarning ( >- >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >- N->getLine()= , >- N->getText() >- ); >- } >+ | N:NVAccessFlag << >+ gCVfrErrorHandle= .HandleWarning ( >+ >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >+ N->getLine(), >+ N->getText() >+ ); > >> >- | L:LateCheckFlag << >- if (!mCompatibleM= ode) { >- gCVfrErrorHand= le.HandleWarning ( >- >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >- L->getLine()= , >- L->getText() >- ); >- } >+ | L:LateCheckFlag << >+ gCVfrErrorHandle= .HandleWarning ( >+ >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >+ L->getLine(), >+ L->getText() >+ ); > >> > ; > > vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, >BOOLEAN CheckFlag =3D TRUE] : > << >@@ -1392,22 +1366,10 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, >CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl > _STRCAT(&VarIdStr= , I1->getText()); > _STRCAT(&VarIdStr= , "]"); > >> > << > VfrReturnCode =3D >gCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId); >- if (mCompatibleMo= de && VfrReturnCode =3D=3D >VFR_RETURN_UNDEFINED) { >- gCVfrDataStora= ge.DeclareBufferVarStore ( >- = SName, >- = &mFormsetGuid, >- = &gCVfrVarDataTypeDB, >- = SName, >- = EFI_VARSTORE_ID_INVALID, >- = FALSE, >- = FALSE >- = ); >- VfrReturnCode = = =3D >gCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId, >&mFormsetGuid); >- } > if (CheckFlag || = VfrReturnCode =3D=3D >VFR_RETURN_SUCCESS) { > _PCATCH(VfrRetu= rnCode, SN1); > >_PCATCH(gCVfrDataStorage.GetNameVarStoreInfo (&$Info, Idx), SN1); > } > >@@ -1417,21 +1379,10 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, >CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl > | > ( > SN2:StringIdentifier << SName =3D SN2->ge= tText(); >_STRCAT(&VarIdStr, SName); >> > << > VfrReturnCode =3D >gCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId); >- if (mCompatibleMo= de && VfrReturnCode =3D=3D >VFR_RETURN_UNDEFINED) { >- gCVfrDataStora= ge.DeclareBufferVarStore ( >- = SName, >- = &mFormsetGuid, >- = &gCVfrVarDataTypeDB, >- = SName, >- = EFI_VARSTORE_ID_INVALID, >- = FALSE >- = ); >- VfrReturnCode = = =3D >gCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId, >&mFormsetGuid); >- } > if (CheckFlag || = VfrReturnCode =3D=3D >VFR_RETURN_SUCCESS) { > _PCATCH(VfrRetu= rnCode, SN2); > VarStoreType = =3D >gCVfrDataStorage.GetVarStoreType ($Info.mVarStoreId); > if (VarStoreTyp= e =3D=3D EFI_VFR_VARSTORE_BUFFER >|| VarStoreType =3D=3D EFI_VFR_VARSTORE_BUFFER_BITS) { > >_PCATCH(gCVfrDataStorage.GetBufferVarStoreDataTypeName(Info.mVarSto >reId, &TName), SN2); >@@ -1449,11 +1400,10 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, >CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl > >> > SF:StringIdentifier << _STRCAT(&VarIdStr= , SF->getText()); >_STRCAT(&VarStr, SF->getText()); >> > { > OpenBracket I2:Number CloseBracket << > Idx =3D _STOU32(I= 2->getText(), I2->getLine()); >- if (mCompatibleMo= de) Idx --; > if (Idx > 0) { > // > // Idx =3D=3D 0= , [0] can be ignored. > // Array[0] is = same to Array for unify the varid >name to cover [0] > // >@@ -1531,11 +1481,10 @@ vfrQuestionDataFieldName [EFI_QUESTION_ID >&QId, UINT32 &Mask, CHAR8 *&VarIdStr, > >> > SF:StringIdentifier << _STRCAT (&VarIdSt= r, SF->getText()); >> > { > OpenBracket I2:Number CloseBracket << > Idx =3D _STOU32(I= 2->getText(), I2->getLine()); >- if (mCompatibleMo= de) Idx --; > if (Idx > 0) { > // > // Idx =3D=3D 0= , [0] can be ignored. > // Array[0] is = same to Array > // >@@ -1739,25 +1688,10 @@ vfrFormDefinition : > vfrStatementExtension | > vfrStatementModal | > vfrStatementRefreshEvent ";" > )* > E:EndForm << >- if (mCompatibleMod= e) { >- // >- // Add Label for= Framework Vfr >- // >- CIfrLabel LObj1; >- LObj1.SetLineNo(= E->getLine()); >- LObj1.SetNumber = (0xffff); //add end label for >UEFI, label number hardcode 0xffff >- CIfrLabel LObj2; >- LObj2.SetLineNo(= E->getLine()); >- LObj2.SetNumber = (0x0); //add dummy label for >UEFI, label number hardcode 0x0 >- CIfrLabel LObj3; >- LObj3.SetLineNo(= E->getLine()); >- LObj3.SetNumber = (0xffff); //add end label for >UEFI, label number hardcode 0xffff >- } >- > {CIfrEnd EObj; EOb= j.SetLineNo (E->getLine()); >mLastFormEndAddr =3D EObj.GetObjBinAddr(); gAdjustOpcodeOffset >=3D EObj.GetObjBinOffset ();} > >> > ";" > ; > >@@ -1999,17 +1933,15 @@ vfrStatementConditionalNew : > vfrStatementGrayOutIfStatNew | > vfrStatementInconsistentIfStat //to be compatible for framework > ; > > vfrStatementSuppressIfStat : >- <>? vfrStatementSuppressIfStatOld >- | vfrStatementSuppressIfStatNew >+ vfrStatementSuppressIfStatNew > ; > > vfrStatementGrayOutIfStat : >- <>? vfrStatementGrayOutIfStatOld >- | vfrStatementGrayOutIfStatNew >+ vfrStatementGrayOutIfStatNew > ; > > vfrStatementInvalid : > ( > vfrStatementInvalidHidden | >@@ -2024,27 +1956,23 @@ flagsField : > | InteractiveFlag > | ManufacturingFlag > | DefaultFlag > | ResetRequiredFlag > | ReconnectRequiredFlag >- | N:NVAccessFlag << >- if (!mCompatib= leMode) { >- gCVfrErrorHa= ndle.HandleWarning ( >- >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >- N->getLine= (), >- N->getText= () >- ); >- } >+ | N:NVAccessFlag << >+ gCVfrErrorHand= le.HandleWarning ( >+ >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >+ N->getLine()= , >+ N->getText() >+ ); > >> >- | L:LateCheckFlag << >- if (!mCompatib= leMode) { >- gCVfrErrorHa= ndle.HandleWarning ( >- >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >- L->getLine= (), >- L->getText= () >- ); >- } >+ | L:LateCheckFlag << >+ gCVfrErrorHand= le.HandleWarning ( >+ >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >+ L->getLine()= , >+ L->getText() >+ ); > >> > ; > > vfrStatementValue : > << CIfrValue VObj; >> >@@ -2455,38 +2383,17 @@ vfrCheckBoxFlags [CIfrCheckBox & CBObj, UINT32 >LineNum] : > << _PCATCH(CBObj.= SetFlags (HFlags, LFlags), >LineNum); >> > ; > > checkboxFlagsField[UINT8 & LFlags, UINT8 & HFlags] : > N:Number << >- if (mCompatibl= eMode) { >- // >- // set quest= ion flag >- // >- $LFlags |=3D= _STOU8(N->getText(), N->getLine()); >- } else { >- _PCATCH(_STO= U8(N->getText(), N->getLine()) >=3D=3D 0 ? VFR_RETURN_SUCCESS : VFR_RETURN_UNSUPPORTED, N->getLine()); >- } >+ _PCATCH(_STOU8= (N->getText(), N->getLine()) >=3D=3D 0 ? VFR_RETURN_SUCCESS : VFR_RETURN_UNSUPPORTED, N->getLine()); > >> > | D:"DEFAULT" << >- if (mCompatibl= eMode) { >- // >- // set quest= ion Default flag >- // >- $LFlags |=3D= 0x01; >- } else { >- _PCATCH (VFR= _RETURN_UNSUPPORTED, D); >- } >+ _PCATCH (VFR_R= ETURN_UNSUPPORTED, D); > >> > | M:"MANUFACTURING" << >- if (mCompatibl= eMode) { >- // >- // set quest= ion MFG flag >- // >- $LFlags |=3D= 0x02; >- } else { >- _PCATCH (VFR= _RETURN_UNSUPPORTED, M); >- } >+ _PCATCH (VFR_R= ETURN_UNSUPPORTED, M); > >> > | "CHECKBOX_DEFAULT" << $LFlags |=3D 0= x01; >> > | "CHECKBOX_DEFAULT_MFG" << $LFlags |=3D 0= x02; >> > | questionheaderFlagsField[HFlags] > ; >@@ -3502,13 +3409,11 @@ vfrStatementDisableIfStat : > ; > > vfrStatementInconsistentIfStat : > << CIfrInconsistentIf IIObj; >> > L:InconsistentIf << >- if (!mCompatib= leMode) { >- _PCATCH (VFR= _RETURN_UNSUPPORTED, L); >- } >+ _PCATCH (VFR_R= ETURN_UNSUPPORTED, L); > IIObj.SetLineN= o(L->getLine()); > >> > Prompt "=3D" "STRING_TOKEN" "\(" S:Number "\)" "," << IIObj.SetErr= or >(_STOSID(S->getText(), S->getLine())); >> > { FLAGS "=3D" flagsField ( "\|" flagsField )* "," } > vfrStatementExpression[0] >@@ -3553,44 +3458,10 @@ vfrStatementGrayOutIfStatNew : > ";" > ( vfrStatementStatList )* > E: EndIf ";" << CRT_END_OP (E); = >> > ; > >-vfrStatementSuppressIfStatOld : >- << >- CIfrSuppressIf SIObj; >- BOOLEAN GrayOutExist =3D FALSE; >- >> >- L:SuppressIf << SIObj.SetLineNo(= L->getLine()); >> >- { FLAGS "=3D" flagsField ( "\|" flagsField )* "," } >- vfrStatementExpression[0] >- ";" >- { >- vfrStatementsuppressIfGrayOutIf >- << GrayOutExist =3D= TRUE; >> >- } >- ( vfrStatementStatListOld )* >- E: EndIf ";" << if (GrayOutExist= ) CRT_END_OP (E); >CRT_END_OP (E);>> >- ; >- >-vfrStatementGrayOutIfStatOld : >- << >- CIfrGrayOutIf GOIObj; >- BOOLEAN SuppressExist =3D FALSE; >- >> >- L:GrayOutIf << GOIObj.SetLine= No(L->getLine()); >> >- { FLAGS "=3D" flagsField ( "\|" flagsField )* "," } >- vfrStatementExpression[0] >- ";" >- { >- vfrStatementgrayoutIfSuppressIf >- << SuppressExist = = =3D TRUE; >> >- } >- ( vfrStatementStatListOld )* >- E: EndIf ";" << if (SuppressEx= ist) CRT_END_OP (E); >CRT_END_OP (E); >> >- ; >- > vfrImageTag : > << CIfrImage IObj; >> > L:Image "=3D" "IMAGE_TOKEN" "\(" S1:Number "\)" << IObj.SetImag= eId >(_STOSID(S1->getText(), S1->getLine())); IObj.SetLineNo(L->getLine()); >> > ; > >@@ -3859,13 +3730,11 @@ vfrStatementOneOfOption : > } > } > >> > { > "," Key "=3D" KN:Number << >- if (!mCompatibl= eMode) { >- _PCATCH (VFR_= RETURN_UNSUPPORTED, KN); >- } >+ _PCATCH (VFR_RE= TURN_UNSUPPORTED, KN); > // > // Guid Option = Key > // > CIfrOptionKey I= frOptionKey ( > = gCurrentQuestion->QUESTION_ID(), >@@ -3898,46 +3767,29 @@ oneofoptionFlagsField [UINT8 & HFlags, UINT8 & >LFlags] : > | InteractiveFlag << $HFlags |=3D 0= x04; >> > | ResetRequiredFlag << $HFlags |=3D 0= x10; >> > | ReconnectRequiredFlag << $HFlags |=3D 0= x40; >> > | ManufacturingFlag << $LFlags |=3D 0= x20; >> > | DefaultFlag << $LFlags |=3D 0= x10; >> >- | A:NVAccessFlag << >- if (mCompatibl= eMode) { >- $HFlags |=3D= 0x08; >- } else { >- gCVfrErrorHa= ndle.HandleWarning ( >- >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >- A->getLine= (), >- A->getText= () >- ); >- } >+ | A:NVAccessFlag << >+ gCVfrErrorHand= le.HandleWarning ( >+ >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >+ A->getLine()= , >+ A->getText() >+ ); > >> >- | L:LateCheckFlag << >- if (mCompatibl= eMode) { >- $HFlags |=3D= 0x20; >- } else { >- gCVfrErrorHa= ndle.HandleWarning ( >- >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >- L->getLine= (), >- L->getText= () >- ); >- } >+ | L:LateCheckFlag << >+ gCVfrErrorHand= le.HandleWarning ( >+ >VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE, >+ L->getLine()= , >+ L->getText() >+ ); > >> > ; > > vfrStatementLabel : > L:Label > N:Number << >- if (mCompatibl= eMode) { >- // >- // Add end L= abel for Framework Vfr >- // >- CIfrLabel LO= bj1; >- LObj1.SetLin= eNo(L->getLine()); >- LObj1.SetNum= ber (0xffff); //add end label for >UEFI, label number hardcode 0xffff >- } >- > { > CIfrLabel LO= bj2; > LObj2.SetLin= eNo(L->getLine()); > LObj2.SetNum= ber (_STOU16(N->getText(), N- >>getLine())); > } >@@ -3970,13 +3822,11 @@ vfrStatementBanner : > // > // keep some syntax for compatibility but not generate any IFR object > // > vfrStatementInvalidHidden : > L:Hidden << >- if (!mCompatibleMode) { >- _PCATCH (VFR_RETURN_UNSUPPORTED, L); >- } >+ _PCATCH (VFR_RETURN_UNSUPPORTED, L); > >> > Value "=3D" Number "," > Key "=3D" Number ";" > ; > >@@ -3989,13 +3839,11 @@ vfrStatementInvalidInconsistentIf : > ";" > ; > > vfrStatementInvalidInventory : > L:Inventory << >- if (!mCompatibleMo= de) { >- _PCATCH (VFR_RET= URN_UNSUPPORTED, L); >- } >+ _PCATCH (VFR_RETUR= N_UNSUPPORTED, L); > >> > Help "=3D" "STRING_TOKEN" "\(" Number "\)" "," > Text "=3D" "STRING_TOKEN" "\(" Number "\)" "," > { > Text "=3D" "STRING_TOKEN" "\(" Number "\)" >@@ -4004,19 +3852,15 @@ vfrStatementInvalidInventory : > ; > > vfrStatementInvalidSaveRestoreDefaults : > ( > L:Save << >- if (!mCompatibleMo= de) { >- _PCATCH (VFR_RET= URN_UNSUPPORTED, L); >- } >+ _PCATCH (VFR_RETUR= N_UNSUPPORTED, L); > >> > | > K:Restore << >- if (!mCompatibleMo= de) { >- _PCATCH (VFR_RET= URN_UNSUPPORTED, K); >- } >+ _PCATCH (VFR_RETUR= N_UNSUPPORTED, K); > >> > ) > Defaults "," > FormId "=3D" Number "," > Prompt "=3D" "STRING_TOKEN" "\(" Number "\)" "," >@@ -4317,13 +4161,11 @@ vareqvalExp [UINT32 & RootLevel, UINT32 & >ExpOpCount] : > UINT32 LineNo; > EFI_VFR_RETURN_CODE VfrReturnCode =3D VFR_RETURN_SUCCESS; > EFI_VARSTORE_ID VarStoreId =3D EFI_VARSTORE_ID_INVALID; > >> > L:VarEqVal << >- if (!mCompatible= Mode) { > _PCATCH (VFR_R= ETURN_UNSUPPORTED, L); >- } > >> > VK:Var > OpenParen > VN:Number << > VarIdStr =3D N= ULL; _STRCAT(&VarIdStr, VK- >>getText()); _STRCAT(&VarIdStr, VN->getText()); >@@ -4996,14 +4838,10 @@ private: > // Whether the question already has default value. > // > UINT16 mUsedDefaultArray[EFI_IFR_MAX_DEFAULT_TYPE]; > UINT16 mUsedDefaultCount; > >-// >-// For framework vfr compatibility >-// >- BOOLEAN mCompatibleMode; > EFI_GUID mFormsetGuid; > > VOID _CRT_OP (IN BOOLEAN); > > VOID _SAVE_CURRQEST_VARINFO (IN EFI_VARSTORE_INFO &); >-- >2.18.0.windows.1 > > >