From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web09.5182.1604883678890287578 for ; Sun, 08 Nov 2020 17:01:20 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Mon, 09 Nov 2020 09:01:10 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: , Cc: "'Bob Feng'" , "'Yuwei Chen'" , "'Wang, Nickle \(HPS SW\)'" References: <20201103024100.7733-1-abner.chang@hpe.com> <20201103024100.7733-3-abner.chang@hpe.com> <004601d6b269$d1605570$74210050$@byosoft.com.cn> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1ZGUiBzdXBwb3J0IFJFU1RfU1RZTEUgUEFUQ0ggdjIgMi8zXSBCYXNlVG9vbHMvVmZyQ29tcGlsZTogVkZSIGNvbXBpbGVyIHN1cHBvcnRzIFJFU1RfU1RZTEUgaW4gSElJIG9wdGlvbg==?= Date: Mon, 9 Nov 2020 09:01:15 +0800 Message-ID: <003f01d6b633$d348a8b0$79d9fa10$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQLMezy9co9qx/jLeyRE1n7i5wJI/AJ9fe3nAplHfMkB9LrUNKebFPqA Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Abner: Also send the patch to edk2 mail list for the change in VFR spec.=20 Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: bounce+27952+67081+4905953+8761045@groups.io > =B4=FA=B1=ED Abner Chang > =B7=A2=CB=CD=CA=B1=BC=E4: 2020=C4=EA11=D4=C26=C8=D5 15:09 > =CA=D5=BC=FE=C8=CB: gaoliming ; devel@edk2.gro= ups.io > =B3=AD=CB=CD: 'Bob Feng' ; 'Yuwei Chen' > ; Wang, Nickle (HPS SW) > =D6=F7=CC=E2: Re: [edk2-devel] [VFR support REST_STYLE PATCH v2 2/3] > BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option >=20 >=20 >=20 > > -----Original Message----- > > From: gaoliming [mailto:gaoliming@byosoft.com.cn] > > Sent: Wednesday, November 4, 2020 1:18 PM > > To: devel@edk2.groups.io; Chang, Abner (HPS SW/FW Technologist) > > > > Cc: 'Bob Feng' ; 'Yuwei Chen' > > ; Wang, Nickle (HPS SW) > > Subject: =BB=D8=B8=B4: [edk2-devel] [VFR support REST_STYLE PATCH v2 2= /3] > > BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option > > > > Anber: > > This patch set is related to BZ > > INVALID URI REMOVED > > 3A__bugzilla.tianocore.org_show-5Fbug.cgi-3Fid- > > > 3D2916&d=3DDwIFbw&c=3DC5b8zRQO1miGmBeVZ2LFWg&r=3D_SN6FZBN4Vgi4Ulk > s > > > kz6qU3NYRO03nHp9P7Z5q59A3E&m=3DRhXI_8zZpu44C2PjRLMwse05Y7MB8xy > > > QQKdX1wW9akk&s=3D5QKMzaPNf9J7qWrRj5Of2TA8g2ZwdxmQtj8QPn0xaXc& > > e=3D . Please include BZ in the commit message. > > With this change, Reviewed-by: Liming Gao > > > > Besides, please also submit the patch to update VFR spec > > https://github.com/tianocore-docs/edk2-VfrSpecification >=20 > Hi Liming, > The patch for VFR spec change should be sent to mailing list or just create a > PR on Github? > Thanks >=20 > Abner >=20 > > > > Thanks > > Liming > > > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > > > =B7=A2=BC=FE=C8=CB: bounce+27952+66901+4905953+8761045@groups.io > > > =B4=FA=B1=ED Abner > Chang > > > =B7=A2=CB=CD=CA=B1=BC=E4: 2020=C4=EA11=D4=C23=C8=D5 10:41 > > > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io > > > =B3=AD=CB=CD: Bob Feng ; Liming Gao > > > ; Yuwei Chen ; > > Nickle > > > Wang > > > =D6=F7=CC=E2: [edk2-devel] [VFR support REST_STYLE PATCH v2 2/3] > > > BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option > > > > > > Add REST_STYLE support on VFR language > > > > > > Signed-off-by: Wu Jiaxin > > > Signed-off-by: Ye Ting > > > Signed-off-by: Fu Siyuan > > > Signed-off-by: Wang Fan > > > > > > Cc: Bob Feng > > > Cc: Liming Gao > > > Cc: Yuwei Chen > > > Cc: Nickle Wang > > > --- > > > BaseTools/Source/C/VfrCompile/VfrSyntax.g | 25 > > > ++++++++++++++++++++--- > > > 1 file changed, 22 insertions(+), 3 deletions(-) > > > > > > diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g > > > b/BaseTools/Source/C/VfrCompile/VfrSyntax.g > > > index 127cb8b2b2..3f896c6f1a 100644 > > > --- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g > > > +++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g > > > @@ -192,6 +192,7 @@ VfrParserStart ( > > > #token LateCheckFlag("LATE_CHECK") "LATE_CHECK" > > > #token ReadOnlyFlag("READ_ONLY") "READ_ONLY" > > > #token OptionOnlyFlag("OPTIONS_ONLY") > "OPTIONS_ONLY" > > > +#token RestStyleFlag("REST_STYLE") "REST_STYLE" > > > #token Class("class") "class" > > > #token Subclass("subclass") "subclass" > > > #token ClassGuid("classguid") "classguid" > > > @@ -584,7 +585,7 @@ vfrFormSetDefinition : > > > << > > > EFI_GUID Guid; > > > EFI_GUID DefaultClassGuid =3D > > > EFI_HII_PLATFORM_SETUP_FORMSET_GUID; > > > - EFI_GUID ClassGuid1, ClassGuid2, ClassGuid3; > > > + EFI_GUID ClassGuid1, ClassGuid2, ClassGuid3, ClassGuid4; > > > UINT8 ClassGuidNum =3D 0; > > > CIfrFormSet *FSObj =3D NULL; > > > UINT16 C, SC; > > > @@ -600,13 +601,16 @@ vfrFormSetDefinition : > > > "\|" guidDefinition[ClassGuid2] << > > > ++ClassGuidNum; >> > > > { > > > "\|" guidDefinition[ClassGuid3] << > > > ++ClassGuidNum; >> > > > + { > > > + "\|" guidDefinition[ClassGuid4] << > > > ++ClassGuidNum; >> > > > + } > > > } > > > } > > > "," > > > } > > > << > > > - if > > > (mOverrideClassGuid !=3D NULL && ClassGuidNum >=3D 3) { > > > - > > > _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Already has > > 3 > > > class guids, can't add extra class guid!"); > > > + if > > > (mOverrideClassGuid !=3D NULL && ClassGuidNum >=3D 4) { > > > + > > > _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Already has > > 4 > > > class guids, can't add extra class guid!"); > > > } > > > > switch > > > (ClassGuidNum) { > > > case > 0: > > > @@ -643,10 +647,23 @@ vfrFormSetDefinition : > > > } > > > > break; > > > case > 3: > > > + if > > > (mOverrideClassGuid !=3D NULL) { > > > + > > > ClassGuidNum ++; > > > + } > > > + > FSObj > > > =3D new CIfrFormSet(sizeof(EFI_IFR_FORM_SET) + ClassGuidNum * > > > sizeof(EFI_GUID)); > > > + > > > FSObj->SetClassGuid(&ClassGuid1); > > > + > > > FSObj->SetClassGuid(&ClassGuid2); > > > + > > > FSObj->SetClassGuid(&ClassGuid3); > > > + if > > > (mOverrideClassGuid !=3D NULL) { > > > + > > > FSObj->SetClassGuid(mOverrideClassGuid); > > > + } > > > + > break; > > > + case > 4: > > > > FSObj =3D new > > > CIfrFormSet(sizeof(EFI_IFR_FORM_SET) + ClassGuidNum * > > > sizeof(EFI_GUID)); > > > > > > FSObj->SetClassGuid(&ClassGuid1); > > > > > > FSObj->SetClassGuid(&ClassGuid2); > > > > > > FSObj->SetClassGuid(&ClassGuid3); > > > + > > > FSObj->SetClassGuid(&ClassGuid4); > > > > break; > > > > default: > > > > break; @@ > > > -1321,6 +1338,7 @@ questionheaderFlagsField[UINT8 & Flags] : > > > ReadOnlyFlag << > $Flags |=3D > > > 0x01; >> > > > | InteractiveFlag << $Flags > |=3D > > > 0x04; >> > > > | ResetRequiredFlag << $Flags > |=3D > > > 0x10; >> > > > + | RestStyleFlag << $Flags > |=3D > > > 0x20; >> > > > | ReconnectRequiredFlag << $Flags > |=3D > > > 0x40; >> > > > | O:OptionOnlyFlag << > > > > > > gCVfrErrorHandle.HandleWarning ( > > > @@ -3766,6 +3784,7 @@ oneofoptionFlagsField [UINT8 & HFlags, UINT8 > & > > > LFlags] : > > > | "OPTION_DEFAULT_MFG" << > > > $LFlags |=3D 0x20; >> > > > | InteractiveFlag << > $HFlags > > > |=3D 0x04; >> > > > | ResetRequiredFlag << > $HFlags > > > |=3D 0x10; >> > > > + | RestStyleFlag << > $HFlags > > > |=3D 0x20; >> > > > | ReconnectRequiredFlag << > $HFlags > > > |=3D 0x40; >> > > > | ManufacturingFlag << > $LFlags > > > |=3D 0x20; >> > > > | DefaultFlag << > $LFlags > > > |=3D 0x10; >> > > > -- > > > 2.17.1 > > > > > > > > > > > > > > > > > > > >=20 >=20 >=20 >=20 >=20