X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FSource%2FC%2FVfrCompile%2FVfrSyntax.g;h=6f15aaa452a38a4350a146c5231f336933338022;hp=02a7b5c1f4382752f44efb6b64afcd56e0fbcfb8;hb=e8a47801a1dfdb148b1bfcd5bdc8ebc3bf51f92d;hpb=82e589a43fb7a32e3ee7a6064641bce4bed77fa5;ds=sidebyside diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g index 02a7b5c1f4..6f15aaa452 100644 --- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g +++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g @@ -1,5 +1,5 @@ /*++ -Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -51,11 +51,12 @@ public: UINT8 VfrParserStart ( IN FILE *File, - IN BOOLEAN CompatibleMode + IN INPUT_INFO_TO_SYNTAX *InputInfo ) { ParserBlackBox VfrParser(File); - VfrParser.parser()->SetCompatibleMode (CompatibleMode); + VfrParser.parser()->SetCompatibleMode (InputInfo->CompatibleMode); + VfrParser.parser()->SetOverrideClassGuid (InputInfo->OverrideClassGuid); return VfrParser.parser()->vfrProgram(); } >> @@ -135,6 +136,7 @@ VfrParserStart ( #token MapTitle("maptitle") "maptitle" #token MapGuid("mapguid") "mapguid" #token Subtitle("subtitle") "subtitle" +#token EndSubtitle("endsubtitle") "endsubtitle" #token Help("help") "help" #token Text("text") "text" #token Option("option") "option" @@ -183,6 +185,7 @@ VfrParserStart ( #token Goto("goto") "goto" #token FormSetGuid("formsetguid") "formsetguid" #token InconsistentIf("inconsistentif") "inconsistentif" +#token WarningIf("warningif") "warningif" #token NoSubmitIf("nosubmitif") "nosubmitif" #token EndIf("endif") "endif" #token Key("key") "key" @@ -237,6 +240,7 @@ VfrParserStart ( #token EndGuidOp("endguidop") "endguidop" #token DataType("datatype") "datatype" #token Data("data") "data" +#token Modal("modal") "modal" // // Define the class and subclass tokens @@ -340,6 +344,7 @@ vfrDataStructFields : dataStructFieldString | dataStructFieldDate | dataStructFieldTime | + dataStructFieldRef | dataStructFieldUser )* ; @@ -426,6 +431,16 @@ dataStructFieldTime : ";" << _PCATCH(gCVfrVarDataTypeDB.DataTypeAddField (N->getText(), D->getText(), ArrayNum), N); >> ; +dataStructFieldRef : + << UINT32 ArrayNum = 0; >> + D:"EFI_HII_REF" + N:StringIdentifier + { + OpenBracket I:Number CloseBracket << ArrayNum = _STOU32(I->getText()); >> + } + ";" << _PCATCH(gCVfrVarDataTypeDB.DataTypeAddField (N->getText(), D->getText(), ArrayNum), N); >> + ; + dataStructFieldUser : << UINT32 ArrayNum = 0; >> T:StringIdentifier @@ -481,6 +496,7 @@ vfrFormSetDefinition : UINT8 ClassGuidNum = 0; CIfrFormSet *FSObj = NULL; UINT16 C, SC; + CHAR8* InsertOpcodeAddr = NULL; >> L:FormSet Uuid "=" guidDefinition[Guid] "," @@ -497,19 +513,42 @@ vfrFormSetDefinition : "," } << + if (mOverrideClassGuid != NULL && ClassGuidNum >= 3) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Already has 3 class guids, can't add extra class guid!"); + } switch (ClassGuidNum) { case 0: - FSObj = new CIfrFormSet(sizeof(EFI_IFR_FORM_SET) + sizeof(EFI_GUID)); + if (mOverrideClassGuid != NULL) { + ClassGuidNum = 2; + } else { + ClassGuidNum = 1; + } + FSObj = new CIfrFormSet(sizeof(EFI_IFR_FORM_SET) + ClassGuidNum * sizeof(EFI_GUID)); FSObj->SetClassGuid(&DefaultClassGuid); + if (mOverrideClassGuid != NULL) { + FSObj->SetClassGuid(mOverrideClassGuid); + } break; case 1: + if (mOverrideClassGuid != NULL) { + ClassGuidNum ++; + } FSObj = new CIfrFormSet(sizeof(EFI_IFR_FORM_SET) + ClassGuidNum * sizeof(EFI_GUID)); FSObj->SetClassGuid(&ClassGuid1); + if (mOverrideClassGuid != NULL) { + FSObj->SetClassGuid(mOverrideClassGuid); + } break; case 2: + if (mOverrideClassGuid != NULL) { + ClassGuidNum ++; + } FSObj = new CIfrFormSet(sizeof(EFI_IFR_FORM_SET) + ClassGuidNum * sizeof(EFI_GUID)); FSObj->SetClassGuid(&ClassGuid1); FSObj->SetClassGuid(&ClassGuid2); + if (mOverrideClassGuid != NULL) { + FSObj->SetClassGuid(mOverrideClassGuid); + } break; case 3: FSObj = new CIfrFormSet(sizeof(EFI_IFR_FORM_SET) + ClassGuidNum * sizeof(EFI_GUID)); @@ -549,7 +588,38 @@ vfrFormSetDefinition : // _DeclareDefaultFrameworkVarStore (GET_LINENO(E)); } - CRT_END_OP (E); if (FSObj != NULL) delete FSObj; + + // + // Declare undefined Question so that they can be used in expression. + // + if (gCFormPkg.HavePendingUnassigned()) { + mParserStatus += gCFormPkg.DeclarePendingQuestion ( + gCVfrVarDataTypeDB, + mCVfrDataStorage, + mCVfrQuestionDB, + &mFormsetGuid, + E->getLine(), + &InsertOpcodeAddr + ); + gNeedAdjustOpcode = TRUE; + } + + CRT_END_OP (E); + + // + // Adjust the pending question position. + // Move the position from current to before the end of the last form in the form set. + // + if (gNeedAdjustOpcode) { + gCFormPkg.AdjustDynamicInsertOpcode ( + mLastFormEndAddr, + InsertOpcodeAddr + ); + } + + if (FSObj != NULL) { + delete FSObj; + } >> ";" ; @@ -602,7 +672,9 @@ vfrStatementExtension: << TypeName = D->getText(); LineNum = D->getLine(); IsStruct = TRUE;>> | T:"EFI_HII_TIME" {OpenBracket AN8:Number CloseBracket <getText());>>} << TypeName = T->getText(); LineNum = T->getLine(); IsStruct = TRUE;>> - | TN:StringIdentifier {OpenBracket AN9:Number CloseBracket <getText());>>} + | R:"EFI_HII_REF" {OpenBracket AN9:Number CloseBracket <getText());>>} + << TypeName = R->getText(); LineNum = R->getLine(); IsStruct = TRUE;>> + | TN:StringIdentifier {OpenBracket AN10:Number CloseBracket <getText());>>} << TypeName = TN->getText(); LineNum = TN->getLine(); IsStruct = TRUE;>> ) << @@ -794,6 +866,7 @@ vfrStatementVarStoreLinear : | U64:"UINT64" "," << TypeName = U64->getText(); LineNum = U64->getLine(); >> | D:"EFI_HII_DATE" "," << TypeName = D->getText(); LineNum = D->getLine(); >> | T:"EFI_HII_TIME" "," << TypeName = T->getText(); LineNum = T->getLine(); >> + | R:"EFI_HII_REF" "," << TypeName = R->getText(); LineNum = R->getLine(); >> ) { Key "=" FID:Number "," << // Key is used to assign Varid in Framework VFR but no use in UEFI2.1 VFR if (mCompatibleMode) { @@ -827,7 +900,7 @@ vfrStatementVarStoreLinear : VarStoreId ), LineNum); VSObj.SetGuid (&Guid); - _PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId), SN); + _PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId, &Guid), SN); VSObj.SetVarStoreId (VarStoreId); _PCATCH(gCVfrVarDataTypeDB.GetDataTypeSize(TypeName, &Size), LineNum); VSObj.SetSize ((UINT16) Size); @@ -838,22 +911,102 @@ vfrStatementVarStoreLinear : vfrStatementVarStoreEfi : << + BOOLEAN IsUEFI23EfiVarstore = TRUE; EFI_GUID Guid; CIfrVarStoreEfi VSEObj; - EFI_VARSTORE_ID VarStoreId; + EFI_VARSTORE_ID VarStoreId = EFI_VARSTORE_ID_INVALID; UINT32 Attr = 0; + UINT32 Size; + CHAR8 *TypeName; + UINT32 LineNum; + CHAR8 *StoreName = NULL; >> E:Efivarstore << VSEObj.SetLineNo(E->getLine()); >> - SN:StringIdentifier "," + ( + TN:StringIdentifier "," << TypeName = TN->getText(); LineNum = TN->getLine(); >> + | U8:"UINT8" "," << TypeName = U8->getText(); LineNum = U8->getLine(); >> + | U16:"UINT16" "," << TypeName = U16->getText(); LineNum = U16->getLine(); >> + | C16:"CHAR16" "," << TypeName = (CHAR8 *) "UINT16"; LineNum = C16->getLine(); >> + | U32:"UINT32" "," << TypeName = U32->getText(); LineNum = U32->getLine(); >> + | U64:"UINT64" "," << TypeName = U64->getText(); LineNum = U64->getLine(); >> + | D:"EFI_HII_DATE" "," << TypeName = D->getText(); LineNum = D->getLine(); >> + | T:"EFI_HII_TIME" "," << TypeName = T->getText(); LineNum = T->getLine(); >> + | R:"EFI_HII_REF" "," << TypeName = R->getText(); LineNum = R->getLine(); >> + ) + { + VarId "=" ID:Number "," << + _PCATCH( + (INTN)(VarStoreId = _STOU16(ID->getText())) != 0, + (INTN)TRUE, + ID, + "varid 0 is not allowed." + ); + >> + } Attribute "=" vfrVarStoreEfiAttr[Attr] ( "\|" vfrVarStoreEfiAttr[Attr] )* "," << VSEObj.SetAttributes (Attr); >> - Name "=" "STRING_TOKEN" "\(" VN:Number "\)" "," - VarSize "=" N:Number "," - Uuid "=" guidDefinition[Guid] << mCVfrDataStorage.DeclareEfiVarStore (SN->getText(), &Guid, _STOSID(VN->getText()), _STOU32(N->getText())); >> - << - VSEObj.SetGuid (&Guid); - _PCATCH(mCVfrDataStorage.GetVarStoreId(SN->getText(), &VarStoreId), SN); + + ( + Name "=" SN:StringIdentifier "," << StoreName = SN->getText(); >> + | + Name "=" "STRING_TOKEN" "\(" VN:Number "\)" "," + VarSize "=" N:Number "," << + IsUEFI23EfiVarstore = FALSE; + StoreName = gCVfrStringDB.GetVarStoreNameFormStringId(_STOSID(VN->getText())); + if (StoreName == NULL) { + _PCATCH (VFR_RETURN_UNSUPPORTED, VN->getLine(), "Can't get varstore name for this StringId!"); + } + Size = _STOU32(N->getText()); + switch (Size) { + case 1: + TypeName = (CHAR8 *) "UINT8"; + break; + case 2: + TypeName = (CHAR8 *) "UINT16"; + break; + case 4: + TypeName = (CHAR8 *) "UINT32"; + break; + case 8: + TypeName = (CHAR8 *) "UINT64"; + break; + default: + _PCATCH (VFR_RETURN_UNSUPPORTED, N); + break; + } + >> + ) + + Uuid "=" guidDefinition[Guid] << + if (IsUEFI23EfiVarstore) { + _PCATCH(mCVfrDataStorage.DeclareBufferVarStore ( + StoreName, + &Guid, + &gCVfrVarDataTypeDB, + TypeName, + VarStoreId + ), LineNum); + _PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId, &Guid), SN); + _PCATCH(gCVfrVarDataTypeDB.GetDataTypeSize(TypeName, &Size), LineNum); + } else { + _PCATCH(mCVfrDataStorage.DeclareBufferVarStore ( + TN->getText(), + &Guid, + &gCVfrVarDataTypeDB, + TypeName, + VarStoreId + ), LineNum); + _PCATCH(mCVfrDataStorage.GetVarStoreId(TN->getText(), &VarStoreId, &Guid), VN); + _PCATCH(gCVfrVarDataTypeDB.GetDataTypeSize(TypeName, &Size), N->getLine()); + } + VSEObj.SetGuid (&Guid); VSEObj.SetVarStoreId (VarStoreId); + + VSEObj.SetSize ((UINT16) Size); + VSEObj.SetName (StoreName); + if (IsUEFI23EfiVarstore == FALSE && StoreName != NULL) { + delete StoreName; + } >> ";" ; @@ -866,17 +1019,34 @@ vfrStatementVarStoreNameValue : << EFI_GUID Guid; CIfrVarStoreNameValue VSNVObj; - EFI_VARSTORE_ID VarStoreId; + EFI_VARSTORE_ID VarStoreId = EFI_VARSTORE_ID_INVALID; + BOOLEAN Created = FALSE; >> L:NameValueVarStore << VSNVObj.SetLineNo(L->getLine()); >> - SN:StringIdentifier "," << _PCATCH(mCVfrDataStorage.DeclareNameVarStoreBegin (SN->getText()), SN); >> + SN:StringIdentifier "," + { + VarId "=" ID:Number "," << + _PCATCH( + (INTN)(VarStoreId = _STOU16(ID->getText())) != 0, + (INTN)TRUE, + ID, + "varid 0 is not allowed." + ); + >> + } ( - Name "=" "STRING_TOKEN" "\(" N:Number "\)" "," << _PCATCH(mCVfrDataStorage.NameTableAddItem (_STOSID(N->getText())), SN); >> + Name "=" "STRING_TOKEN" "\(" N:Number "\)" "," << + if (!Created) { + _PCATCH(mCVfrDataStorage.DeclareNameVarStoreBegin (SN->getText(), VarStoreId), SN); + Created = TRUE; + } + _PCATCH(mCVfrDataStorage.NameTableAddItem (_STOSID(N->getText())), SN); + >> )+ Uuid "=" guidDefinition[Guid] << _PCATCH(mCVfrDataStorage.DeclareNameVarStoreEnd (&Guid), SN); >> << VSNVObj.SetGuid (&Guid); - _PCATCH(mCVfrDataStorage.GetVarStoreId(SN->getText(), &VarStoreId), SN); + _PCATCH(mCVfrDataStorage.GetVarStoreId(SN->getText(), &VarStoreId, &Guid), SN); VSNVObj.SetVarStoreId (VarStoreId); >> ";" @@ -950,9 +1120,14 @@ vfrStatementHeader[CIfrStatementHeader *SHObj] : vfrQuestionHeader[CIfrQuestionHeader & QHObj, EFI_QUESION_TYPE QType = QUESTION_NORMAL]: << EFI_VARSTORE_INFO Info; + Info.mVarType = EFI_IFR_TYPE_OTHER; + Info.mVarTotalSize = 0; + Info.mInfo.mVarOffset = EFI_VAROFFSET_INVALID; + Info.mVarStoreId = EFI_VARSTORE_ID_INVALID; EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID; CHAR8 *QName = NULL; CHAR8 *VarIdStr = NULL; + mUsedDefaultCount = 0; >> { Name "=" QN:StringIdentifier "," << @@ -978,39 +1153,31 @@ vfrQuestionHeader[CIfrQuestionHeader & QHObj, EFI_QUESION_TYPE QType = QUESTION_ case QUESTION_TIME: mCVfrQuestionDB.RegisterNewTimeQuestion (QName, VarIdStr, QId); break; + case QUESTION_REF: + // + // VarIdStr != NULL stand for question with storagae. + // + if (VarIdStr != NULL) { + mCVfrQuestionDB.RegisterRefQuestion (QName, VarIdStr, QId); + } else { + mCVfrQuestionDB.RegisterQuestion (QName, NULL, QId); + } + break; default: _PCATCH(VFR_RETURN_FATAL_ERROR); } $QHObj.SetQuestionId (QId); - $QHObj.SetVarStoreInfo (&Info); + if (VarIdStr != NULL) { + $QHObj.SetVarStoreInfo (&Info); + } >> vfrStatementHeader[&$QHObj] - << _SAVE_CURRQEST_VARINFO (Info); >> - << if (VarIdStr != NULL) delete VarIdStr; >> - ; - -vfrQuestionHeaderWithNoStorage[CIfrQuestionHeader *QHObj] : - << - EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID; - CHAR8 *QName = NULL; - >> - { - Name "=" QN:StringIdentifier "," << - QName = QN->getText(); - _PCATCH(mCVfrQuestionDB.FindQuestion (QName), VFR_RETURN_UNDEFINED, QN, "has already been used please used anther name"); - >> - } - { - QuestionId "=" ID:Number "," << - QId = _STOQID(ID->getText()); - _PCATCH(mCVfrQuestionDB.FindQuestion (QId), VFR_RETURN_UNDEFINED, ID, "redefined quesiont ID"); - >> - } - << - mCVfrQuestionDB.RegisterQuestion (QName, NULL, QId); - $QHObj->SetQuestionId (QId); + << + if (VarIdStr != NULL) { + delete VarIdStr; + } + _SAVE_CURRQEST_VARINFO (Info); >> - vfrStatementHeader[$QHObj] ; questionheaderFlagsField[UINT8 & Flags] : @@ -1033,6 +1200,7 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl CHAR8 *TName = NULL; EFI_VFR_RETURN_CODE VfrReturnCode = VFR_RETURN_SUCCESS; EFI_IFR_TYPE_VALUE Dummy = gZeroEfiIfrTypeValue; + EFI_GUID *VarGuid = NULL; >> ( SN1:StringIdentifier << SName = SN1->getText(); _STRCAT(&VarIdStr, SN1->getText()); >> @@ -1043,7 +1211,7 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl _STRCAT(&VarIdStr, "]"); >> << - VfrReturnCode = mCVfrDataStorage.GetVarStoreType (SName, VarStoreType); + VfrReturnCode = mCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId); if (mCompatibleMode && VfrReturnCode == VFR_RETURN_UNDEFINED) { mCVfrDataStorage.DeclareBufferVarStore ( SName, @@ -1053,20 +1221,21 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl EFI_VARSTORE_ID_INVALID, FALSE ); - VfrReturnCode = mCVfrDataStorage.GetVarStoreType (SName, VarStoreType); + VfrReturnCode = mCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId, &mFormsetGuid); } if (CheckFlag || VfrReturnCode == VFR_RETURN_SUCCESS) { _PCATCH(VfrReturnCode, SN1); - _PCATCH(mCVfrDataStorage.GetVarStoreId (SName, &$Info.mVarStoreId), SN1); _PCATCH(mCVfrDataStorage.GetNameVarStoreInfo (&$Info, Idx), SN1); } + + QuestVarIdStr = VarIdStr; >> ) | ( SN2:StringIdentifier << SName = SN2->getText(); _STRCAT(&VarIdStr, SName); >> << - VfrReturnCode = mCVfrDataStorage.GetVarStoreType (SName, VarStoreType); + VfrReturnCode = mCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId); if (mCompatibleMode && VfrReturnCode == VFR_RETURN_UNDEFINED) { mCVfrDataStorage.DeclareBufferVarStore ( SName, @@ -1076,13 +1245,13 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl EFI_VARSTORE_ID_INVALID, FALSE ); - VfrReturnCode = mCVfrDataStorage.GetVarStoreType (SName, VarStoreType); + VfrReturnCode = mCVfrDataStorage.GetVarStoreId(SName, &$Info.mVarStoreId, &mFormsetGuid); } if (CheckFlag || VfrReturnCode == VFR_RETURN_SUCCESS) { _PCATCH(VfrReturnCode, SN2); - _PCATCH(mCVfrDataStorage.GetVarStoreId (SName, &$Info.mVarStoreId), SN2); + VarStoreType = mCVfrDataStorage.GetVarStoreType ($Info.mVarStoreId); if (VarStoreType == EFI_VFR_VARSTORE_BUFFER) { - _PCATCH(mCVfrDataStorage.GetBufferVarStoreDataTypeName(SName, &TName), SN2); + _PCATCH(mCVfrDataStorage.GetBufferVarStoreDataTypeName(Info.mVarStoreId, &TName), SN2); _STRCAT(&VarStr, TName); } } @@ -1121,13 +1290,16 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl break; case EFI_VFR_VARSTORE_BUFFER: _PCATCH(gCVfrVarDataTypeDB.GetDataFieldInfo (VarStr, $Info.mInfo.mVarOffset, $Info.mVarType, $Info.mVarTotalSize), SN2->getLine(), VarStr); + VarGuid = mCVfrDataStorage.GetVarStoreGuid($Info.mVarStoreId); _PCATCH((EFI_VFR_RETURN_CODE)gCVfrBufferConfig.Register ( SName, + VarGuid, NULL), SN2->getLine()); _PCATCH((EFI_VFR_RETURN_CODE)gCVfrBufferConfig.Write ( 'a', SName, + VarGuid, NULL, $Info.mVarType, $Info.mInfo.mVarOffset, @@ -1194,6 +1366,9 @@ vfrQuestionDataFieldName [EFI_QUESTION_ID &QId, UINT32 &Mask, CHAR8 *&VarIdStr, ; vfrConstantValueField[UINT8 Type] > [EFI_IFR_TYPE_VALUE Value] : + << + EFI_GUID Guid; + >> N1:Number << switch ($Type) { case EFI_IFR_TYPE_NUM_SIZE_8 : @@ -1216,6 +1391,7 @@ vfrConstantValueField[UINT8 Type] > [EFI_IFR_TYPE_VALUE Value] : break; case EFI_IFR_TYPE_TIME : case EFI_IFR_TYPE_DATE : + case EFI_IFR_TYPE_REF : default : break; } @@ -1227,6 +1403,8 @@ vfrConstantValueField[UINT8 Type] > [EFI_IFR_TYPE_VALUE Value] : | Z:Zero << $Value.u8 = _STOU8(Z->getText()); >> | HOUR:Number ":" MINUTE:Number ":" SECOND:Number << $Value.time = _STOT(HOUR->getText(), MINUTE->getText(), SECOND->getText()); >> | YEAR:Number "/" MONTH:Number "/" DAY:Number << $Value.date = _STOD(YEAR->getText(), MONTH->getText(), DAY->getText()); >> + | QI:Number";" FI:Number";" guidDefinition[Guid] ";" "STRING_TOKEN" "\(" DP:Number "\)" + << $Value.ref = _STOR(QI->getText(), FI->getText(), &Guid, DP->getText()); >> | "STRING_TOKEN" "\(" S1:Number "\)" << $Value.string = _STOSID(S1->getText()); >> ; @@ -1251,7 +1429,8 @@ vfrFormDefinition : vfrStatementBanner | // Just for framework vfr compatibility vfrStatementInvalid | - vfrStatementExtension + vfrStatementExtension | + vfrStatementModal )* E:EndForm << if (mCompatibleMode) { @@ -1267,23 +1446,9 @@ vfrFormDefinition : CIfrLabel LObj3; LObj3.SetLineNo(E->getLine()); LObj3.SetNumber (0xffff); //add end label for UEFI, label number hardcode 0xffff - // - // Declare undefined Question - // - if (gCFormPkg.HavePendingUnassigned()) { - gCFormPkg.DeclarePendingQuestion ( - gCVfrVarDataTypeDB, - mCVfrDataStorage, - mCVfrQuestionDB, - &mFormsetGuid, - E->getLine() - ); - } } - // - // mCVfrQuestionDB.PrintAllQuestion(); - // - CRT_END_OP (E); + + {CIfrEnd EObj; EObj.SetLineNo (E->getLine()); mLastFormEndAddr = EObj.GetObjBinAddr (); gAdjustOpcodeOffset = EObj.GetObjBinOffset ();} >> ";" ; @@ -1310,7 +1475,8 @@ vfrFormMapDefinition : vfrStatementConditional | vfrStatementLabel | vfrStatementBanner | - vfrStatementExtension + vfrStatementExtension | + vfrStatementModal )* E:EndForm << CRT_END_OP (E); >> ";" @@ -1332,42 +1498,72 @@ vfrStatementDefault : << BOOLEAN IsExp = FALSE; EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; - CIfrDefault DObj; + CIfrDefault *DObj = NULL; + CIfrDefault2 *DObj2 = NULL; EFI_DEFAULT_ID DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD; CHAR8 *VarStoreName = NULL; EFI_VFR_VARSTORE_TYPE VarStoreType = EFI_VFR_VARSTORE_INVALID; + UINT32 Size = 0; + EFI_GUID *VarGuid = NULL; >> - D:Default << DObj.SetLineNo(D->getLine()); >> + D:Default ( ( - vfrStatementValue "," << IsExp = TRUE; DObj.SetScope (1); CIfrEnd EndObj1; EndObj1.SetLineNo(D->getLine()); >> - | "=" vfrConstantValueField[_GET_CURRQEST_DATATYPE()] > [Val] "," << + "=" vfrConstantValueField[_GET_CURRQEST_DATATYPE()] > [Val] "," + << if (gCurrentMinMaxData != NULL && gCurrentMinMaxData->IsNumericOpcode()) { //check default value is valid for Numeric Opcode if (Val.u64 < gCurrentMinMaxData->GetMinData(_GET_CURRQEST_DATATYPE()) || Val.u64 > gCurrentMinMaxData->GetMaxData(_GET_CURRQEST_DATATYPE())) { _PCATCH (VFR_RETURN_INVALID_PARAMETER, D->getLine(), "Numeric default value must be between MinValue and MaxValue."); } } - DObj.SetType (_GET_CURRQEST_DATATYPE()); - DObj.SetValue(Val); + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + _PCATCH (VFR_RETURN_FATAL_ERROR, D->getLine(), "Default data type error."); + Size = sizeof (EFI_IFR_TYPE_VALUE); + } else { + _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &Size), D->getLine()); + } + Size += OFFSET_OF (EFI_IFR_DEFAULT, Value); + DObj = new CIfrDefault ((UINT8)Size); + DObj->SetLineNo(D->getLine()); + DObj->SetType (_GET_CURRQEST_DATATYPE()); + DObj->SetValue(Val); >> + | << IsExp = TRUE; DObj2 = new CIfrDefault2; DObj2->SetLineNo(D->getLine()); DObj2->SetScope (1); >> + vfrStatementValue "," << CIfrEnd EndObj1; EndObj1.SetLineNo(D->getLine()); >> ) { - DefaultStore "=" SN:StringIdentifier "," << _PCATCH(mCVfrDefaultStore.GetDefaultId (SN->getText(), &DefaultId), SN); DObj.SetDefaultId (DefaultId); >> + DefaultStore "=" SN:StringIdentifier "," << + _PCATCH(mCVfrDefaultStore.GetDefaultId (SN->getText(), &DefaultId), SN); + if (DObj != NULL) { + DObj->SetDefaultId (DefaultId); + } + + if (DObj2 != NULL) { + DObj2->SetDefaultId (DefaultId); + } + >> } << + CheckDuplicateDefaultValue (DefaultId, D); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), D->getLine()); - _PCATCH(mCVfrDataStorage.GetVarStoreType (VarStoreName, VarStoreType), D->getLine()); + VarGuid = mCVfrDataStorage.GetVarStoreGuid(_GET_CURRQEST_VARTINFO().mVarStoreId); + VarStoreType = mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId); if ((IsExp == FALSE) && (VarStoreType == EFI_VFR_VARSTORE_BUFFER)) { _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( DefaultId, _GET_CURRQEST_VARTINFO(), VarStoreName, + VarGuid, _GET_CURRQEST_DATATYPE (), - Val), - D->getLine() - ); + Val), + D->getLine() + ); + } } + if (DObj != NULL) {delete DObj;} + if (DObj2 != NULL) {delete DObj2;} >> ) ; @@ -1450,8 +1646,14 @@ vfrStatementSubTitle : { "," FLAGS "=" vfrSubtitleFlags[SObj] } - { vfrStatementStatTagList "," } - E:";" << CRT_END_OP (E); >> + ( + {vfrStatementStatTagList "," } + E:";" << CRT_END_OP (E); >> + | + { "," vfrStatementStatTagList} + { "," (vfrStatementStat | vfrStatementQuestions)*} + E: EndSubtitle ";" << CRT_END_OP (E); >> + ) ; vfrSubtitleFlags [CIfrSubtitle & SObj] : @@ -1516,20 +1718,22 @@ vfrStatementCrossReference : vfrStatementGoto : << - UINT8 RefType = 1; + UINT8 RefType = 5; EFI_STRING_ID DevPath = EFI_STRING_ID_INVALID; EFI_GUID FSId = {0,}; EFI_FORM_ID FId; EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID; UINT32 BitMask; CIfrQuestionHeader *QHObj = NULL; + CIfrOpHeader *OHObj = NULL; CIfrRef *R1Obj = NULL; CIfrRef2 *R2Obj = NULL; CIfrRef3 *R3Obj = NULL; CIfrRef4 *R4Obj = NULL; + CIfrRef5 *R5Obj = NULL; >> G:Goto - ( + { ( DevicePath "=" "STRING_TOKEN" "\(" P:Number "\)" "," FormSetGuid "=" guidDefinition[FSId] "," @@ -1558,7 +1762,12 @@ vfrStatementGoto : FormId "=" F3:Number "," << RefType = 2; FId = _STOFID(F3->getText()); >> Question "=" ( - QN3:StringIdentifier "," << mCVfrQuestionDB.GetQuestionId (QN3->getText (), NULL, QId, BitMask); >> + QN3:StringIdentifier "," << + mCVfrQuestionDB.GetQuestionId (QN3->getText (), NULL, QId, BitMask); + if (QId == EFI_QUESTION_ID_INVALID) { + _PCATCH(VFR_RETURN_UNDEFINED, QN3); + } + >> | QN4:Number "," << QId = _STOQID(QN4->getText()); >> ) ) @@ -1569,13 +1778,22 @@ vfrStatementGoto : FId = _STOFID(F4->getText()); >> ) - ) + } << switch (RefType) { + case 5: + { + R5Obj = new CIfrRef5; + QHObj = R5Obj; + OHObj = R5Obj; + R5Obj->SetLineNo(G->getLine()); + break; + } case 4: { R4Obj = new CIfrRef4; QHObj = R4Obj; + OHObj = R4Obj; R4Obj->SetLineNo(G->getLine()); R4Obj->SetDevicePath (DevPath); R4Obj->SetFormSetId (FSId); @@ -1587,6 +1805,7 @@ vfrStatementGoto : { R3Obj = new CIfrRef3; QHObj = R3Obj; + OHObj = R3Obj; R3Obj->SetLineNo(G->getLine()); R3Obj->SetFormSetId (FSId); R3Obj->SetFormId (FId); @@ -1597,15 +1816,17 @@ vfrStatementGoto : { R2Obj = new CIfrRef2; QHObj = R2Obj; + OHObj = R2Obj; R2Obj->SetLineNo(G->getLine()); R2Obj->SetFormId (FId); - _PCATCH(R2Obj->SetQuestionId (QId), QN3); + R2Obj->SetQuestionId (QId); break; } case 1: { R1Obj = new CIfrRef; QHObj = R1Obj; + OHObj = R1Obj; R1Obj->SetLineNo(G->getLine()); R1Obj->SetFormId (FId); break; @@ -1613,13 +1834,20 @@ vfrStatementGoto : default: break; } >> - vfrQuestionHeaderWithNoStorage[QHObj] - { "," vfrStatementStatTagList } + vfrQuestionHeader[*QHObj, QUESTION_REF] << + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + _GET_CURRQEST_VARTINFO().mVarType = EFI_IFR_TYPE_REF; + } + >> { "," F:FLAGS "=" vfrGotoFlags[QHObj, F->getLine()] } { "," Key "=" KN:Number << AssignQuestionKey (*QHObj, KN); >> } - ";" << if (R1Obj != NULL) {delete R1Obj;} if (R2Obj != NULL) {delete R2Obj;} if (R3Obj != NULL) {delete R3Obj;} if (R4Obj != NULL) {delete R4Obj;} >> + { + E:"," + vfrStatementQuestionOptionList << OHObj->SetScope(1); CRT_END_OP (E);>> + } + ";" << if (R1Obj != NULL) {delete R1Obj;} if (R2Obj != NULL) {delete R2Obj;} if (R3Obj != NULL) {delete R3Obj;} if (R4Obj != NULL) {delete R4Obj;} if (R5Obj != NULL) {delete R5Obj;}>> ; vfrGotoFlags [CIfrQuestionHeader *QHObj, UINT32 LineNum] : @@ -1679,49 +1907,62 @@ vfrStatementCheckBox : EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; CHAR8 *VarStoreName = NULL; UINT32 DataTypeSize; + EFI_GUID *VarStoreGuid = NULL; >> L:CheckBox << CBObj.SetLineNo(L->getLine()); >> vfrQuestionHeader[CBObj] "," << //check data type - _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "CheckBox varid is not the valid data type"); - if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { - _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "CheckBox varid doesn't support array"); - } else if ((mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId) == EFI_VFR_VARSTORE_BUFFER) && - (_GET_CURRQEST_VARSIZE() != sizeof (BOOLEAN))) { - _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "CheckBox varid only support BOOLEAN data type"); + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + _GET_CURRQEST_VARTINFO().mVarType = EFI_IFR_TYPE_BOOLEAN; + } + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "CheckBox varid is not the valid data type"); + if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "CheckBox varid doesn't support array"); + } else if ((mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId) == EFI_VFR_VARSTORE_BUFFER) && + (_GET_CURRQEST_VARSIZE() != sizeof (BOOLEAN))) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "CheckBox varid only support BOOLEAN data type"); + } } >> { F:FLAGS "=" vfrCheckBoxFlags[CBObj, F->getLine()] "," << - _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), VFR_RETURN_SUCCESS, L, "Failed to retrieve varstore name"); - Val.b = TRUE; - if (CBObj.GetFlags () & 0x01) { - _PCATCH( - mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( - EFI_HII_DEFAULT_CLASS_STANDARD, - _GET_CURRQEST_VARTINFO(), - VarStoreName, - _GET_CURRQEST_DATATYPE (), - Val - ), - VFR_RETURN_SUCCESS, - L, - "No standard default storage found" - ); - } - if (CBObj.GetFlags () & 0x02) { - _PCATCH( - mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( - EFI_HII_DEFAULT_CLASS_MANUFACTURING, - _GET_CURRQEST_VARTINFO(), - VarStoreName, - _GET_CURRQEST_DATATYPE (), - Val - ), - VFR_RETURN_SUCCESS, - L, - "No manufacturing default storage found" - ); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), VFR_RETURN_SUCCESS, L, "Failed to retrieve varstore name"); + VarStoreGuid = mCVfrDataStorage.GetVarStoreGuid(_GET_CURRQEST_VARTINFO().mVarStoreId); + Val.b = TRUE; + if (CBObj.GetFlags () & 0x01) { + CheckDuplicateDefaultValue (EFI_HII_DEFAULT_CLASS_STANDARD, F); + _PCATCH( + mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( + EFI_HII_DEFAULT_CLASS_STANDARD, + _GET_CURRQEST_VARTINFO(), + VarStoreName, + VarStoreGuid, + _GET_CURRQEST_DATATYPE (), + Val + ), + VFR_RETURN_SUCCESS, + L, + "No standard default storage found" + ); + } + if (CBObj.GetFlags () & 0x02) { + CheckDuplicateDefaultValue (EFI_HII_DEFAULT_CLASS_MANUFACTURING, F); + _PCATCH( + mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( + EFI_HII_DEFAULT_CLASS_MANUFACTURING, + _GET_CURRQEST_VARTINFO(), + VarStoreName, + VarStoreGuid, + _GET_CURRQEST_DATATYPE (), + Val + ), + VFR_RETURN_SUCCESS, + L, + "No manufacturing default storage found" + ); + } } >> } @@ -1792,7 +2033,7 @@ checkboxFlagsField[UINT8 & LFlags, UINT8 & HFlags] : vfrStatementAction : << CIfrAction AObj; >> L:Action << AObj.SetLineNo(L->getLine()); >> - vfrQuestionHeaderWithNoStorage[&AObj] "," + vfrQuestionHeader[AObj] "," { F:FLAGS "=" vfrActionFlags[AObj, F->getLine()] "," } Config "=" "STRING_TOKEN" "\(" S:Number "\)" "," << AObj.SetQuestionConfig (_STOSID(S->getText())); >> vfrStatementQuestionTagList @@ -1817,11 +2058,16 @@ vfrStatementDate : CHAR8 *VarIdStr[3] = {NULL, }; CIfrDate DObj; EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; + UINT8 Size = OFFSET_OF (EFI_IFR_DEFAULT, Value) + sizeof (EFI_HII_DATE); >> L:Date << DObj.SetLineNo(L->getLine()); >> ( ( - vfrQuestionHeader[DObj, QUESTION_DATE] "," + vfrQuestionHeader[DObj, QUESTION_DATE] "," << + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + _GET_CURRQEST_VARTINFO().mVarType = EFI_IFR_TYPE_DATE; + } + >> { F:FLAGS "=" vfrDateFlags[DObj, F->getLine()] "," } vfrStatementQuestionOptionList ) @@ -1844,6 +2090,7 @@ vfrStatementDate : Prompt "=" "STRING_TOKEN" "\(" DP:Number "\)" "," Help "=" "STRING_TOKEN" "\(" DH:Number "\)" "," minMaxDateStepDefault[Val.date, 2] + { G:FLAGS "=" vfrDateFlags[DObj, G->getLine()] "," } << mCVfrQuestionDB.RegisterOldDateQuestion (VarIdStr[0], VarIdStr[1], VarIdStr[2], QId); DObj.SetQuestionId (QId); @@ -1852,7 +2099,7 @@ vfrStatementDate : DObj.SetHelp (_STOSID(YH->getText())); if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; } >> - << {CIfrDefault DefaultObj(EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_DATE, Val); DefaultObj.SetLineNo(L->getLine());} >> + << {CIfrDefault DefaultObj(Size, EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_DATE, Val); DefaultObj.SetLineNo(L->getLine());} >> ) ( vfrStatementInconsistentIf )* ) @@ -1980,23 +2227,47 @@ vfrSetMinMaxStep[CIfrMinMaxStepData & MMSDObj] : vfrStatementNumeric : << CIfrNumeric NObj; - UINT32 DataTypeSize; + UINT32 DataTypeSize; + BOOLEAN IsSupported = TRUE; + UINT8 ShrinkSize = 0; >> L:Numeric << NObj.SetLineNo(L->getLine()); >> vfrQuestionHeader[NObj] "," << // check data type - _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "Numeric varid is not the valid data type"); - if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { - _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Numeric varid doesn't support array"); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "Numeric varid is not the valid data type"); + if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Numeric varid doesn't support array"); + } + _PCATCH(NObj.SetFlags (NObj.FLAGS(), _GET_CURRQEST_DATATYPE()), L->getLine()); } - _PCATCH(NObj.SetFlags (NObj.FLAGS(), _GET_CURRQEST_DATATYPE()), L->getLine()); >> { F:FLAGS "=" vfrNumericFlags[NObj, F->getLine()] "," } { Key "=" KN:Number "," << AssignQuestionKey (NObj, KN); >> } - vfrSetMinMaxStep[NObj] + vfrSetMinMaxStep[NObj] << + switch (_GET_CURRQEST_DATATYPE()) { + // + // Base on the type to know the actual used size,shrink the buffer + // size allocate before. + // + case EFI_IFR_TYPE_NUM_SIZE_8: ShrinkSize = 21;break; + case EFI_IFR_TYPE_NUM_SIZE_16:ShrinkSize = 18;break; + case EFI_IFR_TYPE_NUM_SIZE_32:ShrinkSize = 12;break; + case EFI_IFR_TYPE_NUM_SIZE_64:break; + default: + IsSupported = FALSE; + break; + } + NObj.ShrinkBinSize (ShrinkSize); + if (!IsSupported) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "Numeric question only support UINT8, UINT16, UINT32 and UINT64 data type."); + } + >> vfrStatementQuestionOptionList - E:EndNumeric << CRT_END_OP (E); >> + E:EndNumeric << + CRT_END_OP (E); + >> ";" ; @@ -2005,32 +2276,37 @@ vfrNumericFlags [CIfrNumeric & NObj, UINT32 LineNum] : UINT8 LFlags = _GET_CURRQEST_DATATYPE() & EFI_IFR_NUMERIC_SIZE; UINT8 HFlags = 0; EFI_VFR_VARSTORE_TYPE VarStoreType = EFI_VFR_VARSTORE_INVALID; + BOOLEAN IsSetType = FALSE; >> - numericFlagsField[HFlags, LFlags] ( "\|" numericFlagsField[HFlags, LFlags] )* + numericFlagsField[HFlags, LFlags, IsSetType] ( "\|" numericFlagsField[HFlags, LFlags, IsSetType] )* << //check data type flag - VarStoreType = mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId); - if (VarStoreType == EFI_VFR_VARSTORE_BUFFER || VarStoreType == EFI_VFR_VARSTORE_EFI) { - if (_GET_CURRQEST_DATATYPE() != (LFlags & EFI_IFR_NUMERIC_SIZE)) { - _PCATCH(VFR_RETURN_INVALID_PARAMETER, LineNum, "Numeric Flag is not same to Numeric VarData type"); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + VarStoreType = mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId); + if (VarStoreType == EFI_VFR_VARSTORE_BUFFER || VarStoreType == EFI_VFR_VARSTORE_EFI) { + if (_GET_CURRQEST_DATATYPE() != (LFlags & EFI_IFR_NUMERIC_SIZE)) { + _PCATCH(VFR_RETURN_INVALID_PARAMETER, LineNum, "Numeric Flag is not same to Numeric VarData type"); + } + } else { + // update data type for name/value store + UINT32 DataTypeSize; + _GET_CURRQEST_VARTINFO().mVarType = LFlags & EFI_IFR_NUMERIC_SIZE; + gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize); + _GET_CURRQEST_VARTINFO().mVarTotalSize = DataTypeSize; } - } else { - // update data type for name/value store - UINT32 DataTypeSize; + } else if (IsSetType){ _GET_CURRQEST_VARTINFO().mVarType = LFlags & EFI_IFR_NUMERIC_SIZE; - gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize); - _GET_CURRQEST_VARTINFO().mVarTotalSize = DataTypeSize; } _PCATCH(NObj.SetFlags (HFlags, LFlags), LineNum); >> ; -numericFlagsField [UINT8 & HFlags, UINT8 & LFlags] : +numericFlagsField [UINT8 & HFlags, UINT8 & LFlags, BOOLEAN & IsSetType] : N:Number << _PCATCH(_STOU8(N->getText()) == 0 ? VFR_RETURN_SUCCESS : VFR_RETURN_UNSUPPORTED, N->getLine()); >> - | "NUMERIC_SIZE_1" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_1; >> - | "NUMERIC_SIZE_2" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_2; >> - | "NUMERIC_SIZE_4" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_4; >> - | "NUMERIC_SIZE_8" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_8; >> + | "NUMERIC_SIZE_1" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_1; IsSetType = TRUE;>> + | "NUMERIC_SIZE_2" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_2; IsSetType = TRUE;>> + | "NUMERIC_SIZE_4" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_4; IsSetType = TRUE;>> + | "NUMERIC_SIZE_8" << $LFlags = ($LFlags & ~EFI_IFR_NUMERIC_SIZE) | EFI_IFR_NUMERIC_SIZE_8; IsSetType = TRUE;>> | "DISPLAY_INT_DEC" << $LFlags = ($LFlags & ~EFI_IFR_DISPLAY) | EFI_IFR_DISPLAY_INT_DEC; >> | "DISPLAY_UINT_DEC" << $LFlags = ($LFlags & ~EFI_IFR_DISPLAY) | EFI_IFR_DISPLAY_UINT_DEC; >> | "DISPLAY_UINT_HEX" << $LFlags = ($LFlags & ~EFI_IFR_DISPLAY) | EFI_IFR_DISPLAY_UINT_HEX; >> @@ -2041,21 +2317,46 @@ vfrStatementOneOf : << CIfrOneOf OObj; UINT32 DataTypeSize; + BOOLEAN IsSupported = TRUE; + UINT8 ShrinkSize = 0; >> L:OneOf << OObj.SetLineNo(L->getLine()); >> vfrQuestionHeader[OObj] "," << //check data type - _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "OneOf varid is not the valid data type"); - if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { - _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "OneOf varid doesn't support array"); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + _PCATCH (gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize), L->getLine(), "OneOf varid is not the valid data type"); + if (DataTypeSize != 0 && DataTypeSize != _GET_CURRQEST_VARSIZE()) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "OneOf varid doesn't support array"); + } + _PCATCH(OObj.SetFlags (OObj.FLAGS(), _GET_CURRQEST_DATATYPE()), L->getLine()); } - _PCATCH(OObj.SetFlags (OObj.FLAGS(), _GET_CURRQEST_DATATYPE()), L->getLine()); >> { F:FLAGS "=" vfrOneofFlagsField[OObj, F->getLine()] "," } { vfrSetMinMaxStep[OObj] } + << + switch (_GET_CURRQEST_DATATYPE()) { + // + // Base on the type to know the actual used size,shrink the buffer + // size allocate before. + // + case EFI_IFR_TYPE_NUM_SIZE_8: ShrinkSize = 21;break; + case EFI_IFR_TYPE_NUM_SIZE_16:ShrinkSize = 18;break; + case EFI_IFR_TYPE_NUM_SIZE_32:ShrinkSize = 12;break; + case EFI_IFR_TYPE_NUM_SIZE_64:break; + default: + IsSupported = FALSE; + break; + } + OObj.ShrinkBinSize (ShrinkSize); + if (!IsSupported) { + _PCATCH (VFR_RETURN_INVALID_PARAMETER, L->getLine(), "OneOf question only support UINT8, UINT16, UINT32 and UINT64 data type."); + } + >> vfrStatementQuestionOptionList - E:EndOneOf << CRT_END_OP (E); >> + E:EndOneOf << + CRT_END_OP (E); + >> ";" ; @@ -2064,21 +2365,26 @@ vfrOneofFlagsField [CIfrOneOf & OObj, UINT32 LineNum] : UINT8 LFlags = _GET_CURRQEST_DATATYPE() & EFI_IFR_NUMERIC_SIZE; UINT8 HFlags = 0; EFI_VFR_VARSTORE_TYPE VarStoreType = EFI_VFR_VARSTORE_INVALID; + BOOLEAN IsSetType = FALSE; >> - numericFlagsField[HFlags, LFlags] ( "\|" numericFlagsField[HFlags, LFlags] )* + numericFlagsField[HFlags, LFlags, IsSetType] ( "\|" numericFlagsField[HFlags, LFlags, IsSetType] )* << //check data type flag - VarStoreType = mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId); - if (VarStoreType == EFI_VFR_VARSTORE_BUFFER || VarStoreType == EFI_VFR_VARSTORE_EFI) { - if (_GET_CURRQEST_DATATYPE() != (LFlags & EFI_IFR_NUMERIC_SIZE)) { - _PCATCH(VFR_RETURN_INVALID_PARAMETER, LineNum, "Numeric Flag is not same to Numeric VarData type"); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + VarStoreType = mCVfrDataStorage.GetVarStoreType (_GET_CURRQEST_VARTINFO().mVarStoreId); + if (VarStoreType == EFI_VFR_VARSTORE_BUFFER || VarStoreType == EFI_VFR_VARSTORE_EFI) { + if (_GET_CURRQEST_DATATYPE() != (LFlags & EFI_IFR_NUMERIC_SIZE)) { + _PCATCH(VFR_RETURN_INVALID_PARAMETER, LineNum, "Numeric Flag is not same to Numeric VarData type"); + } + } else { + // update data type for Name/Value store + UINT32 DataTypeSize; + _GET_CURRQEST_VARTINFO().mVarType = LFlags & EFI_IFR_NUMERIC_SIZE; + gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize); + _GET_CURRQEST_VARTINFO().mVarTotalSize = DataTypeSize; } - } else { - // update data type for Name/Value store - UINT32 DataTypeSize; + } else if (IsSetType){ _GET_CURRQEST_VARTINFO().mVarType = LFlags & EFI_IFR_NUMERIC_SIZE; - gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &DataTypeSize); - _GET_CURRQEST_VARTINFO().mVarTotalSize = DataTypeSize; } _PCATCH(OObj.SetFlags (HFlags, LFlags), LineNum); >> @@ -2243,11 +2549,16 @@ vfrStatementTime : CHAR8 *VarIdStr[3] = {NULL, }; CIfrTime TObj; EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; + UINT8 Size = OFFSET_OF (EFI_IFR_DEFAULT, Value) + sizeof (EFI_HII_TIME); >> L:Time << TObj.SetLineNo(L->getLine()); >> ( ( - vfrQuestionHeader[TObj, QUESTION_TIME] "," + vfrQuestionHeader[TObj, QUESTION_TIME] "," << + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + _GET_CURRQEST_VARTINFO().mVarType = EFI_IFR_TYPE_TIME; + } + >> { F:FLAGS "=" vfrTimeFlags[TObj, F->getLine()] "," } vfrStatementQuestionOptionList ) @@ -2270,6 +2581,7 @@ vfrStatementTime : Prompt "=" "STRING_TOKEN" "\(" SP:Number "\)" "," Help "=" "STRING_TOKEN" "\(" SH:Number "\)" "," minMaxTimeStepDefault[Val.time, 2] + { G:FLAGS "=" vfrTimeFlags[TObj, G->getLine()] "," } << mCVfrQuestionDB.RegisterOldTimeQuestion (VarIdStr[0], VarIdStr[1], VarIdStr[2], QId); TObj.SetQuestionId (QId); @@ -2278,7 +2590,7 @@ vfrStatementTime : TObj.SetHelp (_STOSID(HH->getText())); if (VarIdStr[0] != NULL) { delete VarIdStr[0]; } if (VarIdStr[1] != NULL) { delete VarIdStr[1]; } if (VarIdStr[2] != NULL) { delete VarIdStr[2]; } >> - << {CIfrDefault DefaultObj(EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_TIME, Val); DefaultObj.SetLineNo(L->getLine());} >> + << {CIfrDefault DefaultObj(Size, EFI_HII_DEFAULT_CLASS_STANDARD, EFI_IFR_TYPE_TIME, Val); DefaultObj.SetLineNo(L->getLine());} >> ) ( vfrStatementInconsistentIf )* ) @@ -2339,7 +2651,9 @@ vfrStatementQuestionTag : vfrStatementDisableIfQuest | vfrStatementRefresh | vfrStatementVarstoreDevice | - vfrStatementExtension + vfrStatementExtension | + vfrStatementRefreshEvent | + vfrStatementWarningIf ; vfrStatementQuestionTagList : @@ -2490,6 +2804,11 @@ vfrLockedTag : L:Locked << LObj.SetLineNo(L->getLine()); >> ; +vfrModalTag : + << CIfrModal MObj; >> + L:Modal << MObj.SetLineNo(L->getLine()); >> + ; + vfrStatementStatTag : vfrImageTag | vfrLockedTag @@ -2504,6 +2823,11 @@ vfrStatementImage : ";" ; +vfrStatementModal : + vfrModalTag + ";" + ; + vfrStatementLocked : vfrLockedTag ";" @@ -2527,6 +2851,15 @@ vfrStatementNoSubmitIf : E:EndIf << CRT_END_OP (E); >> ; +vfrStatementWarningIf : + << CIfrWarningIf WIObj; >> + L:WarningIf << WIObj.SetLineNo(L->getLine()); >> + Prompt "=" "STRING_TOKEN" "\(" S:Number "\)" "," << WIObj.SetWarning (_STOSID(S->getText())); >> + {Timeout "=" T:Number "," << WIObj.SetTimeOut (_STOU8(T->getText())); >>} + vfrStatementExpression[0] + E:EndIf << CRT_END_OP (E); >> + ; + vfrStatementDisableIfQuest : << CIfrDisableIf DIObj; @@ -2543,6 +2876,15 @@ vfrStatementRefresh : Interval "=" I:Number << RObj.SetRefreshInterval (_STOU8(I->getText())); >> ; +vfrStatementRefreshEvent : + << + CIfrRefreshId RiObj; + EFI_GUID Guid; + >> + L:RefreshGuid << RiObj.SetLineNo(L->getLine()); >> + "=" guidDefinition[Guid] "," << RiObj.SetRefreshEventGroutId (&Guid); >> + ; + vfrStatementVarstoreDevice : << CIfrVarStoreDevice VDObj; >> L:VarstoreDevice << VDObj.SetLineNo(L->getLine()); >> @@ -2573,11 +2915,32 @@ vfrStatementOptions : vfrStatementOneOfOption : << - EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; - CIfrOneOfOption OOOObj; + EFI_IFR_TYPE_VALUE Val = gZeroEfiIfrTypeValue; CHAR8 *VarStoreName = NULL; + UINT32 Size = 0; + BOOLEAN TypeError = FALSE; + EFI_VFR_RETURN_CODE ReturnCode = VFR_RETURN_SUCCESS; + EFI_GUID *VarStoreGuid = NULL; + + if (_GET_CURRQEST_DATATYPE() == EFI_IFR_TYPE_OTHER) { + TypeError = TRUE; + Size = sizeof (EFI_IFR_TYPE_VALUE); + } else { + ReturnCode = gCVfrVarDataTypeDB.GetDataTypeSize (_GET_CURRQEST_DATATYPE(), &Size); + } + + Size += OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value); + CIfrOneOfOption OOOObj ((UINT8)Size); >> - L:Option << OOOObj.SetLineNo(L->getLine()); >> + L:Option << + OOOObj.SetLineNo(L->getLine()); + if (TypeError) { + _PCATCH (VFR_RETURN_FATAL_ERROR, L->getLine(), "Get data type error."); + } + if (ReturnCode != VFR_RETURN_SUCCESS) { + _PCATCH (ReturnCode, L->getLine()); + } + >> Text "=" "STRING_TOKEN" "\(" S:Number "\)" "," << OOOObj.SetOption (_STOSID(S->getText())); >> Value "=" vfrConstantValueField[_GET_CURRQEST_DATATYPE()] >[Val] "," << @@ -2606,24 +2969,31 @@ vfrStatementOneOfOption : >> F:FLAGS "=" vfrOneOfOptionFlags[OOOObj, F->getLine()] << - _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), L->getLine()); - if (OOOObj.GetFlags () & 0x10) { - _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( - EFI_HII_DEFAULT_CLASS_STANDARD, - _GET_CURRQEST_VARTINFO(), - VarStoreName, - _GET_CURRQEST_DATATYPE (), - Val - ), L->getLine()); - } - if (OOOObj.GetFlags () & 0x20) { - _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( - EFI_HII_DEFAULT_CLASS_MANUFACTURING, - _GET_CURRQEST_VARTINFO(), - VarStoreName, - _GET_CURRQEST_DATATYPE (), - Val - ), L->getLine()); + if (_GET_CURRQEST_VARTINFO().mVarStoreId != EFI_VARSTORE_ID_INVALID) { + _PCATCH(mCVfrDataStorage.GetVarStoreName (_GET_CURRQEST_VARTINFO().mVarStoreId, &VarStoreName), L->getLine()); + VarStoreGuid = mCVfrDataStorage.GetVarStoreGuid(_GET_CURRQEST_VARTINFO().mVarStoreId); + if (OOOObj.GetFlags () & 0x10) { + CheckDuplicateDefaultValue (EFI_HII_DEFAULT_CLASS_STANDARD, F); + _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( + EFI_HII_DEFAULT_CLASS_STANDARD, + _GET_CURRQEST_VARTINFO(), + VarStoreName, + VarStoreGuid, + _GET_CURRQEST_DATATYPE (), + Val + ), L->getLine()); + } + if (OOOObj.GetFlags () & 0x20) { + CheckDuplicateDefaultValue (EFI_HII_DEFAULT_CLASS_MANUFACTURING, F); + _PCATCH(mCVfrDefaultStore.BufferVarStoreAltConfigAdd ( + EFI_HII_DEFAULT_CLASS_MANUFACTURING, + _GET_CURRQEST_VARTINFO(), + VarStoreName, + VarStoreGuid, + _GET_CURRQEST_DATATYPE (), + Val + ), L->getLine()); + } } >> { @@ -2811,6 +3181,7 @@ vfrStatementInvalidSaveRestoreDefaults : #token QuestionRefVal("questionrefval") "questionrefval" #token StringRefVal("stringrefval") "stringrefval" #token Map("map") "map" +#token RefreshGuid("refreshguid") "refreshguid" // // Root expression extension function called by other function. @@ -3016,7 +3387,7 @@ vfrExpressionBuildInFunction [UINT32 & RootLevel, UINT32 & ExpOpCount] : | ideqvalExp[$RootLevel, $ExpOpCount] | ideqidExp[$RootLevel, $ExpOpCount] | ideqvallistExp[$RootLevel, $ExpOpCount] - | questionref13Exp[$RootLevel, $ExpOpCount] + | questionref1Exp[$RootLevel, $ExpOpCount] | rulerefExp[$RootLevel, $ExpOpCount] | stringref1Exp[$RootLevel, $ExpOpCount] | pushthisExp[$RootLevel, $ExpOpCount] @@ -3035,8 +3406,8 @@ vareqvalExp [UINT32 & RootLevel, UINT32 & ExpOpCount] : UINT16 ConstVal; CHAR8 *VarIdStr; UINT32 LineNo; - EFI_VFR_VARSTORE_TYPE VarStoreType = EFI_VFR_VARSTORE_INVALID; EFI_VFR_RETURN_CODE VfrReturnCode = VFR_RETURN_SUCCESS; + EFI_VARSTORE_ID VarStoreId = EFI_VARSTORE_ID_INVALID; >> L:VarEqVal << if (!mCompatibleMode) { @@ -3047,7 +3418,7 @@ vareqvalExp [UINT32 & RootLevel, UINT32 & ExpOpCount] : OpenParen VN:Number << VarIdStr = NULL; _STRCAT(&VarIdStr, VK->getText()); _STRCAT(&VarIdStr, VN->getText()); - VfrReturnCode = mCVfrDataStorage.GetVarStoreType (VarIdStr, VarStoreType); + VfrReturnCode = mCVfrDataStorage.GetVarStoreId (VarIdStr, &VarStoreId); if (VfrReturnCode == VFR_RETURN_UNDEFINED) { _PCATCH (mCVfrDataStorage.DeclareEfiVarStore ( VarIdStr, @@ -3251,50 +3622,26 @@ ideqvallistExp[UINT32 & RootLevel, UINT32 & ExpOpCount] : >> ; -questionref13Exp[UINT32 & RootLevel, UINT32 & ExpOpCount] : +questionref1Exp[UINT32 & RootLevel, UINT32 & ExpOpCount] : << - UINT8 Type = 0x1; - EFI_STRING_ID DevPath = EFI_STRING_ID_INVALID; - EFI_GUID Guid = {0,}; EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID; UINT32 BitMask; CHAR8 *QName = NULL; UINT32 LineNo = 0; >> L:QuestionRef - ( - ( - << Type = 0x3; >> - { - Path "=" "STRING_TOKEN" "\(" S:Number "\)" << Type = 0x4; DevPath = _STOSID(S->getText()); >> - } - { - Uuid "=" guidDefinition[Guid] << Type = 0x5; >> - } - ) - | - ( - "\(" - ( + "\(" + ( QN:StringIdentifier << QName = QN->getText(); - LineNo = QN->getLine(); + LineNo = QN->getLine(); mCVfrQuestionDB.GetQuestionId (QN->getText(), NULL, QId, BitMask); >> | ID:Number << QId = _STOQID(ID->getText()); >> ) - "\)" - ) - ) + "\)" << - switch (Type) { - case 0x1: {CIfrQuestionRef1 QR1Obj(L->getLine()); _SAVE_OPHDR_COND (QR1Obj, ($ExpOpCount == 0), L->getLine()); QR1Obj.SetQuestionId (QId, QName, LineNo); break;} - case 0x3: {CIfrQuestionRef3 QR3Obj(L->getLine()); _SAVE_OPHDR_COND (QR3Obj, ($ExpOpCount == 0), L->getLine()); break;} - case 0x4: {CIfrQuestionRef3_2 QR3_2Obj(L->getLine()); _SAVE_OPHDR_COND (QR3_2Obj, ($ExpOpCount == 0), L->getLine()); QR3_2Obj.SetDevicePath (DevPath); break;} - case 0x5: {CIfrQuestionRef3_3 QR3_3Obj(L->getLine()); _SAVE_OPHDR_COND (QR3_3Obj, ($ExpOpCount == 0), L->getLine()); QR3_3Obj.SetDevicePath (DevPath); QR3_3Obj.SetGuid (&Guid); break;} - } - $ExpOpCount++; - >> + { CIfrQuestionRef1 QR1Obj(L->getLine()); _SAVE_OPHDR_COND (QR1Obj, ($ExpOpCount == 0), L->getLine()); QR1Obj.SetQuestionId (QId, QName, LineNo); } $ExpOpCount++; >> ; rulerefExp[UINT32 & RootLevel, UINT32 & ExpOpCount] : @@ -3426,9 +3773,10 @@ vfrExpressionConstant[UINT32 & RootLevel, UINT32 & ExpOpCount] : vfrExpressionUnaryOp[UINT32 & RootLevel, UINT32 & ExpOpCount] : lengthExp[$RootLevel, $ExpOpCount] | bitwisenotExp[$RootLevel, $ExpOpCount] - | question2refExp[$RootLevel, $ExpOpCount] + | question23refExp[$RootLevel, $ExpOpCount] | stringref2Exp[$RootLevel, $ExpOpCount] | toboolExp[$RootLevel, $ExpOpCount] + | tostringExp[$RootLevel, $ExpOpCount] | unintExp[$RootLevel, $ExpOpCount] | toupperExp[$RootLevel, $ExpOpCount] | tolwerExp[$RootLevel, $ExpOpCount] @@ -3447,10 +3795,30 @@ bitwisenotExp[UINT32 & RootLevel, UINT32 & ExpOpCount] : << { CIfrBitWiseNot BWNObj(L->getLine()); $ExpOpCount++; } >> ; -question2refExp[UINT32 & RootLevel, UINT32 & ExpOpCount] : +question23refExp[UINT32 & RootLevel, UINT32 & ExpOpCount] : + << + UINT8 Type = 0x1; + EFI_STRING_ID DevPath = EFI_STRING_ID_INVALID; + EFI_GUID Guid = {0,}; + >> L:QuestionRefVal - "\(" vfrStatementExpressionSub[$RootLevel + 1, $ExpOpCount] "\)" - << { CIfrQuestionRef2 QR2Obj(L->getLine()); $ExpOpCount++; } >> + "\(" + { + DevicePath "=" "STRING_TOKEN" "\(" S:Number "\)" "," << Type = 0x2; DevPath = _STOSID(S->getText()); >> + } + { + Uuid "=" guidDefinition[Guid] "," << Type = 0x3; >> + } + vfrStatementExpressionSub[$RootLevel + 1, $ExpOpCount] + "\)" + << + switch (Type) { + case 0x1: {CIfrQuestionRef2 QR2Obj(L->getLine()); _SAVE_OPHDR_COND (QR2Obj, ($ExpOpCount == 0), L->getLine()); break;} + case 0x2: {CIfrQuestionRef3_2 QR3_2Obj(L->getLine()); _SAVE_OPHDR_COND (QR3_2Obj, ($ExpOpCount == 0), L->getLine()); QR3_2Obj.SetDevicePath (DevPath); break;} + case 0x3: {CIfrQuestionRef3_3 QR3_3Obj(L->getLine()); _SAVE_OPHDR_COND (QR3_3Obj, ($ExpOpCount == 0), L->getLine()); QR3_3Obj.SetDevicePath (DevPath); QR3_3Obj.SetGuid (&Guid); break;} + } + $ExpOpCount++; + >> ; stringref2Exp[UINT32 & RootLevel, UINT32 & ExpOpCount] : @@ -3687,6 +4055,14 @@ private: EFI_VARSTORE_INFO mCurrQestVarInfo; + EFI_GUID *mOverrideClassGuid; + CHAR8* mLastFormEndAddr; + +// +// Whether the question already has default value. +// + UINT16 mUsedDefaultArray[EFI_IFR_MAX_DEFAULT_TYPE]; + UINT16 mUsedDefaultCount; // // For framework vfr compatibility @@ -3702,6 +4078,7 @@ private: UINT8 _GET_CURRQEST_DATATYPE (); UINT32 _GET_CURRQEST_VARSIZE (); UINT32 _GET_CURRQEST_ARRAY_SIZE(); + VOID CheckDuplicateDefaultValue (IN EFI_DEFAULT_ID, IN ANTLRTokenPtr); public: VOID _PCATCH (IN INTN, IN INTN, IN ANTLRTokenPtr, IN CONST CHAR8 *); @@ -3720,6 +4097,7 @@ public: UINT64 _STOU64 (IN CHAR8 *); EFI_HII_DATE _STOD (IN CHAR8 *, IN CHAR8 *, IN CHAR8 *); EFI_HII_TIME _STOT (IN CHAR8 *, IN CHAR8 *, IN CHAR8 *); + EFI_HII_REF _STOR (IN CHAR8 *, IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *); EFI_STRING_ID _STOSID (IN CHAR8 *); EFI_FORM_ID _STOFID (IN CHAR8 *); @@ -3737,6 +4115,7 @@ public: VOID IdEqValDoSpecial (IN UINT32 &, IN UINT32, IN EFI_QUESTION_ID, IN CHAR8 *, IN UINT32, IN UINT16, IN EFI_COMPARE_TYPE); VOID IdEqIdDoSpecial (IN UINT32 &, IN UINT32, IN EFI_QUESTION_ID, IN CHAR8 *, IN UINT32, IN EFI_QUESTION_ID, IN CHAR8 *, IN UINT32, IN EFI_COMPARE_TYPE); VOID IdEqListDoSpecial (IN UINT32 &, IN UINT32, IN EFI_QUESTION_ID, IN CHAR8 *, IN UINT32, IN UINT16, IN UINT16 *); + VOID SetOverrideClassGuid (IN EFI_GUID *); // // For framework vfr compatibility // @@ -4158,6 +4537,25 @@ EfiVfrParser::_STRCAT ( *Dest = NewStr; } +EFI_HII_REF +EfiVfrParser::_STOR ( + IN CHAR8 *QuestionId, + IN CHAR8 *FormId, + IN EFI_GUID *FormSetGuid, + IN CHAR8 *DevicePath + ) +{ + EFI_HII_REF Ref; + UINT32 Index; + + memcpy (&Ref.FormSetGuid, FormSetGuid, sizeof (EFI_GUID)); + Ref.QuestionId = _STOQID (QuestionId); + Ref.FormId = _STOFID (FormId); + Ref.DevicePath = _STOSID (DevicePath); + + return Ref; +} + // // framework vfr to default declare varstore for each structure // @@ -4225,6 +4623,9 @@ EfiVfrParser::_DeclareDefaultFrameworkVarStore ( VSEObj.SetAttributes (0x00000002); //hardcode EFI_VARIABLE_BOOTSERVICE_ACCESS attribute VSEObj.SetGuid (&pNode->mGuid); VSEObj.SetVarStoreId (pNode->mVarStoreId); + // Generate old efi varstore storage structure for compatiable with old "VarEqVal" opcode, + // which is 3 bytes less than new structure define in UEFI Spec 2.3.1. + VSEObj.SetBinaryLength (sizeof (EFI_IFR_VARSTORE_EFI) - 3); #ifdef VFREXP_DEBUG printf ("undefined Efi VarStoreName is %s and Id is 0x%x\n", pNode->mVarStoreName, pNode->mVarStoreId); #endif @@ -4261,7 +4662,7 @@ EfiVfrParser::_DeclareDefaultLinearVarStore ( TypeNameList[Index], EFI_VARSTORE_ID_INVALID ); - mCVfrDataStorage.GetVarStoreId(TypeNameList[Index], &VarStoreId); + mCVfrDataStorage.GetVarStoreId(TypeNameList[Index], &VarStoreId, &mFormsetGuid); VSObj.SetVarStoreId (VarStoreId); gCVfrVarDataTypeDB.GetDataTypeSize(TypeNameList[Index], &Size); VSObj.SetSize ((UINT16) Size); @@ -4286,7 +4687,7 @@ EfiVfrParser::_DeclareDefaultLinearVarStore ( (CHAR8 *) DateType, EFI_VARSTORE_ID_INVALID ); - mCVfrDataStorage.GetVarStoreId((CHAR8 *) DateName, &VarStoreId); + mCVfrDataStorage.GetVarStoreId((CHAR8 *) DateName, &VarStoreId, &mFormsetGuid); VSObj.SetVarStoreId (VarStoreId); gCVfrVarDataTypeDB.GetDataTypeSize((CHAR8 *) DateType, &Size); VSObj.SetSize ((UINT16) Size); @@ -4307,7 +4708,7 @@ EfiVfrParser::_DeclareDefaultLinearVarStore ( (CHAR8 *) TimeType, EFI_VARSTORE_ID_INVALID ); - mCVfrDataStorage.GetVarStoreId((CHAR8 *) TimeName, &VarStoreId); + mCVfrDataStorage.GetVarStoreId((CHAR8 *) TimeName, &VarStoreId, &mFormsetGuid); VSObj.SetVarStoreId (VarStoreId); gCVfrVarDataTypeDB.GetDataTypeSize((CHAR8 *) TimeType, &Size); VSObj.SetSize ((UINT16) Size); @@ -4523,6 +4924,12 @@ EfiVfrParser::IdEqListDoSpecial ( } } +VOID +EfiVfrParser::SetOverrideClassGuid (IN EFI_GUID *OverrideClassGuid) +{ + mOverrideClassGuid = OverrideClassGuid; +} + // // For framework vfr compatibility // @@ -4532,4 +4939,25 @@ EfiVfrParser::SetCompatibleMode (IN BOOLEAN Mode) mCompatibleMode = Mode; mCVfrQuestionDB.SetCompatibleMode (Mode); } + +VOID +EfiVfrParser::CheckDuplicateDefaultValue ( + IN EFI_DEFAULT_ID DefaultId, + IN ANTLRTokenPtr Tok + ) +{ + UINT16 Index; + + for(Index = 0; Index < mUsedDefaultCount; Index++) { + if (mUsedDefaultArray[Index] == DefaultId) { + gCVfrErrorHandle.HandleWarning (VFR_WARNING_DEFAULT_VALUE_REDEFINED, Tok->getLine(), Tok->getText()); + } + } + + if (mUsedDefaultCount >= EFI_IFR_MAX_DEFAULT_TYPE - 1) { + gCVfrErrorHandle.HandleError (VFR_RETURN_FATAL_ERROR, Tok->getLine(), Tok->getText()); + } + + mUsedDefaultArray[mUsedDefaultCount++] = DefaultId; +} >>