From 1b840718f72711d442ecd7b7e54256a31df8bd20 Mon Sep 17 00:00:00 2001 From: Abner Chang Date: Fri, 6 Nov 2020 10:49:37 +0800 Subject: BaseTools/VfrCompile: VFR compiler supports REST_STYLE in HII option Add REST_STYLE support on VFR language BZ: 2916 https://bugzilla.tianocore.org/show_bug.cgi?id=2916 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(-) (limited to 'BaseTools') 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; >> -- cgit v1.2.3