From nobody Sun May 5 05:35:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+66970+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+66970+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604474576; cv=none; d=zohomail.com; s=zohoarc; b=EfcH7GYBydIO76kuueMZ3tGq4sT2flI/1C9HFFrFT0WJhB2ArGIv2ydH/9b2pUo+Lt4FHgHIpiG4rQRWRHwtW7b+0IgiXIzZh0Hfr3jyaxJXoAHxBBx/ANlnfh5aJSBVleH5ATH++jsyNlbgRtWevNbdfbtpHujSY7FTPpbP8gI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604474576; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=rm4M8Dcbg6owVvxyC7mBbQPeuggwQ/Np/lAAl7T0Kpw=; b=dRk9UlFb+FlMR+rxJ2r0QgqBkOANUmQU3iZGl0cBkMv7Oxt5sjJVykDFBXIovhti9NyOVGslj7J1FN2xEQUifekmU2FrhPRUjtxKQYZ6A9i6ytJJHfKvR3loov0UDJCSLLMy39azoHE4/PL1rgjq+4WWpeX5djfRleKNczrddzQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+66970+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604474576991957.9986780551764; Tue, 3 Nov 2020 23:22:56 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Dec8YY1788612xNyVvC4lg2c; Tue, 03 Nov 2020 23:22:54 -0800 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web12.9920.1604474573974776068 for ; Tue, 03 Nov 2020 23:22:54 -0800 X-Received: from pps.filterd (m0134424.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A47Goj0026985; Wed, 4 Nov 2020 07:21:34 GMT X-Received: from g4t3427.houston.hpe.com (g4t3427.houston.hpe.com [15.241.140.73]) by mx0b-002e3701.pphosted.com with ESMTP id 34kc8ems12-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 07:21:33 +0000 X-Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g4t3427.houston.hpe.com (Postfix) with ESMTP id 971625C; Wed, 4 Nov 2020 07:21:33 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 41B404E; Wed, 4 Nov 2020 07:21:32 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Zhiguang Liu , Nickle Wang Subject: [edk2-devel] [VFR support REST_STYLE PATCH v3 1/4] MdePkg: Add GUID for REST Style Formset Date: Wed, 4 Nov 2020 14:35:54 +0800 Message-Id: <20201104063557.22857-2-abner.chang@hpe.com> In-Reply-To: <20201104063557.22857-1-abner.chang@hpe.com> References: <20201104063557.22857-1-abner.chang@hpe.com> X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,abner.chang@hpe.com X-Gm-Message-State: bvedG4dVSYjDCuNbaWSKwKg8x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604474574; bh=uKdz+NW5yG74rRb27Hiv6Bs8mxgcJIpncFCbkx8kxXA=; h=Cc:Date:From:Reply-To:Subject:To; b=v7sRYv9E4kC62eWiPIue+NVy0a3CXpI6wgy8xStUudGsPnwFT/w1LH4dX2g2dqVi/I4 coYoAnZq7hnbQkM2lR40bi2Teei1EIxIaIlWS8ykDnoalq7YZ2Avgb1Q7iKgWterIUmdQ UDL9qb8o86cXRkWge8tAONDoN8PgC7sY0z0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" BZ: 2916 https://bugzilla.tianocore.org/show_bug.cgi?id=3D2916 Signed-off-by: Wu Jiaxin Signed-off-by: Ye Ting Signed-off-by: Fu Siyuan Signed-off-by: Wang Fan Signed-off-by: Abner Chang Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Nickle Wang Reviewed-by: Liming Gao --- MdePkg/MdePkg.dec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 645f61b80e..3928db65d1 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -669,7 +669,7 @@ gEfiJsonCapsuleIdGuid =3D { 0x67d6f4cd, 0xd6b8, 0x4573, { 0xb= f, 0x4a, 0xde, 0x5e, 0x25, 0x2d, 0x61, 0xae }} =20 ## Include/Guid/HiiPlatformSetupFormset.h - gEfiHiiResetStyleFormsetGuid =3D { 0x790217bd, 0xbecf, 0x485b, { 0x9= 1, 0x70, 0x5f, 0xf7, 0x11, 0x31, 0x8b, 0x27 }} + gEfiHiiRestStyleFormsetGuid =3D { 0x790217bd, 0xbecf, 0x485b, { 0x9= 1, 0x70, 0x5f, 0xf7, 0x11, 0x31, 0x8b, 0x27 }} =20 # GUIDs defined in UEFI2.8a # --=20 2.17.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 (#66970): https://edk2.groups.io/g/devel/message/66970 Mute This Topic: https://groups.io/mt/78024501/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- From nobody Sun May 5 05:35:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+66969+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+66969+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604474503; cv=none; d=zohomail.com; s=zohoarc; b=T5bpQYvGcpq8zPlM2HwDVVvYelneKMwy310fLOtJbSERo+/Rtap8u4us2+z6AoyDYO9ww8QPQyvlWuirPBcGoQVJ2tZECjha3aqW9dsUGRJeoewyWdfjTpAys8YtBeGejULdEPBhg6DPblXCZkdTY/oiuF30eNCEo1z3HGXfMP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604474503; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=7oGFDLbHChZ/SR0VhS2TxwCckiDlzM05q8M7QBBWkfs=; b=gHFsNKZHmWKft1aXyjyimwjCxBkFvKp+c3BV+pJo9HKjHSFNQaMJzHxG7b7ZWemER0wi+Ab9qHW0Jl+gDSQ0ClXBA7U32l2ExunjxKxrWKxTeExqey8liu0udmP9BONAsLECPxTu5B4h3azt1QQlvznK9BMn1/5JGXcWMtsLQ1k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+66969+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604474503437148.8897165886416; Tue, 3 Nov 2020 23:21:43 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Ma8SYY1788612xlrLsEJk85A; Tue, 03 Nov 2020 23:21:43 -0800 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web08.9803.1604474502600714598 for ; Tue, 03 Nov 2020 23:21:42 -0800 X-Received: from pps.filterd (m0150242.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A47I74m017562; Wed, 4 Nov 2020 07:21:36 GMT X-Received: from g4t3425.houston.hpe.com (g4t3425.houston.hpe.com [15.241.140.78]) by mx0a-002e3701.pphosted.com with ESMTP id 34kc7umtan-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 07:21:36 +0000 X-Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g4t3425.houston.hpe.com (Postfix) with ESMTP id 46F5E92; Wed, 4 Nov 2020 07:21:35 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id ED24C48; Wed, 4 Nov 2020 07:21:33 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Yuwei Chen , Nickle Wang Subject: [edk2-devel] [VFR support REST_STYLE PATCH v3 2/4] BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option Date: Wed, 4 Nov 2020 14:35:55 +0800 Message-Id: <20201104063557.22857-3-abner.chang@hpe.com> In-Reply-To: <20201104063557.22857-1-abner.chang@hpe.com> References: <20201104063557.22857-1-abner.chang@hpe.com> X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,abner.chang@hpe.com X-Gm-Message-State: QISQvXIbRRuakav0Niep1gIkx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604474503; bh=i+lb168Wu9WYFAy1Rrgxsh2OP6zfZIa9lJvSd4TFSTY=; h=Cc:Date:From:Reply-To:Subject:To; b=HgMlqb5WmRY1RFfon8aUv+lIYCJs8ural7v8eGA1UoNIeBuwBXQq2H7RefHqEK8L9vf tN0IroZXM5dVYe6ctKNbsnCtMwMkKkox1COwRcXSQSWlfqfeJBNixB0CSeDj/8nT+GM3R rIGAYBuvsx1UvbA7rwPMOxqcIiCbPfefI70= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add REST_STYLE support on VFR language BZ: 2916 https://bugzilla.tianocore.org/show_bug.cgi?id=3D2916 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 Reviewed-by: Liming Gao --- 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] << ++ClassGuidNu= m; >> + } } } "," } << - if (mOverrideClassGu= id !=3D NULL && ClassGuidNum >=3D 3) { - _PCATCH (VFR_RETUR= N_INVALID_PARAMETER, L->getLine(), "Already has 3 class guids, can't add ex= tra class guid!"); + if (mOverrideClassGu= id !=3D NULL && ClassGuidNum >=3D 4) { + _PCATCH (VFR_RETUR= N_INVALID_PARAMETER, L->getLine(), "Already has 4 class guids, can't add ex= tra class guid!"); } switch (ClassGuidNum= ) { case 0: @@ -643,10 +647,23 @@ vfrFormSetDefinition : } break; case 3: + if (mOverrideClass= Guid !=3D NULL) { + ClassGuidNum ++; + } + FSObj =3D new CIfr= FormSet(sizeof(EFI_IFR_FORM_SET) + ClassGuidNum * sizeof(EFI_GUID)); + FSObj->SetClassGui= d(&ClassGuid1); + FSObj->SetClassGui= d(&ClassGuid2); + FSObj->SetClassGui= d(&ClassGuid3); + if (mOverrideClass= Guid !=3D NULL) { + FSObj->SetClassG= uid(mOverrideClassGuid); + } + break; + case 4: FSObj =3D new CIfr= FormSet(sizeof(EFI_IFR_FORM_SET) + ClassGuidNum * sizeof(EFI_GUID)); FSObj->SetClassGui= d(&ClassGuid1); FSObj->SetClassGui= d(&ClassGuid2); FSObj->SetClassGui= d(&ClassGuid3); + FSObj->SetClassGui= d(&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.Ha= ndleWarning ( @@ -3766,6 +3784,7 @@ oneofoptionFlagsField [UINT8 & HFlags, UINT8 & LFlags= ] : | "OPTION_DEFAULT_MFG" << $LFlags |=3D 0x2= 0; >> | InteractiveFlag << $HFlags |=3D 0x0= 4; >> | ResetRequiredFlag << $HFlags |=3D 0x1= 0; >> + | RestStyleFlag << $HFlags |=3D 0x2= 0; >> | ReconnectRequiredFlag << $HFlags |=3D 0x4= 0; >> | ManufacturingFlag << $LFlags |=3D 0x2= 0; >> | DefaultFlag << $LFlags |=3D 0x1= 0; >> --=20 2.17.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 (#66969): https://edk2.groups.io/g/devel/message/66969 Mute This Topic: https://groups.io/mt/78024491/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- From nobody Sun May 5 05:35:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+66966+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+66966+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604474503; cv=none; d=zohomail.com; s=zohoarc; b=PVmeQiz98ihiQR0jfe51VJXKGgAjvq26HVulknnbT7hVlrLWqsvhpgFtG12aPKZLVxhr5D4EOOZSYyD3TRLtPdL62rM1zs+U86QEzCPBny1phPTKxLJWvKqhH8IW9hTxKf995YKBrS3aZOoJCBCJ2Fxkx8/YrR54AOA0T2M9Vhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604474503; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=+V7d+9QlZze6zYYOE4fCrJmZNu/lYHVJVnBG0US35Sg=; b=XUvx6phFS/LLl+2pZNAsmDTE+i2VIOdLPR8YpOdlsvsTKJsV2pn+ulee2IjC4470ikpXrZe8/w5KHjhUlIghROmkbCEjvzn+v7zR8wZA1CAnoOozaEwR1h2dfj04CVTeaF1oXwt6q+Nd2mmCtwGvM27br+XGf91AScwa5/wIzXw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+66966+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604474503860154.88029323593628; Tue, 3 Nov 2020 23:21:43 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ugvgYY1788612xY1b7GrNzSk; Tue, 03 Nov 2020 23:21:43 -0800 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web12.9910.1604474497562938673 for ; Tue, 03 Nov 2020 23:21:37 -0800 X-Received: from pps.filterd (m0150244.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A47EAsK030355 for ; Wed, 4 Nov 2020 07:21:36 GMT X-Received: from g9t5008.houston.hpe.com (g9t5008.houston.hpe.com [15.241.48.72]) by mx0b-002e3701.pphosted.com with ESMTP id 34kc85myhs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 04 Nov 2020 07:21:36 +0000 X-Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g9t5008.houston.hpe.com (Postfix) with ESMTP id 3BCAE53 for ; Wed, 4 Nov 2020 07:21:36 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 9BC5B48 for ; Wed, 4 Nov 2020 07:21:35 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Subject: [edk2-devel] [VFR support REST_STYLE PATCH v3 3/4] MdeModulePkg/Library: Revise HiiLib to support REST_STYLE Date: Wed, 4 Nov 2020 14:35:56 +0800 Message-Id: <20201104063557.22857-4-abner.chang@hpe.com> In-Reply-To: <20201104063557.22857-1-abner.chang@hpe.com> References: <20201104063557.22857-1-abner.chang@hpe.com> X-HPE-SCL: -1 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,abner.chang@hpe.com X-Gm-Message-State: VOW6GMZyI6mAu7RV6xkP1n47x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604474503; bh=2fBCAMIHSqRx2J25SKZrMV81aDfWiuLykntNRzqhVoY=; h=Date:From:Reply-To:Subject:To; b=Q3hWQ4KU/OX5/pltZBzZI4j3c8Luhu2ZRCO/DH+doBMVRxwfBHjV2NSIPzeTDYFWwlf a66w4Q4E4vYXuVNEqxCL+mlBXhWv1cnN/qDQWnsvzehbcTn6nYsop0UM5NNSWryCCJz82 rO2sBit9Ee1jWTccYFHZkkvdUqvT95LYlvk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add REST_STYLE support Signed-off-by: Jiaxin Wu Signed-off-by: Ting Ye Signed-off-by: Siyuan Fu Signed-off-by: Fan Wang Signed-off-by: Abner Chang --- MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Librar= y/UefiHiiLib/HiiLib.c index 564169bc14..57602828fe 100644 --- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c @@ -3605,7 +3605,7 @@ HiiCreateCheckBoxOpCode ( EFI_IFR_CHECKBOX OpCode; UINTN Position; =20 - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED))) =3D=3D 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) =3D=3D 0); =20 ZeroMem (&OpCode, sizeof (OpCode)); OpCode.Question.QuestionId =3D QuestionId; @@ -3674,7 +3674,7 @@ HiiCreateNumericOpCode ( UINTN Position; UINTN Length; =20 - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED))) =3D=3D 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) =3D=3D 0); =20 Length =3D 0; ZeroMem (&OpCode, sizeof (OpCode)); @@ -3773,7 +3773,7 @@ HiiCreateStringOpCode ( EFI_IFR_STRING OpCode; UINTN Position; =20 - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED))) =3D=3D 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) =3D=3D 0); =20 ZeroMem (&OpCode, sizeof (OpCode)); OpCode.Question.Header.Prompt =3D Prompt; @@ -3841,7 +3841,7 @@ HiiCreateOneOfOpCode ( UINTN Length; =20 ASSERT (OptionsOpCodeHandle !=3D NULL); - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) =3D=3D 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE | EFI_IFR_FLAG_O= PTIONS_ONLY))) =3D=3D 0); =20 ZeroMem (&OpCode, sizeof (OpCode)); OpCode.Question.Header.Prompt =3D Prompt; @@ -3912,7 +3912,7 @@ HiiCreateOrderedListOpCode ( UINTN Position; =20 ASSERT (OptionsOpCodeHandle !=3D NULL); - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_OPTIONS_ONLY))) =3D=3D 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE | EFI_IFR_FLAG_O= PTIONS_ONLY))) =3D=3D 0); =20 ZeroMem (&OpCode, sizeof (OpCode)); OpCode.Question.Header.Prompt =3D Prompt; @@ -4009,7 +4009,7 @@ HiiCreateDateOpCode ( EFI_IFR_DATE OpCode; UINTN Position; =20 - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED))) =3D=3D 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) =3D=3D 0); ASSERT ((DateFlags & (~(EFI_QF_DATE_YEAR_SUPPRESS | EFI_QF_DATE_MONTH_SU= PPRESS | EFI_QF_DATE_DAY_SUPPRESS | EFI_QF_DATE_STORAGE))) =3D=3D 0); =20 ZeroMem (&OpCode, sizeof (OpCode)); @@ -4074,7 +4074,7 @@ HiiCreateTimeOpCode ( EFI_IFR_TIME OpCode; UINTN Position; =20 - ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED))) =3D=3D 0); + ASSERT ((QuestionFlags & (~(EFI_IFR_FLAG_READ_ONLY | EFI_IFR_FLAG_CALLBA= CK | EFI_IFR_FLAG_RESET_REQUIRED | EFI_IFR_FLAG_REST_STYLE))) =3D=3D 0); ASSERT ((TimeFlags & (~(QF_TIME_HOUR_SUPPRESS | QF_TIME_MINUTE_SUPPRESS = | QF_TIME_SECOND_SUPPRESS | QF_TIME_STORAGE))) =3D=3D 0); =20 ZeroMem (&OpCode, sizeof (OpCode)); --=20 2.17.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 (#66966): https://edk2.groups.io/g/devel/message/66966 Mute This Topic: https://groups.io/mt/78024488/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- From nobody Sun May 5 05:35:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+66967+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+66967+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604474505; cv=none; d=zohomail.com; s=zohoarc; b=TuABup9Xtzb5cImM4qOI312FTVxpCiBxkA7eDYn9tZgO+jiBB8/LYaF7UiXycsmghdFaKlM0fo1OjecNMC7dl5ugVciKPLAhBfSnBiiAgcum7vuRECrUKOvPn+9M0MWGAISSDGCQ4OCBE8kg77yB+f6vsM6l79tSOXh9lMwzX0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604474505; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=8RZm+hkqZ/TTEDj6ZFw6LqMKEpauV0878tJ4HawDhXU=; b=XScM+Qkac+Oc+t7qDg9rsvb4m5DM59m3wwBnvZgAdz3J7Npp4s4PSrNR3BoJwbFyU3iVBgxWx7yIO84Er7yxr7KCW7A404ui4q/fH8VsNuYSO9w1S268eYLUbrtwp4Reo8W5+BLbZqyHAB8gFWYXYlEt25NGrNJVv1ytF8n6tsM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+66967+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604474505488799.2404332469687; Tue, 3 Nov 2020 23:21:45 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id vsU2YY1788612xqy8dfbBdVU; Tue, 03 Nov 2020 23:21:45 -0800 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web12.9911.1604474499669714819 for ; Tue, 03 Nov 2020 23:21:39 -0800 X-Received: from pps.filterd (m0150244.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A47DZH5028030; Wed, 4 Nov 2020 07:21:39 GMT X-Received: from g4t3427.houston.hpe.com (g4t3427.houston.hpe.com [15.241.140.73]) by mx0b-002e3701.pphosted.com with ESMTP id 34kc85myj1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 04 Nov 2020 07:21:38 +0000 X-Received: from g9t2301.houston.hpecorp.net (g9t2301.houston.hpecorp.net [16.220.97.129]) by g4t3427.houston.hpe.com (Postfix) with ESMTP id 612B06C; Wed, 4 Nov 2020 07:21:38 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g9t2301.houston.hpecorp.net (Postfix) with ESMTP id 85D7F4B; Wed, 4 Nov 2020 07:21:36 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Jiaxin Wu , Siyuan Fu , Fan Wang , Jiewen Yao , Dandan Bi , Eric Dong , Nickle Wang Subject: [edk2-devel] [VFR support REST_STYLE PATCH v3 4/4] MdeModulePkg/DriverSampleDxe: Add HII sample options Date: Wed, 4 Nov 2020 14:35:57 +0800 Message-Id: <20201104063557.22857-5-abner.chang@hpe.com> In-Reply-To: <20201104063557.22857-1-abner.chang@hpe.com> References: <20201104063557.22857-1-abner.chang@hpe.com> MIME-Version: 1.0 X-HPE-SCL: -1 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0b-002e3701.pphosted.com id 0A47DZH5028030 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,abner.chang@hpe.com X-Gm-Message-State: 2CokU70nST6iVBqVAIyDDR8Dx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604474505; bh=qI6cqTUXtY1oBAhoelHO1DjAOSWv0k8g9ejhJA8LRGE=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=dN03ZU64Br+Z+fPpk2oCLZqW9NE83nw4u3QeB9KRSpYIdbhw2WwUiM7lXvmkEX7CILV XItcXN30KTwsVBUHwP49k7qBcvb3Nm/j/VxArPlJ2XnEHrqAa8NOXlwiEbgw/N0+mFM6u +T0e3+mYRm1yTCkhXeUXDjsHvgnpbbolnRE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add x-uefi-ns keyword REST_STYLE HII option and non x-uefi keyword REST_STYLE HII option. Signed-off-by: Abner Chang Cc: Jiaxin Wu Cc: Siyuan Fu Cc: Fan Wang Cc: Jiewen Yao Cc: Dandan Bi Cc: Eric Dong Cc: Nickle Wang --- .../Universal/DriverSampleDxe/NVDataStruc.h | 4 ++- .../Universal/DriverSampleDxe/Vfr.vfr | 32 +++++++++++++++++-- .../Universal/DriverSampleDxe/VfrStrings.uni | 11 +++++-- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModu= lePkg/Universal/DriverSampleDxe/NVDataStruc.h index 8617617684..761f5e169c 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h +++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h @@ -1,6 +1,7 @@ /** @file =20 -Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
* +(C) Copyright 2020 Hewlett Packard Enterprise Development LP
SPDX-License-Identifier: BSD-2-Clause-Patent =20 Module Name: @@ -92,6 +93,7 @@ typedef struct { UINT16 BitNumeric : 12; MY_BITS_DATA MyBitData; MY_EFI_UNION_DATA MyUnionData; + UINT8 QuestionNonXUefiKeywordRestStyle; } DRIVER_SAMPLE_CONFIGURATION; =20 // diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/= Universal/DriverSampleDxe/Vfr.vfr index 65a65d4d1d..eecb062320 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr +++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr @@ -3,6 +3,7 @@ // Sample Setup formset. // // Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+// (C) Copyright 2020 Hewlett Packard Enterprise Development LP
// SPDX-License-Identifier: BSD-2-Clause-Patent // //**/ @@ -280,15 +281,40 @@ formset =20 endoneof; =20 + // + // This is an HII option which has REST_STYLE flag and x-UEFI namespace + // UNI string associated. This HII option could be configured by eithe= r in-band + // edk2 setup browser or the remote management in out-of-band such as = Redfish + // service. This HII option is configured through EFI_KEYWORD_HANDLER_= PROTOCOL. + // oneof varid =3D MyIfrNVData.QuestionAboutTreeHugging, - prompt =3D STRING_TOKEN(STR_ONE_OF_PROMPT_KEYWORD), - help =3D STRING_TOKEN(STR_ONE_OF_HELP), - flags =3D RESET_REQUIRED, + prompt =3D STRING_TOKEN(STR_ONE_OF_PROMPT_X_UEFI), + help =3D STRING_TOKEN(STR_ONE_OF_PROMPT_X_UEFI_HELP), + flags =3D RESET_REQUIRED | REST_STYLE, option text =3D STRING_TOKEN(STR_ONE_OF_TEXT1), value =3D 0, flags = =3D 0; option text =3D STRING_TOKEN(STR_ONE_OF_TEXT2), value =3D 1, flags = =3D DEFAULT; option text =3D STRING_TOKEN(STR_ONE_OF_TEXT3), value =3D 3, flags = =3D 0; endoneof; =20 + // + // This is a HII option which has REST_STYLE flag but without the x-UE= FI namespace + // UNI string associated. This HII option could be configured by either + // setup browser or the remote management in out-of-band such as Redfi= sh + // service. This HII option is configured through EFI HII Configuratio= n Routing + // Protocol becasue it doesn't have x-UEFI namespace UNI string. + // + numeric varid =3D MyIfrNVData.QuestionNonXUefiKeywordRestStyle, + prompt =3D STRING_TOKEN(STR_ONE_OF_PROMPT_NON_X_UEFI), + help =3D STRING_TOKEN(STR_ONE_OF_PROMPT_NON_X_UEFI_HELP), + flags =3D RESET_REQUIRED | REST_STYLE, + minimum =3D 0, + maximum =3D 0xf0, + step =3D 0, // Stepping of 0 equates to a manual en= tering + // of a value, otherwise it will be adjus= ted by "+"/"-" + default =3D 0, // defaultstore could be used to specif= y the default type + // If no defaultstore is specified, it im= plies Standard Default + endnumeric; + // // Define a string (EFI_IFR_STRING) // diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeMod= ulePkg/Universal/DriverSampleDxe/VfrStrings.uni index bafa194c63..740b24cdc3 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni +++ b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni @@ -1,6 +1,7 @@ // *++ // // Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+// (C) Copyright 2020 Hewlett Packard Enterprise Development LP
// SPDX-License-Identifier: BSD-2-Clause-Patent // // Module Name: @@ -51,9 +52,13 @@ #language fr-FR "Check the input nu= mber, test the efi buffer varstore" #string STR_ONE_OF_PROMPT #language en-US "My one-of prompt #= 1" #language fr-FR "Mi uno- de gu=C3= =ADa # 1" -#string STR_ONE_OF_PROMPT_KEYWORD #language en-US "My Keyword Namespa= ce Test" - #language fr-FR "My Keyword Namespa= ce Test" - #language x-UEFI-ns "iSCSIBootEnabl= e" +#string STR_ONE_OF_PROMPT_X_UEFI #language en-US "x-UEFI HII Option" + #language fr-FR "x-UEFI HII Option" + #language x-UEFI-ns "xUefiHiiOption" +#string STR_ONE_OF_PROMPT_X_UEFI_HELP #language en-US "This is an HII opt= ion which has REST_STYLE flag and x-UEFI namespace UNI string associated. T= his HII option could be configured by either in-band edk2 setup browser or = the remote management in out-of-band such as Redfish service. This HII opti= on is configured through EFI_KEYWORD_HANDLER_PROTOCOL." +#string STR_ONE_OF_PROMPT_NON_X_UEFI #language en-US "Non x-UEFI HII= Option" + #language fr-FR "Non x-UEFI HII= Option" +#string STR_ONE_OF_PROMPT_NON_X_UEFI_HELP #language en-US "This is a HII = option which has REST_STYLE flag but without the x-UEFI namespace UNI strin= g associated. This HII option could be configured by either setup browser o= r the remote management in out-of-band such as Redfish service. This HII op= tion is configured through EFI HII Configuration Routing Protocol becasue i= t doesn't have x-UEFI namespace UNI string." #string STR_CHECK_KEYWORD_SUPPORT #language en-US "Check iSCSI Boot E= nable" #language fr-FR "Check iSCSI Boot E= nable" #string STR_ONE_OF_HELP #language en-US "My one-of help is = going to be a long string to test out the efficiency of the ability of the = I am tired of typing capabilities" --=20 2.17.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 (#66967): https://edk2.groups.io/g/devel/message/66967 Mute This Topic: https://groups.io/mt/78024489/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-