From nobody Fri May 10 16:31:02 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+66897+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+66897+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604372311; cv=none; d=zohomail.com; s=zohoarc; b=RWsXGrsghPhs+l52IdvOg+eUFv3gD/tz2FJjC9zQ82rhvqY02GyLGwmUnlHo5W+ev/9Suyol0SQE00leZG8ewd72iHA6npgAsIhWnEawdROZbE7YE8pSfS2LnS7BNrLP8ojpSoVzFYIJk8SIdW4QW+ik/aIDwpIsIioRCdtIDxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604372311; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=UQHqEe0eY9Djmkl10DFD2vrxrWELy+RUJW0fx537KA8=; b=JzdfC6GzoD/W7VrUR4Bvuom7Yg0W3iyjTu3JOqOrhy89t7Oj/1W70O2ApNdYkjw96XvotC6PSAmZEJ1JzgmxRw8aix8T8N+kjXBixOOTSBD22BBkktMqKEkcrge37XA5m+FAJty/Lc7UuIjMXGFt+kfBWyGaOupw7TkQugV/xaQ= 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+66897+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 1604372311973242.76551114458857; Mon, 2 Nov 2020 18:58:31 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id oH7SYY1788612xmWgXYafeca; Mon, 02 Nov 2020 18:58:31 -0800 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web10.4846.1604372310441525718 for ; Mon, 02 Nov 2020 18:58:30 -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 0A32uIH5000976; Tue, 3 Nov 2020 02:58:24 GMT X-Received: from g4t3427.houston.hpe.com (g4t3427.houston.hpe.com [15.241.140.73]) by mx0b-002e3701.pphosted.com with ESMTP id 34hhn5qa19-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Nov 2020 02:58:24 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g4t3427.houston.hpe.com (Postfix) with ESMTP id CD6A557; Tue, 3 Nov 2020 02:58:22 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id DDDEB45; Tue, 3 Nov 2020 02:58:20 +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 1/3] MdePkg: Add GUID for REST Style Formset Date: Tue, 3 Nov 2020 10:12:46 +0800 Message-Id: <20201103021248.7019-2-abner.chang@hpe.com> In-Reply-To: <20201103021248.7019-1-abner.chang@hpe.com> References: <20201103021248.7019-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: D2fs0lnYAUdUpr2iKcBbWKb2x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604372311; bh=p2Ci8fuRl1WUwzAfCBRdp9qcx+SY7Wz81wS0Ty/JJcc=; h=Cc:Date:From:Reply-To:Subject:To; b=gKgXmMnltq12QJQ29YMeWZeU/OZARCA0z4OZl3fnd5OjxL8e0NhtbLT6eATavTRoJ6W GjgiIGdTpWGZ/SEAMMn8ZhmW7kpkEA7lddkNub3VATMi7m8fZiGczfnykrakKnCG0N3r6 nOTzzk6hj2VLNsWLYQT07YVuu8EmTyVeZZU= 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 645f61b80e..8b34915b9a 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -406,6 +406,9 @@ ## Include/Guid/HiiPlatformSetupFormset.h gEfiHiiUserCredentialFormsetGuid =3D { 0x337f4407, 0x5aee, 0x4b83, { 0xb= 2, 0xa7, 0x4e, 0xad, 0xca, 0x30, 0x88, 0xcd }} =20 + ## Include/Guid/HiiPlatformSetupFormset.h + gEfiHiiRestStyleFormsetGuid =3D { 0x790217bd, 0xbecf, 0x485b, { 0x91, 0x= 70, 0x5f, 0xf7, 0x11, 0x31, 0x8b, 0x27 } } + ## Include/Guid/HiiFormMapMethodGuid.h gEfiHiiStandardFormGuid =3D { 0x3bd2f4ec, 0xe524, 0x46e4, { 0xa9, 0xd8, = 0x51, 0x1, 0x17, 0x42, 0x55, 0x62 }} =20 --=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 (#66897): https://edk2.groups.io/g/devel/message/66897 Mute This Topic: https://groups.io/mt/77998978/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 16:31:02 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+66898+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+66898+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604372311; cv=none; d=zohomail.com; s=zohoarc; b=GVQjmj8NeubI0tk5DWvfOIPvc7soxd/NaUyrBzzoZypqnTMtHr3SkMvhAqxJo2TjSv1yby6kXxpLzu71Xu6jU1McWj+zPp8z+B2l0wYf0sYpxXxCSpUI32cXtmWwtBL6nyP1R/e718pevxzTExYdBNk4oaVMGzYmQaWI8ckIK44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604372311; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=k1WAkV9NbWDutvBK5jV7s7n56sozQgBBzWaVN8ZpuaY=; b=lik3oHomx/fwpTGPLX7zAtz4xE6alRdRbuyPVvsnfGbX7Tu0Ky8huUgSHNl5TeB52/BIEPAaw8+vz0YJIAUx9MTOO88Q9qPSmL/FVdyUaD50G4sOFq2ec/u1q7NtWBpGw3Utl/h1HdMEXyKdOkQVpirQ6+IRG6yjDSm2NLeTpao= 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+66898+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 1604372311909833.6904072943927; Mon, 2 Nov 2020 18:58:31 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id slCKYY1788612xTkVNPqJFiE; Mon, 02 Nov 2020 18:58:31 -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.4934.1604372310437088372 for ; Mon, 02 Nov 2020 18:58:30 -0800 X-Received: from pps.filterd (m0134421.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A32t6vM023560; Tue, 3 Nov 2020 02:58:24 GMT X-Received: from g9t5008.houston.hpe.com (g9t5008.houston.hpe.com [15.241.48.72]) by mx0b-002e3701.pphosted.com with ESMTP id 34hh9wq8kq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Nov 2020 02:58:24 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g9t5008.houston.hpe.com (Postfix) with ESMTP id D85B056; Tue, 3 Nov 2020 02:58:23 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id 7475846; Tue, 3 Nov 2020 02:58:22 +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 2/3] BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option Date: Tue, 3 Nov 2020 10:12:47 +0800 Message-Id: <20201103021248.7019-3-abner.chang@hpe.com> In-Reply-To: <20201103021248.7019-1-abner.chang@hpe.com> References: <20201103021248.7019-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: 81PIqyx0ATD1kHsnuAgL0DXHx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604372311; bh=4Z+fBaXcgxcnOw6l+zSs4fRnp2mkcUopuqvI3LwmC54=; h=Cc:Date:From:Reply-To:Subject:To; b=kmQEEMzw8N5cXOmhJLkt2bsFjShBcugYaSr3k9N54YrhSMjBWWk3boH6f8xwBfoyNEq 9V/4MQkP/Grq4hdr8yIytjIec+KRmByIqEuhIDyFo6AQMIIsnD33GyRaMunga67H/pso+ Zi2cnbSIMaXFWsmQT2I0sKL8jubEMdquvAs= 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 (#66898): https://edk2.groups.io/g/devel/message/66898 Mute This Topic: https://groups.io/mt/77998979/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 16:31:02 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+66896+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+66896+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604372313; cv=none; d=zohomail.com; s=zohoarc; b=IcLMS3XHnEk9e+A4ghwpBabxkRWiQwnIBxcLrx+MHxWt3ZSdF6792KceuxZrSU3om1dpQhAMWP4iNti5nPbwlO6UZdC7IM6W8PqdLziKpYPAhEiuAVqgSOMuavYBQD72YyAixt2pFRKb0w6Uh9qmAvIzAfntefkK7Fp16rVH2zs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604372313; 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=Bv8DbU7GOe1kBRhfvsXSi5b0eY7B3jlskcUCsEkaVBw=; b=C8tfw9UwnWih4ssR0+4lcwIMXusfaMJctOVIrm6fqdCBbpKQwgpNpybF+BV8WbMfWOc4+H8AkzZO3SFlBk6remqm+1lT6iuVs8onVbXRN+7MIu7WZyAs4O7QiXNJz9nx95D9k/OJQWSGXzpAXKNp4lhaYWHKcKq8RgyV2XQoxbA= 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+66896+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 1604372313239324.64524198570007; Mon, 2 Nov 2020 18:58:33 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id vOedYY1788612xOWBGswXUEc; Mon, 02 Nov 2020 18:58:32 -0800 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web10.4844.1604372307281312503 for ; Mon, 02 Nov 2020 18:58:27 -0800 X-Received: from pps.filterd (m0150241.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A32w3p8028772; Tue, 3 Nov 2020 02:58:26 GMT X-Received: from g4t3427.houston.hpe.com (g4t3427.houston.hpe.com [15.241.140.73]) by mx0a-002e3701.pphosted.com with ESMTP id 34hhavyfe0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Nov 2020 02:58:26 +0000 X-Received: from g4t3433.houston.hpecorp.net (g4t3433.houston.hpecorp.net [16.208.49.245]) by g4t3427.houston.hpe.com (Postfix) with ESMTP id AF0A657; Tue, 3 Nov 2020 02:58:25 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g4t3433.houston.hpecorp.net (Postfix) with ESMTP id 01B1445; Tue, 3 Nov 2020 02:58:23 +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 3/3] MdeModulePkg/DriverSampleDxe: Add HII sample options Date: Tue, 3 Nov 2020 10:12:48 +0800 Message-Id: <20201103021248.7019-4-abner.chang@hpe.com> In-Reply-To: <20201103021248.7019-1-abner.chang@hpe.com> References: <20201103021248.7019-1-abner.chang@hpe.com> MIME-Version: 1.0 X-HPE-SCL: -1 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-002e3701.pphosted.com id 0A32w3p8028772 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: LyOh14LexnYMshPfJH4Jmc7Xx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604372312; bh=yXemxpVdC9b5vCel/E4c60mrbwCuJCv1NQLQE6QHNTw=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=oOCdAbwGqxn+u5WmLbLXBwDjb0pEI6GeZrn5DTnYduX/Rec8OM5gX51Ju84mQgopUIm pLa3xMdgVCvlv59QMmKON67nsyOdIBme3cBCebp7T46tj8ERhqvAetOM26izuJTmGK7aI TeiYixAzSX6FRqYnohhDhLuO1irBKUErFJo= 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 (#66896): https://edk2.groups.io/g/devel/message/66896 Mute This Topic: https://groups.io/mt/77998976/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-