From nobody Sat May 4 07:21:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40410+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40410+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557467073; cv=none; d=zoho.com; s=zohoarc; b=hwLT/2LIHXlmoSB48yLGEya7puaNsf8z4wnGwfuveStflQNO+f2p/2U2N+1H1o09Vae9xAUKvzz/Fd8bF9bslFSUXMtdxAOSaQFtCcrjHdIr5ozD9BDfepI5KP6x7yq1jDJtNM1ZPuDvEcEr+RpfLO6HAlw9k5+Qz10ep0i/V9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557467073; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=rkybstj63wVJlN45mhZIuigVaVyw3bFOPxyq2sLr7i4=; b=RzuZSx2e6Yd+e6vKoVHvHM1HoEJ+1BLHS1Em3fS3U6chjykUiSxSYCnHGragSxBEL15pWTub1MTcK1JTUrQ7Y2QVTWKD+Wr/Yu/WyCT+lWotY9Sul4kcF50+u/SvrApSRXmM89FasHf4J2H9X34Rss2JqgeM3bzpahLeqO8xXVc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40410+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557467073199239.01791322816132; Thu, 9 May 2019 22:44:33 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Thu, 09 May 2019 22:44:31 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2019 22:44:30 -0700 X-ExtLoop1: 1 X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga008.jf.intel.com with ESMTP; 09 May 2019 22:44:29 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [edk2-devel] [patch] BaseTools/VfrCompile: clean Framework Vfr support Date: Fri, 10 May 2019 13:44:23 +0800 Message-Id: <20190510054423.19900-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557467072; bh=8xbr8pPDSpuIFnwVyQfqUgsqUxoR8IQpoxwA9H+SdNM=; h=Cc:Date:From:Reply-To:Subject:To; b=KEolW9VqOpBKGSjMz2nMzedICT1GZH4HZP2y8NloTmeKVkO4TI99cbNUBbfKn+zhuCZ rzOJ0YlFEHSRGXwHwlgpASZC9psQ0OT8aJO3NIfjoH/FU73Pd5apfiF7/Jhfnw0BH5O8M ZDEBycKzCa25tpIbZiTYlO/vHict8GcPMNE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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; } =20 SET_LINE_INFO (*FSOb= j, L); FSObj->SetGuid (&Gui= d); - // - // for framework vfr= to store formset guid used by varstore and efivarstore - // - if (mCompatibleMode)= { - memcpy (&mFormsetG= uid, &Guid, sizeof (EFI_GUID)); - } FSObj->SetFormSetTit= le (_STOSID(S1->getText(), S1->getLine())); FSObj->SetHelp (_STO= SID(S2->getText(), S2->getLine())); >> { FC:Class "=3D" classDefinition[C] "," << {CIfrClass CObj;S= ET_LINE_INFO (CObj, FC); CObj.SetClass(C);} >> @@ -1004,16 +998,10 @@ vfrStatementVarStoreLinear : | U64:"UINT64" "," << TypeName =3D U64->g= etText(); LineNum =3D U64->getLine(); >> | D:"EFI_HII_DATE" "," << TypeName =3D D->get= Text(); LineNum =3D D->getLine(); >> | T:"EFI_HII_TIME" "," << TypeName =3D T->get= Text(); LineNum =3D T->getLine(); >> | R:"EFI_HII_REF" "," << TypeName =3D R->get= Text(); 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 (mCompatibleMode= ) { - VarStoreId =3D _S= TOU16(FID->getText(), FID->getLine()); - } - >> - } { VarId "=3D" ID:Number "," << _PCATCH( (INTN)(VarStoreId= =3D _STOU16(ID->getText(), ID->getLine())) !=3D 0, (INTN)TRUE, @@ -1023,15 +1011,12 @@ vfrStatementVarStoreLinear : >> } Name "=3D" SN:StringIdentifier "," Uuid "=3D" guidDefinition[Guid] << - if (mCompatibleMode= ) { - StoreName =3D Typ= eName; - } else { - StoreName =3D SN-= >getText(); - } + + StoreName =3D SN->g= etText(); _PCATCH(gCVfrDataSt= orage.DeclareBufferVarStore ( = StoreName, = &Guid, = &gCVfrVarDataTypeDB, = TypeName, @@ -1241,13 +1226,10 @@ vfrStatementDisableIfFormSet : ; =20 vfrStatementSuppressIfFormSet : << CIfrSuppressIf SIObj;>> L:SuppressIf << - if (mCompatible= Mode) { - _PCATCH (VFR_= RETURN_UNSUPPORTED, L); - } SIObj.SetLineNo= (L->getLine());=20 >> { FLAGS "=3D" flagsField ( "\|" flagsField )* "," } vfrStatementExpression[0] ";" vfrFormSetList @@ -1338,38 +1320,30 @@ vfrQuestionHeader[CIfrQuestionHeader & QHObj, EFI_Q= UESION_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 <<=20 - if (mCompatibleMode= ) { - $Flags |=3D 0x80; - } else { - gCVfrErrorHandle.= HandleWarning ( - VFR_WARNING_OB= SOLETED_FRAMEWORK_OPCODE, - O->getLine(), - O->getText() - ); - } + | O:OptionOnlyFlag << + gCVfrErrorHandle.Ha= ndleWarning ( + VFR_WARNING_OBSO= LETED_FRAMEWORK_OPCODE, + O->getLine(), + O->getText() + ); >> - | N:NVAccessFlag <<=20 - if (!mCompatibleMod= e) { - gCVfrErrorHandle= .HandleWarning ( - VFR_WARNING_OB= SOLETED_FRAMEWORK_OPCODE, - N->getLine(), - N->getText() - ); - } + | N:NVAccessFlag << + gCVfrErrorHandle.H= andleWarning ( + VFR_WARNING_OBSO= LETED_FRAMEWORK_OPCODE, + N->getLine(), + N->getText() + ); >> - | L:LateCheckFlag <<=20 - if (!mCompatibleMod= e) { - gCVfrErrorHandle= .HandleWarning ( - VFR_WARNING_OB= SOLETED_FRAMEWORK_OPCODE, - L->getLine(), - L->getText() - ); - } + | L:LateCheckFlag << + gCVfrErrorHandle.H= andleWarning ( + VFR_WARNING_OBSO= LETED_FRAMEWORK_OPCODE, + L->getLine(), + L->getText() + ); >> ; =20 vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN C= heckFlag =3D TRUE] : << @@ -1392,22 +1366,10 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&Q= uestVarIdStr, BOOLEAN CheckFl _STRCAT(&VarIdStr, = I1->getText()); _STRCAT(&VarIdStr, = "]"); >> << VfrReturnCode =3D g= CVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId); - if (mCompatibleMode= && VfrReturnCode =3D=3D VFR_RETURN_UNDEFINED) { - gCVfrDataStorage= .DeclareBufferVarStore ( - = SName, - = &mFormsetGuid, - = &gCVfrVarDataTypeDB, - = SName, - = EFI_VARSTORE_ID_INVALID, - = FALSE, - = FALSE - = ); - VfrReturnCode = =3D gCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId, &mFormsetGuid= ); - } if (CheckFlag || Vf= rReturnCode =3D=3D VFR_RETURN_SUCCESS) { _PCATCH(VfrReturn= Code, SN1); _PCATCH(gCVfrData= Storage.GetNameVarStoreInfo (&$Info, Idx), SN1); } =20 @@ -1417,21 +1379,10 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&Q= uestVarIdStr, BOOLEAN CheckFl | ( SN2:StringIdentifier << SName =3D SN2->getT= ext(); _STRCAT(&VarIdStr, SName); >> << VfrReturnCode =3D g= CVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId); - if (mCompatibleMode= && VfrReturnCode =3D=3D VFR_RETURN_UNDEFINED) { - gCVfrDataStorage= .DeclareBufferVarStore ( - = SName, - = &mFormsetGuid, - = &gCVfrVarDataTypeDB, - = SName, - = EFI_VARSTORE_ID_INVALID, - = FALSE - = ); - VfrReturnCode = =3D gCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId, &mFormsetGuid= ); - } if (CheckFlag || Vf= rReturnCode =3D=3D VFR_RETURN_SUCCESS) { _PCATCH(VfrReturn= Code, SN2); VarStoreType =3D = gCVfrDataStorage.GetVarStoreType ($Info.mVarStoreId); if (VarStoreType = =3D=3D EFI_VFR_VARSTORE_BUFFER || VarStoreType =3D=3D EFI_VFR_VARSTORE_BUFF= ER_BITS) { _PCATCH(gCVfrDa= taStorage.GetBufferVarStoreDataTypeName(Info.mVarStoreId, &TName), SN2); @@ -1449,11 +1400,10 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&Q= uestVarIdStr, BOOLEAN CheckFl >> SF:StringIdentifier << _STRCAT(&VarIdStr, = SF->getText()); _STRCAT(&VarStr, SF->getText()); >> { OpenBracket I2:Number CloseBracket << Idx =3D _STOU32(I2-= >getText(), I2->getLine()); - if (mCompatibleMode= ) Idx --; if (Idx > 0) { // // Idx =3D=3D 0, = [0] can be ignored. // Array[0] is sa= me to Array for unify the varid name to cover [0] // @@ -1531,11 +1481,10 @@ vfrQuestionDataFieldName [EFI_QUESTION_ID &QId, UIN= T32 &Mask, CHAR8 *&VarIdStr, >> SF:StringIdentifier << _STRCAT (&VarIdStr,= SF->getText()); >> { OpenBracket I2:Number CloseBracket << Idx =3D _STOU32(I2-= >getText(), I2->getLine()); - if (mCompatibleMode= ) Idx --; if (Idx > 0) { // // Idx =3D=3D 0, = [0] can be ignored. // Array[0] is sa= me to Array // @@ -1739,25 +1688,10 @@ vfrFormDefinition : vfrStatementExtension | vfrStatementModal | vfrStatementRefreshEvent ";" )* E:EndForm << - if (mCompatibleMode)= { - // - // Add Label for F= ramework Vfr - // - CIfrLabel LObj1; - LObj1.SetLineNo(E-= >getLine()); - LObj1.SetNumber (0= xffff); //add end label for UEFI, label number hardcode 0xffff - CIfrLabel LObj2; - LObj2.SetLineNo(E-= >getLine()); - LObj2.SetNumber (0= x0); //add dummy label for UEFI, label number hardcode 0x0 - CIfrLabel LObj3; - LObj3.SetLineNo(E-= >getLine()); - LObj3.SetNumber (0= xffff); //add end label for UEFI, label number hardcode 0xffff - } - {CIfrEnd EObj; EObj.= SetLineNo (E->getLine()); mLastFormEndAddr =3D EObj.GetObjBinAddr();= gAdjustOpcodeOffset =3D EObj.GetObjBinOffset ();} >> ";" ; =20 @@ -1999,17 +1933,15 @@ vfrStatementConditionalNew : vfrStatementGrayOutIfStatNew | vfrStatementInconsistentIfStat //to be compatible for framework ; =20 vfrStatementSuppressIfStat : - <>? vfrStatementSuppressIfStatOld - | vfrStatementSuppressIfStatNew + vfrStatementSuppressIfStatNew ; =20 vfrStatementGrayOutIfStat : - <>? vfrStatementGrayOutIfStatOld - | vfrStatementGrayOutIfStatNew + vfrStatementGrayOutIfStatNew ; =20 vfrStatementInvalid : ( vfrStatementInvalidHidden | @@ -2024,27 +1956,23 @@ flagsField : | InteractiveFlag=20 | ManufacturingFlag=20 | DefaultFlag=20 | ResetRequiredFlag=20 | ReconnectRequiredFlag - | N:NVAccessFlag <<=20 - if (!mCompatible= Mode) { - gCVfrErrorHand= le.HandleWarning ( - VFR_WARNING_= OBSOLETED_FRAMEWORK_OPCODE, - N->getLine(), - N->getText() - ); - } + | N:NVAccessFlag << + gCVfrErrorHandle= .HandleWarning ( + VFR_WARNING_OB= SOLETED_FRAMEWORK_OPCODE, + N->getLine(), + N->getText() + ); >> - | L:LateCheckFlag <<=20 - if (!mCompatible= Mode) { - gCVfrErrorHand= le.HandleWarning ( - VFR_WARNING_= OBSOLETED_FRAMEWORK_OPCODE, - L->getLine(), - L->getText() - ); - } + | L:LateCheckFlag << + gCVfrErrorHandle= .HandleWarning ( + VFR_WARNING_OB= SOLETED_FRAMEWORK_OPCODE, + L->getLine(), + L->getText() + ); >>=20 ; =20 vfrStatementValue : << CIfrValue VObj; >> @@ -2455,38 +2383,17 @@ vfrCheckBoxFlags [CIfrCheckBox & CBObj, UINT32 Line= Num] : << _PCATCH(CBObj.Se= tFlags (HFlags, LFlags), LineNum); >> ; =20 checkboxFlagsField[UINT8 & LFlags, UINT8 & HFlags] : N:Number << - if (mCompatibleM= ode) { - // - // set questio= n flag - // - $LFlags |=3D _= STOU8(N->getText(), N->getLine()); - } else { - _PCATCH(_STOU8= (N->getText(), N->getLine()) =3D=3D 0 ? VFR_RETURN_SUCCESS : VFR_RETURN_UNS= UPPORTED, N->getLine()); - } + _PCATCH(_STOU8(N= ->getText(), N->getLine()) =3D=3D 0 ? VFR_RETURN_SUCCESS : VFR_RETURN_UNSUP= PORTED, N->getLine()); >> | D:"DEFAULT" << - if (mCompatibleM= ode) { - // - // set questio= n Default flag - // - $LFlags |=3D 0= x01; - } else { - _PCATCH (VFR_R= ETURN_UNSUPPORTED, D); - } + _PCATCH (VFR_RET= URN_UNSUPPORTED, D); >> | M:"MANUFACTURING" << - if (mCompatibleM= ode) { - // - // set questio= n MFG flag - // - $LFlags |=3D 0= x02; - } else { - _PCATCH (VFR_R= ETURN_UNSUPPORTED, M); - } + _PCATCH (VFR_RET= URN_UNSUPPORTED, M); >> | "CHECKBOX_DEFAULT" << $LFlags |=3D 0x0= 1; >> | "CHECKBOX_DEFAULT_MFG" << $LFlags |=3D 0x0= 2; >> | questionheaderFlagsField[HFlags] ; @@ -3502,13 +3409,11 @@ vfrStatementDisableIfStat : ; =20 vfrStatementInconsistentIfStat : << CIfrInconsistentIf IIObj; >> L:InconsistentIf << - if (!mCompatible= Mode) { - _PCATCH (VFR_R= ETURN_UNSUPPORTED, L); - } + _PCATCH (VFR_RET= URN_UNSUPPORTED, L); IIObj.SetLineNo(= L->getLine()); >> Prompt "=3D" "STRING_TOKEN" "\(" S:Number "\)" "," << IIObj.SetError= (_STOSID(S->getText(), S->getLine())); >> { FLAGS "=3D" flagsField ( "\|" flagsField )* "," } vfrStatementExpression[0] @@ -3553,44 +3458,10 @@ vfrStatementGrayOutIfStatNew : ";" ( vfrStatementStatList )* E: EndIf ";" << CRT_END_OP (E); >> ; =20 -vfrStatementSuppressIfStatOld : - << - CIfrSuppressIf SIObj; - BOOLEAN GrayOutExist =3D FALSE; - >> - L:SuppressIf << SIObj.SetLineNo(L-= >getLine()); >> - { FLAGS "=3D" flagsField ( "\|" flagsField )* "," } - vfrStatementExpression[0] - ";" - { - vfrStatementsuppressIfGrayOutIf - << GrayOutExist =3D T= RUE; >> - } - ( vfrStatementStatListOld )* - E: EndIf ";" << if (GrayOutExist) = CRT_END_OP (E); CRT_END_OP (E);>> - ; - -vfrStatementGrayOutIfStatOld : - << - CIfrGrayOutIf GOIObj; - BOOLEAN SuppressExist =3D FALSE; - >> - L:GrayOutIf << GOIObj.SetLineNo= (L->getLine()); >> - { FLAGS "=3D" flagsField ( "\|" flagsField )* "," } - vfrStatementExpression[0] - ";" - { - vfrStatementgrayoutIfSuppressIf - << SuppressExist = =3D TRUE; >> - } - ( vfrStatementStatListOld )* - E: EndIf ";" << if (SuppressExis= t) CRT_END_OP (E); CRT_END_OP (E); >> - ; - vfrImageTag : << CIfrImage IObj; >> L:Image "=3D" "IMAGE_TOKEN" "\(" S1:Number "\)" << IObj.SetImageI= d (_STOSID(S1->getText(), S1->getLine())); IObj.SetLineNo(L->getLine()); >> ; =20 @@ -3859,13 +3730,11 @@ vfrStatementOneOfOption : } } >> { "," Key "=3D" KN:Number << - if (!mCompatibleM= ode) { - _PCATCH (VFR_RE= TURN_UNSUPPORTED, KN); - } + _PCATCH (VFR_RETU= RN_UNSUPPORTED, KN); // // Guid Option Key // CIfrOptionKey Ifr= OptionKey ( g= CurrentQuestion->QUESTION_ID(), @@ -3898,46 +3767,29 @@ oneofoptionFlagsField [UINT8 & HFlags, UINT8 & LFla= gs] : | InteractiveFlag << $HFlags |=3D 0x0= 4; >> | ResetRequiredFlag << $HFlags |=3D 0x1= 0; >> | ReconnectRequiredFlag << $HFlags |=3D 0x4= 0; >> | ManufacturingFlag << $LFlags |=3D 0x2= 0; >> | DefaultFlag << $LFlags |=3D 0x1= 0; >> - | A:NVAccessFlag <<=20 - if (mCompatibleM= ode) { - $HFlags |=3D 0= x08; - } else { - gCVfrErrorHand= le.HandleWarning ( - VFR_WARNING_= OBSOLETED_FRAMEWORK_OPCODE, - A->getLine(), - A->getText() - ); - } + | A:NVAccessFlag << + gCVfrErrorHandle= .HandleWarning ( + VFR_WARNING_OB= SOLETED_FRAMEWORK_OPCODE, + A->getLine(), + A->getText() + ); >> - | L:LateCheckFlag <<=20 - if (mCompatibleM= ode) { - $HFlags |=3D 0= x20; - } else { - gCVfrErrorHand= le.HandleWarning ( - VFR_WARNING_= OBSOLETED_FRAMEWORK_OPCODE, - L->getLine(), - L->getText() - ); - } + | L:LateCheckFlag << + gCVfrErrorHandle= .HandleWarning ( + VFR_WARNING_OB= SOLETED_FRAMEWORK_OPCODE, + L->getLine(), + L->getText() + ); >> ; =20 vfrStatementLabel : L:Label N:Number << - if (mCompatibleM= ode) { - // - // Add end Lab= el for Framework Vfr - // - CIfrLabel LObj= 1; - LObj1.SetLineN= o(L->getLine()); - LObj1.SetNumbe= r (0xffff); //add end label for UEFI, label number hardcode 0xffff - } - { CIfrLabel LObj= 2; LObj2.SetLineN= o(L->getLine()); LObj2.SetNumbe= r (_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 ";" ; =20 @@ -3989,13 +3839,11 @@ vfrStatementInvalidInconsistentIf : ";" ; =20 vfrStatementInvalidInventory : L:Inventory << - if (!mCompatibleMode= ) { - _PCATCH (VFR_RETUR= N_UNSUPPORTED, L); - } + _PCATCH (VFR_RETURN_= UNSUPPORTED, L); >> Help "=3D" "STRING_TOKEN" "\(" Number "\)" "," Text "=3D" "STRING_TOKEN" "\(" Number "\)" "," { Text "=3D" "STRING_TOKEN" "\(" Number "\)" @@ -4004,19 +3852,15 @@ vfrStatementInvalidInventory : ; =20 vfrStatementInvalidSaveRestoreDefaults : ( L:Save << - if (!mCompatibleMode= ) { - _PCATCH (VFR_RETUR= N_UNSUPPORTED, L); - } + _PCATCH (VFR_RETURN_= UNSUPPORTED, L); >> | K:Restore << - if (!mCompatibleMode= ) { - _PCATCH (VFR_RETUR= N_UNSUPPORTED, K); - } + _PCATCH (VFR_RETURN_= UNSUPPORTED, K); >> ) Defaults "," FormId "=3D" Number "," Prompt "=3D" "STRING_TOKEN" "\(" Number "\)" "," @@ -4317,13 +4161,11 @@ vareqvalExp [UINT32 & RootLevel, UINT32 & ExpOpCoun= t] : UINT32 LineNo; EFI_VFR_RETURN_CODE VfrReturnCode =3D VFR_RETURN_SUCCESS; EFI_VARSTORE_ID VarStoreId =3D EFI_VARSTORE_ID_INVALID; >> L:VarEqVal << - if (!mCompatibleMo= de) { _PCATCH (VFR_RET= URN_UNSUPPORTED, L); - } >> VK:Var OpenParen VN:Number << VarIdStr =3D NUL= L; _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; =20 -// -// For framework vfr compatibility -// - BOOLEAN mCompatibleMode; EFI_GUID mFormsetGuid; =20 VOID _CRT_OP (IN BOOLEAN); =20 VOID _SAVE_CURRQEST_VARINFO (IN EFI_VARSTORE_INFO &); --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40410): https://edk2.groups.io/g/devel/message/40410 Mute This Topic: https://groups.io/mt/31573980/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-