From nobody Sat May 4 03:02:39 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+67068+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+67068+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604633732; cv=none; d=zohomail.com; s=zohoarc; b=aVC53Y1Ngh9SWPcAv/7l+NaUymTAzuaWOH3j8Qa7nhLjF/wIVH4LcJ9ITw9AhhEMZxbpSq9OWz9N947S83uE2QSn7MPVmrYB9Sll5oj59g6+B60aXhSRS36Dl/jfjUjZJYeWh75cKQFCa+CSK67R506NSh8ArOOnUzC6t+NNfFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604633732; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ruTblij8h79Nqp4aahLUe8jjTXBvd3TRKhFlZ6OEHjI=; b=We/DNPXLDU+0+xJcSaLhjAQjclTME/LBTYLoepz3tEMj80jOZMSVuhixMOVMLefX+4EyXq1d7tKXtvkZBzGn/Xi4CXols9dcY/FnUWS0U6r+6QOYh/V23NM93tqP92TFfuDP617f1grdtT6Mkh/SE9OQ0xDqsXH43tTrYzfVSRw= 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+67068+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 1604633732951742.4496449711152; Thu, 5 Nov 2020 19:35:32 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id HkrpYY1788612xKzch7Jb1uz; Thu, 05 Nov 2020 19:35: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.web09.7012.1604633727202975981 for ; Thu, 05 Nov 2020 19:35:27 -0800 X-Received: from pps.filterd (m0148663.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A63XB6a030136; Fri, 6 Nov 2020 03:35:20 GMT X-Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0a-002e3701.pphosted.com with ESMTP id 34k9car62m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Nov 2020 03:35:20 +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 661A462; Fri, 6 Nov 2020 03:35:19 +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 2F00036; Fri, 6 Nov 2020 03:35:18 +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 v4 1/4] MdePkg: Add GUID for REST Style Formset Date: Fri, 6 Nov 2020 10:49:36 +0800 Message-Id: <20201106024939.17761-2-abner.chang@hpe.com> In-Reply-To: <20201106024939.17761-1-abner.chang@hpe.com> References: <20201106024939.17761-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: opbwfmH75ijJ63ufEoZojXeYx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604633732; bh=l5/hotTLVhq8F8veWbfKRlL2C921nS93wSS+KJwGg68=; h=Cc:Date:From:Reply-To:Subject:To; b=a7IFNXcVvpXR46tt+qe5QSWJnxKTMHNmnS3ByjG+16TPhVF3fXGq39q0ETT7hY5n4gY 4jH39eZgtPyyY88rNMFLT+PpyHFPaQVz7oBoHkf5yCxbR6aI0SLR819uxJpDXuCCA04F2 /gXD3Bkmv0FXxq1UCRl4SsA/wntcYCkQtbw= 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 (#67068): https://edk2.groups.io/g/devel/message/67068 Mute This Topic: https://groups.io/mt/78067341/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 Sat May 4 03:02:39 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+67069+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+67069+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604633737; cv=none; d=zohomail.com; s=zohoarc; b=LMQnaJ/ZBC8B/DrBCCIMJpaI7M3IQhM7CCtO4+OPQDoGVLNPXeyJ5f0lKLzNNd3wVLNhFkQiyZdexIX3O70o2+tKoJcGyOrwTRGFm200IOpp7M+RBHvvH7HmhLt/ll4seTIRvKae9Dy4c277nmbzrEfxEu3+DuukrBBIIR6Z2Qk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604633737; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Pf+5cEgFpxgVeiHj82+BvIVV0zQtIV5hLe+JDJ+8hs0=; b=iuNq93wJCt7jxeVcj1DDyyP+9PoOMTadeEI2N9IRNuHJZ6byFVk3oaVTUPHKQLx/JA5xljHuBDd7Z18Ur8OH47WQQbMJQbFMKmnIvV87CDwrm5v1JO6HEvPf+g6A0yePpLRrz1lPxE2+VFjE9FVU0CiBoPhHOdfcjJL/YjoAEqo= 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+67069+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 1604633737934991.8157232916321; Thu, 5 Nov 2020 19:35:37 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5EyeYY1788612x3SaZSMa5ij; Thu, 05 Nov 2020 19:35:37 -0800 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web09.7011.1604633727192210101 for ; Thu, 05 Nov 2020 19:35:27 -0800 X-Received: from pps.filterd (m0134420.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A63X5Nb032045; Fri, 6 Nov 2020 03:35:22 GMT X-Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com [15.233.44.27]) by mx0b-002e3701.pphosted.com with ESMTP id 34kc8dxqdv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Nov 2020 03:35:22 +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 30E66A2; Fri, 6 Nov 2020 03:35:20 +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 B4E9237; Fri, 6 Nov 2020 03:35:19 +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 v4 2/4] BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option Date: Fri, 6 Nov 2020 10:49:37 +0800 Message-Id: <20201106024939.17761-3-abner.chang@hpe.com> In-Reply-To: <20201106024939.17761-1-abner.chang@hpe.com> References: <20201106024939.17761-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: 0THfp50IIpOfmYdqxmeSOHfPx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604633737; bh=JCidA/JiIq483qoy4SOufhRf3vJST4F8UfvZEMBkb+M=; h=Cc:Date:From:Reply-To:Subject:To; b=NFXng+D+iqahdoxwLtmS1ZizmXlnUU+u+BgLYyej1DAp7JjdFRhPRE6UTyVKYcPVyM+ UxK75i3ORxjUNCiaH97xSQM7APaQCzOLJhpVoFlODOjrQ6UMzeRiidgWyTtfd4qtJwbzt uhjMmVVyWUvTg8h3yrP804B3DTpFv9R2JzM= 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 (#67069): https://edk2.groups.io/g/devel/message/67069 Mute This Topic: https://groups.io/mt/78067342/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 Sat May 4 03:02:39 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+67066+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+67066+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604633724; cv=none; d=zohomail.com; s=zohoarc; b=G5hLP8xrXE1vgwaPfaFT7VNtsYmrK77ra4nrV0Qm+l7/+JMPGc3Vu8BX6FotwPqprCn06GKPJw7TYPW+UxOz2cuqoHD9Vma0kO4pL21/bwkkrZa5UVznSG4ymDsITqapaQCD0STo57Ubo9CmfNg0hHkt10YkBToGZPmAH8mdHOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604633724; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=3b9KfxWc57apydfM4w/dJn1V8e4aV3DQcPJ+sZcLwR8=; b=GzEixrC4pooTGgVPA1T4CiVCrjE6kF1OEccEUTp0cRHewFmaF8+U3hC9Y9l5141l7oEZmZUZQNNkiwwJ2m1yc2SJkuIqxkfFZUtlLg92+2vyWQup4vs52WVNt8H+4lFCN0oFUBxa4MHcpXtZWMWJ4qvHYg/TFrT6kaSQ/pKqNSc= 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+67066+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 1604633724642251.63613501292832; Thu, 5 Nov 2020 19:35:24 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Db3vYY1788612xcjK5m3s5OM; Thu, 05 Nov 2020 19:35:24 -0800 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web11.7076.1604633723499334843 for ; Thu, 05 Nov 2020 19:35:23 -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 0A63W8Um022374; Fri, 6 Nov 2020 03:35:23 GMT X-Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com [15.233.44.27]) by mx0a-002e3701.pphosted.com with ESMTP id 34kc7v6jhd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Nov 2020 03:35:23 +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 3DD12AE; Fri, 6 Nov 2020 03:35:22 +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 3AA3D36; Fri, 6 Nov 2020 03:35:21 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Dandan Bi , Eric Dong , Nickle Wang Subject: [edk2-devel] [VFR support REST_STYLE PATCH v4 3/4] MdeModulePkg/Library: Revise HiiLib to check REST_STYLE Date: Fri, 6 Nov 2020 10:49:38 +0800 Message-Id: <20201106024939.17761-4-abner.chang@hpe.com> In-Reply-To: <20201106024939.17761-1-abner.chang@hpe.com> References: <20201106024939.17761-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: DdsgyyhCxQBeF8WYnwYVBwX9x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604633724; bh=CILUKv2LBoaKhZsuvByDjAKp52lPFClNYi8p4CyjnH0=; h=Cc:Date:From:Reply-To:Subject:To; b=HO6jc/9QJ8ih0amTYNL9I7J/jzTswi0WrLxenDaypnK8jknZzumYcOFn0hCmRi9XxOB ci4LAcSXVuwUikrs7WSwkNba7LndsbQPu8lGe2cH+daCJt7jrSEU5Ez0bmOKLpwQaIsSz C9ANDuBtWBLmHkxBrqtQp2GnHtN5mjWn68c= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This change checks REST_STYLE flag. 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 Cc: Dandan Bi Cc: Eric Dong Cc: Nickle Wang Reviewed-by: Liming Gao --- 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 (#67066): https://edk2.groups.io/g/devel/message/67066 Mute This Topic: https://groups.io/mt/78067339/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 Sat May 4 03:02:39 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+67067+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+67067+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1604633728; cv=none; d=zohomail.com; s=zohoarc; b=UYXFeaAIwJPUEDf/GvOT7UgwRIS3zpU1Vvv18BQYf2bkrh+1RMid4q9bSG9AaLkQJHvte1pd21TNd+D+WQJe2ZA3Aw5jBXFRHB6vj+BYW11X0V1QutfRR61V9UAE31q39BsEk71mpQpZFAjDLiMuDvgwu2qS4VgOL7Rk6ryIB4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604633728; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=7y1R3UaK0wIAxwcJ3jb23qK+rG/IkXNlk6NGIUbI+rc=; b=Qk/6CVjSRq006c1UZUzviUcJ5Oe9C9yZDiuBz9s0o4NVWTD5z7l3+QlD5TvYpoyCV5irDY98j9+N4YhXpwEygKQrrKJXOExsEy4ba6nuO0MrJDKDXD9VnKvH8UwcUT1+SJP+z1ry5P6sW8RgVcbcOWlEJlI/wYS5D/JUb/Nteho= 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+67067+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 1604633728905915.4343921450173; Thu, 5 Nov 2020 19:35:28 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id CPSTYY1788612xOQqGm5ieiV; Thu, 05 Nov 2020 19:35:26 -0800 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web09.7010.1604633725908021955 for ; Thu, 05 Nov 2020 19:35:26 -0800 X-Received: from pps.filterd (m0148664.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A63HVxd030258; Fri, 6 Nov 2020 03:35:25 GMT X-Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0b-002e3701.pphosted.com with ESMTP id 34mcp6rnj2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Nov 2020 03:35:25 +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 4EC8077; Fri, 6 Nov 2020 03:35:24 +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 8DF5736; Fri, 6 Nov 2020 03:35:22 +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 v4 4/4] MdeModulePkg/DriverSampleDxe: Add HII sample options Date: Fri, 6 Nov 2020 10:49:39 +0800 Message-Id: <20201106024939.17761-5-abner.chang@hpe.com> In-Reply-To: <20201106024939.17761-1-abner.chang@hpe.com> References: <20201106024939.17761-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: LizHqIDm5CJMk7sbBafVKa0fx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604633726; bh=io8lKSbThiyCP8cHunDzd4sy0yJg1pBt+Hbz+MtZKtc=; h=Cc:Date:From:Reply-To:Subject:To; b=mhiNBt4ogUmLM4aZ9QJxKBidjBiVqWz841LYbaZb650te/FUsUbVej8jcFebvOWTLGp Sg+LWgRXATF1u/lqyn2kh64sJ3E4bfW7tq1aRllmokicNmp/94KYEUs7I0LETF8+Vlca/ dLennAP4L8Q1hGvVxYHfCoVqIVAn2Us+0y0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 Reviewed-by: Liming Gao --- .../Universal/DriverSampleDxe/NVDataStruc.h | 5 ++- .../Universal/DriverSampleDxe/Vfr.vfr | 36 +++++++++++++++++++ .../Universal/DriverSampleDxe/VfrStrings.uni | 8 +++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModu= lePkg/Universal/DriverSampleDxe/NVDataStruc.h index 8617617684..a4ec1b4bd1 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,8 @@ typedef struct { UINT16 BitNumeric : 12; MY_BITS_DATA MyBitData; MY_EFI_UNION_DATA MyUnionData; + UINT8 QuestionXUefiKeywordRestStyle; + UINT8 QuestionNonXUefiKeywordRestStyle; } DRIVER_SAMPLE_CONFIGURATION; =20 // diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/= Universal/DriverSampleDxe/Vfr.vfr index 65a65d4d1d..5323e2b411 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 // //**/ @@ -289,6 +290,41 @@ formset option text =3D STRING_TOKEN(STR_ONE_OF_TEXT3), value =3D 3, flags = =3D 0; 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.QuestionXUefiKeywordRestStyle, + 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; + + + // + // 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..9587e935a6 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: @@ -56,6 +57,13 @@ #language x-UEFI-ns "iSCSIBootEnabl= e" #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_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_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" #language fr-FR "Mi uno- de ayuda v= a a ser una cadena larga a probar fuera de la eficacia de la capacidad del = yo es cansada de capacidades el pulsar." #string STR_ONE_OF_TEXT1 #language en-US "My one-of text #1" --=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 (#67067): https://edk2.groups.io/g/devel/message/67067 Mute This Topic: https://groups.io/mt/78067340/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-