回复: [edk2-devel] [VFR support REST_STYLE PATCH v2 2/3] BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option

["gaoliming" <gaoliming@byosoft.com.cn>]

Anber:
 This patch set is related to BZ
https://bugzilla.tianocore.org/show_bug.cgi?id=2916. Please include BZ in
the commit message. 
 With this change, Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

 Besides, please also submit the patch to update VFR spec
https://github.com/tianocore-docs/edk2-VfrSpecification

Thanks
Liming
> -----邮件原件-----
> 发件人: bounce+27952+66901+4905953+8761045@groups.io
> <bounce+27952+66901+4905953+8761045@groups.io> 代表 Abner Chang
> 发送时间: 2020年11月3日 10:41
> 收件人: devel@edk2.groups.io
> 抄送: Bob Feng <bob.c.feng@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Yuwei Chen <yuwei.chen@intel.com>; Nickle
> Wang <nickle.wang@hpe.com>
> 主题: [edk2-devel] [VFR support REST_STYLE PATCH v2 2/3]
> BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option
> 
> Add REST_STYLE support on VFR language
> 
> Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
> Signed-off-by: Ye Ting <ting.ye@intel.com>
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> Signed-off-by: Wang Fan <fan.wang@intel.com>
> 
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Nickle Wang <nickle.wang@hpe.com>
> ---
>  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 =
> EFI_HII_PLATFORM_SETUP_FORMSET_GUID;
> -     EFI_GUID    ClassGuid1, ClassGuid2, ClassGuid3;
> +     EFI_GUID    ClassGuid1, ClassGuid2, ClassGuid3, ClassGuid4;
>       UINT8       ClassGuidNum = 0;
>       CIfrFormSet *FSObj = NULL;
>       UINT16      C, SC;
> @@ -600,13 +601,16 @@ vfrFormSetDefinition :
>                       "\|" guidDefinition[ClassGuid2]  <<
> ++ClassGuidNum; >>
>                       {
>                        "\|" guidDefinition[ClassGuid3]  <<
> ++ClassGuidNum; >>
> +                       {
> +                         "\|" guidDefinition[ClassGuid4]  <<
> ++ClassGuidNum; >>
> +                       }
>                       }
>                    }
>                    ","
>    }
>                                                      <<
> -                                                      if
> (mOverrideClassGuid != NULL && ClassGuidNum >= 3) {
> -
> _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Already has 3
> class guids, can't add extra class guid!");
> +                                                      if
> (mOverrideClassGuid != NULL && ClassGuidNum >= 4) {
> +
> _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Already has 4
> class guids, can't add extra class guid!");
>                                                        }
>                                                        switch
> (ClassGuidNum) {
>                                                        case 0:
> @@ -643,10 +647,23 @@ vfrFormSetDefinition :
>                                                          }
>                                                          break;
>                                                        case 3:
> +                                                        if
> (mOverrideClassGuid != NULL) {
> +
> ClassGuidNum ++;
> +                                                        }
> +                                                        FSObj
> = new CIfrFormSet(sizeof(EFI_IFR_FORM_SET) + ClassGuidNum *
> sizeof(EFI_GUID));
> +
> FSObj->SetClassGuid(&ClassGuid1);
> +
> FSObj->SetClassGuid(&ClassGuid2);
> +
> FSObj->SetClassGuid(&ClassGuid3);
> +                                                        if
> (mOverrideClassGuid != NULL) {
> +
> FSObj->SetClassGuid(mOverrideClassGuid);
> +                                                        }
> +                                                        break;
> +                                                      case 4:
>                                                          FSObj
> = new CIfrFormSet(sizeof(EFI_IFR_FORM_SET) + ClassGuidNum *
> sizeof(EFI_GUID));
> 
> FSObj->SetClassGuid(&ClassGuid1);
> 
> FSObj->SetClassGuid(&ClassGuid2);
> 
> FSObj->SetClassGuid(&ClassGuid3);
> +
> FSObj->SetClassGuid(&ClassGuid4);
>                                                          break;
>                                                        default:
>                                                          break;
> @@ -1321,6 +1338,7 @@ questionheaderFlagsField[UINT8 & Flags] :
>      ReadOnlyFlag                                    << $Flags |=
> 0x01; >>
>    | InteractiveFlag                                 << $Flags |=
> 0x04; >>
>    | ResetRequiredFlag                               << $Flags |=
> 0x10; >>
> +  | RestStyleFlag                                   << $Flags |=
> 0x20; >>
>    | ReconnectRequiredFlag                           << $Flags |=
> 0x40; >>
>    | O:OptionOnlyFlag                                <<
> 
> gCVfrErrorHandle.HandleWarning (
> @@ -3766,6 +3784,7 @@ oneofoptionFlagsField [UINT8 & HFlags, UINT8 &
> LFlags] :
>    | "OPTION_DEFAULT_MFG"                               <<
> $LFlags |= 0x20; >>
>    | InteractiveFlag                                    << $HFlags
> |= 0x04; >>
>    | ResetRequiredFlag                                  << $HFlags
> |= 0x10; >>
> +  | RestStyleFlag                                      << $HFlags
> |= 0x20; >>
>    | ReconnectRequiredFlag                              << $HFlags
> |= 0x40; >>
>    | ManufacturingFlag                                  << $LFlags
> |= 0x20; >>
>    | DefaultFlag                                        << $LFlags
> |= 0x10; >>
> --
> 2.17.1
> 
> 
> 
> 
>