From nobody Fri May 10 07:00:16 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+66903+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+66903+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604374012; cv=none; d=zohomail.com; s=zohoarc; b=CZB3/S8LwN666EH4487Ttd4+FYTrlFdVyPkaVY/kG7DTkehOqn9v7wj3wjBaaDB7susFCXk2++fSA/kTc7cghAzcqwdatYYnJeu6p2P8jGY/AcKw/CqVrzT9PKO14vNZ2dOkeo2IzhaIk3YL2FEaWf/0LZ70i7r5rSqOnn4yQNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604374012; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=CJf3gMbHLzla/X3XQUS0IU0pFWSbz/aHD3dB8Tt1H/w=; b=ddEBesFR30xpIPQLfSjehS/wbfy/NvbZgegkvPd31G2qUBFsBUQ1/i/Qa5xYqWFAN6q8qdu73qURPVmiXTxv7gW1bq7CC5cti5gHH8Bzs9zw/nK8KGtc/zGLcnvH37hi2X1gZZdfeiAyTo5IdfE07qcrDXTh2bl3+coYME19kr8= 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+66903+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 1604374012868590.7007985435918; Mon, 2 Nov 2020 19:26:52 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id K2zSYY1788612xhEUabfYKQ8; Mon, 02 Nov 2020 19:26:52 -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.5165.1604374006959190041 for ; Mon, 02 Nov 2020 19:26:47 -0800 X-Received: from pps.filterd (m0134423.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A33EA5P013666; Tue, 3 Nov 2020 03:26:34 GMT X-Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com [15.233.44.27]) by mx0b-002e3701.pphosted.com with ESMTP id 34h05hc96k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Nov 2020 03:26:34 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2354.austin.hpe.com (Postfix) with ESMTP id D7CBC9D; Tue, 3 Nov 2020 03:26:33 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 4D6783B; Tue, 3 Nov 2020 03:26: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 v2 1/3] MdePkg: Add GUID for REST Style Formset Date: Tue, 3 Nov 2020 10:40:58 +0800 Message-Id: <20201103024100.7733-2-abner.chang@hpe.com> In-Reply-To: <20201103024100.7733-1-abner.chang@hpe.com> References: <20201103024100.7733-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: E4cF9IjCApfbHKseiUW87gLKx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604374012; bh=3+qXHAK22O7DsHJ8GytLfWXriRmhYl8/lHMa71p71T0=; h=Cc:Date:From:Reply-To:Subject:To; b=htPeKGHfkVQ0GN3bLjzmirDVG/afbxiXSHBP05qm5pKVNwnOyzpgOT3PsMHpo6SzO5s 0/AWE+zlRDt7LSI3R9j47wtUP5SxmBV9QUlvfWJI0CyAfi4scLN5uWxE9ryBBkJuQtfql 9qKFjdRfK4ImaBYgWdt7Aq8R65srlODc6jc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- 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 (#66903): https://edk2.groups.io/g/devel/message/66903 Mute This Topic: https://groups.io/mt/77999418/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 Fri May 10 07:00:16 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+66901+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+66901+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604374001; cv=none; d=zohomail.com; s=zohoarc; b=SfeM2O6TcNTVx1SfPrf26A3+ksQFW5v7jCX3DeupyDi/v/ZZz0R/gr4UaA7dmwutVXAuJuIvJs4xzP+xghKibtYyDNVNxxVAyCR0bAPgJiNEcNolnXqBRPUEiCWlRHKep14DLif+olGHXUuhyRu2K+6jeeFpmXPqaNG7QzQNul8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604374001; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=dXYiIFkHvmHwQJrov1odSp/Xj+vnCQAMyh1bYswe81c=; b=Ge6cUhBD1lQB0HOUHlDZHvbAjoFTLUS7Kh2vf+++3ms58Zs27rpygoLisHjhDx/u0IDgLq6obC+Z8yQ8mqSNZ7LiSRMiOdtY6LO3umuBdL42x5uGq5yqXfVGZDVDV2iFxFE4DqXKdCu3X2SMAJMKMgr+fvEQLVKSHqyNzOxhHDg= 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+66901+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 1604374001170231.71443456659324; Mon, 2 Nov 2020 19:26:41 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id yW35YY1788612xrnBTaDZWvX; Mon, 02 Nov 2020 19:26:40 -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.5179.1604373997966445670 for ; Mon, 02 Nov 2020 19:26:38 -0800 X-Received: from pps.filterd (m0134422.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A33Kaff007962; Tue, 3 Nov 2020 03:26:36 GMT X-Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0b-002e3701.pphosted.com with ESMTP id 34hhn5qep5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Nov 2020 03:26:35 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2353.austin.hpe.com (Postfix) with ESMTP id 0FC5765; Tue, 3 Nov 2020 03:26:35 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id D4C7037; Tue, 3 Nov 2020 03:26: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 v2 2/3] BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option Date: Tue, 3 Nov 2020 10:40:59 +0800 Message-Id: <20201103024100.7733-3-abner.chang@hpe.com> In-Reply-To: <20201103024100.7733-1-abner.chang@hpe.com> References: <20201103024100.7733-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: YO6mBeCEiS47Uo2atJrgtRfUx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604374000; bh=zrKmP/UDS+x2ZWS2WXBLXFCv8iSY1BJY/w7BEnbzun0=; h=Cc:Date:From:Reply-To:Subject:To; b=MqkXVXBxoBEml6WhG3MkMXgfVqghXQ2e7314PVAK5qGLPUgygQvWzEWOTj0rjmIBtUX QqBx9MOHhedxgnFb/QbFSK4R5FvWcX1C3LVpBpFJKDjcHyvVPEd9clNlzVsqtP8IOVTjc 4xSuBc1/6zxBHFxaYz9Luc9CPIjG4cF9w64= 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 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] << ++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 (#66901): https://edk2.groups.io/g/devel/message/66901 Mute This Topic: https://groups.io/mt/77999413/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 Fri May 10 07:00:16 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+66902+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+66902+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604374006; cv=none; d=zohomail.com; s=zohoarc; b=ArdfCwqcPf8akjSvKe9lECtv5XGxdOKKLODMOEp8iCKFugUz5OAf7fOlJqJU0hs0tsLs9BQpPqbL15+AawfJ2HpN5CQWMt+Qh0MZtAF4jAkpnlN0poOyHI1t7uhWUXUDF7wjuX3Ms6C946tlqIMbXY78G+jl6hSHOlDG8CImI9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604374006; 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=j01y74cOI8Ar3Zxkxxd9l4YXTqS+rOYXtQbfaIYCGdg=; b=H4HKvlbzMTKegdKV9hnfNLpC7fRpoCpdsHwJzwn9/yEz5J5UbpOZl1RthSxUq9/fqwUd0syx8zhQfhpvhI9jLfuJ4grkKW5R3Z8h5A9OSzfbYkg/3DhQNUpQVeWc3XTSm/joJ7u8QxP+RPVc5eBmUHWoK9FH0nomOIVw0vP3Uf4= 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+66902+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 1604374006313935.086217797069; Mon, 2 Nov 2020 19:26:46 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id V8YBYY1788612xzVh9i8nVEM; Mon, 02 Nov 2020 19:26: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.web10.5090.1604373998622550241 for ; Mon, 02 Nov 2020 19:26:38 -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 0A33HTS7009192; Tue, 3 Nov 2020 03:26:38 GMT X-Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0b-002e3701.pphosted.com with ESMTP id 34h0k249gw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Nov 2020 03:26:37 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 13CF685; Tue, 3 Nov 2020 03:26:37 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 5F9BC37; Tue, 3 Nov 2020 03:26:35 +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 v2 3/3] MdeModulePkg/DriverSampleDxe: Add HII sample options Date: Tue, 3 Nov 2020 10:41:00 +0800 Message-Id: <20201103024100.7733-4-abner.chang@hpe.com> In-Reply-To: <20201103024100.7733-1-abner.chang@hpe.com> References: <20201103024100.7733-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 0A33HTS7009192 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: zXnGp7ZWJjEiVOOgavhlYOlDx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604374005; bh=/v4DrZSoy5BNBdDUEnpIVAvit/UqHIR/VQ3nSQyk0JQ=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=SW1vd8J+CFOmKx4obMSBXsdFRLV9DY/5uY7mSoMmwJxTO9u4Ww6l1VdAeautAvqkKL8 Q24b/GQHX+oVCFkeulN+fMU1pznVHgVgmRQmQ81pntTCj7P2ucTF1n9Pyh4vo72a7xXwP HOcNowoHHvrTbmQdmjkO1XhcKO4L5RyCpcs= 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..e67b888783 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 (#66902): https://edk2.groups.io/g/devel/message/66902 Mute This Topic: https://groups.io/mt/77999415/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-