\r
The definition of CFormPkg's member function\r
\r
-Copyright (c) 2004 - 2008, Intel Corporation \r
+Copyright (c) 2004 - 2010, Intel Corporation \r
All rights reserved. This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
CHAR8 *mMsg;\r
struct SPendingAssign *mNext;\r
\r
- SPendingAssign (IN CHAR8 *, IN VOID *, IN UINT32, IN UINT32, IN CHAR8 *);\r
+ SPendingAssign (IN CHAR8 *, IN VOID *, IN UINT32, IN UINT32, IN CONST CHAR8 *);\r
~SPendingAssign ();\r
\r
VOID SetAddrAndLen (IN VOID *, IN UINT32);\r
\r
UINT32 mPkgLength;\r
\r
- VOID _WRITE_PKG_LINE (IN FILE *, IN UINT32 , IN CHAR8 *, IN CHAR8 *, IN UINT32);\r
- VOID _WRITE_PKG_END (IN FILE *, IN UINT32 , IN CHAR8 *, IN CHAR8 *, IN UINT32);\r
+ VOID _WRITE_PKG_LINE (IN FILE *, IN UINT32 , IN CONST CHAR8 *, IN CHAR8 *, IN UINT32);\r
+ VOID _WRITE_PKG_END (IN FILE *, IN UINT32 , IN CONST CHAR8 *, IN CHAR8 *, IN UINT32);\r
\r
private:\r
SPendingAssign *PendingAssignList;\r
EFI_VFR_RETURN_CODE GenCFile (IN CHAR8 *, IN FILE *, IN PACKAGE_DATA *PkgData = NULL);\r
\r
public:\r
- EFI_VFR_RETURN_CODE AssignPending (IN CHAR8 *, IN VOID *, IN UINT32, IN UINT32, IN CHAR8 *Msg = NULL);\r
+ EFI_VFR_RETURN_CODE AssignPending (IN CHAR8 *, IN VOID *, IN UINT32, IN UINT32, IN CONST CHAR8 *Msg = NULL);\r
VOID DoPendingAssign (IN CHAR8 *, IN VOID *, IN UINT32);\r
bool HavePendingUnassigned (VOID);\r
VOID PendingAssignPrintAll (VOID);\r
/*\r
* The definition of CIfrObj\r
*/\r
-extern bool gCreateOp;\r
+extern BOOLEAN gCreateOp;\r
\r
class CIfrObj {\r
private:\r
- bool mDelayEmit;\r
+ BOOLEAN mDelayEmit;\r
\r
CHAR8 *mObjBinBuf;\r
UINT8 mObjBinLen;\r
\r
inline bool ExpendObjBin (IN UINT8 Size) {\r
if ((mDelayEmit == TRUE) && ((mObjBinLen + Size) > mObjBinLen)) {\r
- mObjBinLen += Size;\r
+ mObjBinLen = mObjBinLen + Size;\r
return TRUE;\r
} else {\r
return FALSE;\r
\r
VOID IncLength (UINT8 Size) {\r
if ((mHeader->Length + Size) > mHeader->Length) {\r
- mHeader->Length += Size;\r
+ mHeader->Length = mHeader->Length + Size;\r
}\r
}\r
\r
}\r
};\r
\r
-static CIfrQuestionHeader *gCurrentQuestion = NULL;\r
-static CIfrObj *gCurrentIfrOpcode = NULL;\r
-\r
/*\r
* The definition of CIfrMinMaxStepData\r
*/\r
class CIfrMinMaxStepData {\r
private:\r
MINMAXSTEP_DATA *mMinMaxStepData;\r
+ BOOLEAN ValueIsSet;\r
+ BOOLEAN IsNumeric;\r
\r
public:\r
- CIfrMinMaxStepData (MINMAXSTEP_DATA *DataAddr) : mMinMaxStepData (DataAddr) {\r
+ CIfrMinMaxStepData (MINMAXSTEP_DATA *DataAddr, BOOLEAN NumericOpcode=FALSE) : mMinMaxStepData (DataAddr) {\r
mMinMaxStepData->u64.MinValue = 0;\r
mMinMaxStepData->u64.MaxValue = 0;\r
mMinMaxStepData->u64.Step = 0;\r
+ ValueIsSet = FALSE;\r
+ IsNumeric = NumericOpcode;\r
}\r
\r
VOID SetMinMaxStepData (IN UINT64 MinValue, IN UINT64 MaxValue, IN UINT64 Step) {\r
- mMinMaxStepData->u64.MinValue = MinValue;\r
- mMinMaxStepData->u64.MaxValue = MaxValue;\r
- mMinMaxStepData->u64.Step = Step;\r
+ if (!ValueIsSet) {\r
+ mMinMaxStepData->u64.MinValue = MinValue;\r
+ mMinMaxStepData->u64.MaxValue = MaxValue;\r
+ ValueIsSet = TRUE;\r
+ } else {\r
+ if (MinValue < mMinMaxStepData->u64.MinValue) {\r
+ mMinMaxStepData->u64.MinValue = MinValue;\r
+ }\r
+ if (MaxValue > mMinMaxStepData->u64.MaxValue) {\r
+ mMinMaxStepData->u64.MaxValue = MaxValue;\r
+ }\r
+ }\r
+ mMinMaxStepData->u64.Step = Step;\r
}\r
\r
VOID SetMinMaxStepData (IN UINT32 MinValue, IN UINT32 MaxValue, IN UINT32 Step) {\r
- mMinMaxStepData->u32.MinValue = MinValue;\r
- mMinMaxStepData->u32.MaxValue = MaxValue;\r
- mMinMaxStepData->u32.Step = Step;\r
+ if (!ValueIsSet) {\r
+ mMinMaxStepData->u32.MinValue = MinValue;\r
+ mMinMaxStepData->u32.MaxValue = MaxValue;\r
+ ValueIsSet = TRUE;\r
+ } else {\r
+ if (MinValue < mMinMaxStepData->u32.MinValue) {\r
+ mMinMaxStepData->u32.MinValue = MinValue;\r
+ }\r
+ if (MaxValue > mMinMaxStepData->u32.MaxValue) {\r
+ mMinMaxStepData->u32.MaxValue = MaxValue;\r
+ }\r
+ }\r
+ mMinMaxStepData->u32.Step = Step;\r
}\r
\r
VOID SetMinMaxStepData (IN UINT16 MinValue, IN UINT16 MaxValue, IN UINT16 Step) {\r
- mMinMaxStepData->u16.MinValue = MinValue;\r
- mMinMaxStepData->u16.MaxValue = MaxValue;\r
- mMinMaxStepData->u16.Step = Step;\r
+ if (!ValueIsSet) {\r
+ mMinMaxStepData->u16.MinValue = MinValue;\r
+ mMinMaxStepData->u16.MaxValue = MaxValue;\r
+ ValueIsSet = TRUE;\r
+ } else {\r
+ if (MinValue < mMinMaxStepData->u16.MinValue) {\r
+ mMinMaxStepData->u16.MinValue = MinValue;\r
+ }\r
+ if (MaxValue > mMinMaxStepData->u16.MaxValue) {\r
+ mMinMaxStepData->u16.MaxValue = MaxValue;\r
+ }\r
+ }\r
+ mMinMaxStepData->u16.Step = Step;\r
}\r
\r
VOID SetMinMaxStepData (IN UINT8 MinValue, IN UINT8 MaxValue, IN UINT8 Step) {\r
- mMinMaxStepData->u8.MinValue = MinValue;\r
- mMinMaxStepData->u8.MaxValue = MaxValue;\r
- mMinMaxStepData->u8.Step = Step;\r
+ if (!ValueIsSet) {\r
+ mMinMaxStepData->u8.MinValue = MinValue;\r
+ mMinMaxStepData->u8.MaxValue = MaxValue;\r
+ ValueIsSet = TRUE;\r
+ } else {\r
+ if (MinValue < mMinMaxStepData->u8.MinValue) {\r
+ mMinMaxStepData->u8.MinValue = MinValue;\r
+ }\r
+ if (MaxValue > mMinMaxStepData->u8.MaxValue) {\r
+ mMinMaxStepData->u8.MaxValue = MaxValue;\r
+ }\r
+ }\r
+ mMinMaxStepData->u8.Step = Step;\r
+ }\r
+\r
+ UINT64 GetMinData (UINT8 VarType) {\r
+ UINT64 MinValue = 0;\r
+ switch (VarType) {\r
+ case EFI_IFR_TYPE_NUM_SIZE_64:\r
+ MinValue = mMinMaxStepData->u64.MinValue;\r
+ break;\r
+ case EFI_IFR_TYPE_NUM_SIZE_32:\r
+ MinValue = (UINT64) mMinMaxStepData->u32.MinValue;\r
+ break;\r
+ case EFI_IFR_TYPE_NUM_SIZE_16:\r
+ MinValue = (UINT64) mMinMaxStepData->u16.MinValue;\r
+ break;\r
+ case EFI_IFR_TYPE_NUM_SIZE_8:\r
+ MinValue = (UINT64) mMinMaxStepData->u8.MinValue;\r
+ break;\r
+ default:\r
+ break;\r
+ }\r
+ return MinValue;\r
+ }\r
+\r
+ UINT64 GetMaxData (UINT8 VarType) {\r
+ UINT64 MaxValue = 0;\r
+ switch (VarType) {\r
+ case EFI_IFR_TYPE_NUM_SIZE_64:\r
+ MaxValue = mMinMaxStepData->u64.MaxValue;\r
+ break;\r
+ case EFI_IFR_TYPE_NUM_SIZE_32:\r
+ MaxValue = (UINT64) mMinMaxStepData->u32.MaxValue;\r
+ break;\r
+ case EFI_IFR_TYPE_NUM_SIZE_16:\r
+ MaxValue = (UINT64) mMinMaxStepData->u16.MaxValue;\r
+ break;\r
+ case EFI_IFR_TYPE_NUM_SIZE_8:\r
+ MaxValue = (UINT64) mMinMaxStepData->u8.MaxValue;\r
+ break;\r
+ default:\r
+ break;\r
+ }\r
+ return MaxValue;\r
+ }\r
+\r
+ UINT64 GetStepData (UINT8 VarType) {\r
+ UINT64 MaxValue = 0;\r
+ switch (VarType) {\r
+ case EFI_IFR_TYPE_NUM_SIZE_64:\r
+ MaxValue = mMinMaxStepData->u64.Step;\r
+ break;\r
+ case EFI_IFR_TYPE_NUM_SIZE_32:\r
+ MaxValue = (UINT64) mMinMaxStepData->u32.Step;\r
+ break;\r
+ case EFI_IFR_TYPE_NUM_SIZE_16:\r
+ MaxValue = (UINT64) mMinMaxStepData->u16.Step;\r
+ break;\r
+ case EFI_IFR_TYPE_NUM_SIZE_8:\r
+ MaxValue = (UINT64) mMinMaxStepData->u8.Step;\r
+ break;\r
+ default:\r
+ break;\r
+ }\r
+ return MaxValue;\r
}\r
\r
+ BOOLEAN IsNumericOpcode () {\r
+ return IsNumeric;\r
+ }\r
};\r
\r
+static CIfrQuestionHeader *gCurrentQuestion = NULL;\r
+static CIfrMinMaxStepData *gCurrentMinMaxData = NULL;\r
+\r
/*\r
* The definition of all of the UEFI IFR Objects\r
*/\r
class CIfrFormSet : public CIfrObj, public CIfrOpHeader {\r
private:\r
EFI_IFR_FORM_SET *mFormSet;\r
+ EFI_GUID *mClassGuid;\r
\r
public:\r
CIfrFormSet (UINT8 Size) : CIfrObj (EFI_IFR_FORM_SET_OP, (CHAR8 **)&mFormSet, Size),\r
mFormSet->FormSetTitle = EFI_STRING_ID_INVALID;\r
mFormSet->Flags = 0;\r
memset (&mFormSet->Guid, 0, sizeof (EFI_GUID));\r
+ mClassGuid = (EFI_GUID *) (mFormSet + 1);\r
}\r
\r
VOID SetGuid (IN EFI_GUID *Guid) {\r
}\r
\r
VOID SetClassGuid (IN EFI_GUID *Guid) {\r
- memcpy (&(mFormSet->ClassGuid[mFormSet->Flags++]), Guid, sizeof (EFI_GUID));\r
+ memcpy (&(mClassGuid[mFormSet->Flags++]), Guid, sizeof (EFI_GUID));\r
}\r
\r
UINT8 GetFlags() {\r
#define EFI_FORM_ID_MAX 0xFFFF\r
#define EFI_FREE_FORM_ID_BITMAP_SIZE ((EFI_FORM_ID_MAX + 1) / EFI_BITS_PER_UINT32)\r
\r
-class CIfrForm : public CIfrObj, public CIfrOpHeader {\r
-private:\r
- EFI_IFR_FORM *mForm;\r
-\r
+class CIfrFormId {\r
+public:\r
STATIC UINT32 FormIdBitMap[EFI_FREE_FORM_ID_BITMAP_SIZE];\r
\r
STATIC BOOLEAN ChekFormIdFree (IN EFI_FORM_ID FormId) {\r
\r
FormIdBitMap[Index] |= (0x80000000 >> Offset);\r
}\r
+};\r
+\r
+class CIfrForm : public CIfrObj, public CIfrOpHeader {\r
+private:\r
+ EFI_IFR_FORM *mForm;\r
\r
public:\r
CIfrForm () : CIfrObj (EFI_IFR_FORM_OP, (CHAR8 **)&mForm), \r
//\r
return VFR_RETURN_INVALID_PARAMETER;\r
}\r
- if (CIfrForm::ChekFormIdFree (FormId) == FALSE) {\r
+ if (CIfrFormId::ChekFormIdFree (FormId) == FALSE) {\r
return VFR_RETURN_FORMID_REDEFINED;\r
}\r
mForm->FormId = FormId;\r
- CIfrForm::MarkFormIdUsed (FormId);\r
+ CIfrFormId::MarkFormIdUsed (FormId);\r
return VFR_RETURN_SUCCESS;\r
}\r
\r
}\r
};\r
\r
+class CIfrFormMap : public CIfrObj, public CIfrOpHeader {\r
+private:\r
+ EFI_IFR_FORM_MAP *mFormMap;\r
+ EFI_IFR_FORM_MAP_METHOD *mMethodMap;\r
+\r
+public:\r
+ CIfrFormMap () : CIfrObj (EFI_IFR_FORM_MAP_OP, (CHAR8 **)&mFormMap, sizeof (EFI_IFR_FORM_MAP), TRUE), \r
+ CIfrOpHeader (EFI_IFR_FORM_MAP_OP, &mFormMap->Header) {\r
+ mFormMap->FormId = 0;\r
+ mMethodMap = (EFI_IFR_FORM_MAP_METHOD *) (mFormMap + 1);\r
+ }\r
+\r
+ EFI_VFR_RETURN_CODE SetFormId (IN EFI_FORM_ID FormId) {\r
+ if (FormId == 0) {\r
+ //\r
+ // FormId can't be 0.\r
+ //\r
+ return VFR_RETURN_INVALID_PARAMETER;\r
+ }\r
+ if (CIfrFormId::ChekFormIdFree (FormId) == FALSE) {\r
+ return VFR_RETURN_FORMID_REDEFINED;\r
+ }\r
+ mFormMap->FormId = FormId;\r
+ CIfrFormId::MarkFormIdUsed (FormId);\r
+ return VFR_RETURN_SUCCESS;\r
+ }\r
+\r
+ VOID SetFormMapMethod (IN EFI_STRING_ID MethodTitle, IN EFI_GUID *MethodGuid) {\r
+ if (ExpendObjBin (sizeof (EFI_IFR_FORM_MAP_METHOD))) {\r
+ IncLength (sizeof (EFI_IFR_FORM_MAP_METHOD));\r
+\r
+ mMethodMap->MethodTitle = MethodTitle;\r
+ memcpy (&(mMethodMap->MethodIdentifier), MethodGuid, sizeof (EFI_GUID));\r
+ mMethodMap ++;\r
+ }\r
+ }\r
+};\r
+\r
class CIfrVarStore : public CIfrObj, public CIfrOpHeader {\r
private:\r
EFI_IFR_VARSTORE *mVarStore;\r
UINT8 Len;\r
\r
if (Name != NULL) {\r
- Len = strlen (Name);\r
+ Len = (UINT8) strlen (Name);\r
if (Len != 0) {\r
if (ExpendObjBin (Len) == TRUE) {\r
IncLength (Len);\r
\r
};\r
\r
+class CIfrRead : public CIfrObj, public CIfrOpHeader{\r
+private:\r
+ EFI_IFR_READ *mRead;\r
+\r
+public:\r
+ CIfrRead () : CIfrObj (EFI_IFR_READ_OP, (CHAR8 **)&mRead),\r
+ CIfrOpHeader (EFI_IFR_READ_OP, &mRead->Header) {}\r
+\r
+};\r
+\r
+class CIfrWrite : public CIfrObj, public CIfrOpHeader{\r
+private:\r
+ EFI_IFR_WRITE *mWrite;\r
+\r
+public:\r
+ CIfrWrite () : CIfrObj (EFI_IFR_WRITE_OP, (CHAR8 **)&mWrite),\r
+ CIfrOpHeader (EFI_IFR_WRITE_OP, &mWrite->Header) {}\r
+\r
+};\r
+\r
+class CIfrGet : public CIfrObj, public CIfrOpHeader{\r
+private:\r
+ EFI_IFR_GET *mGet;\r
+\r
+public:\r
+ CIfrGet (\r
+ IN UINT32 LineNo \r
+ ) : CIfrObj (EFI_IFR_GET_OP, (CHAR8 **)&mGet),\r
+ CIfrOpHeader (EFI_IFR_GET_OP, &mGet->Header) {\r
+ SetLineNo (LineNo);\r
+ }\r
+\r
+ VOID SetVarInfo (IN EFI_VARSTORE_INFO *Info) {\r
+ mGet->VarStoreId = Info->mVarStoreId;\r
+ mGet->VarStoreInfo.VarName = Info->mInfo.mVarName;\r
+ mGet->VarStoreInfo.VarOffset = Info->mInfo.mVarOffset;\r
+ mGet->VarStoreType = Info->mVarType;\r
+ }\r
+};\r
+\r
+class CIfrSet : public CIfrObj, public CIfrOpHeader{\r
+private:\r
+ EFI_IFR_SET *mSet;\r
+\r
+public:\r
+ CIfrSet (\r
+ IN UINT32 LineNo\r
+ ) : CIfrObj (EFI_IFR_SET_OP, (CHAR8 **)&mSet),\r
+ CIfrOpHeader (EFI_IFR_SET_OP, &mSet->Header) {\r
+ SetLineNo (LineNo);\r
+ }\r
+\r
+ VOID SetVarInfo (IN EFI_VARSTORE_INFO *Info) {\r
+ mSet->VarStoreId = Info->mVarStoreId;\r
+ mSet->VarStoreInfo.VarName = Info->mInfo.mVarName;\r
+ mSet->VarStoreInfo.VarOffset = Info->mInfo.mVarOffset;\r
+ mSet->VarStoreType = Info->mVarType;\r
+ }\r
+};\r
+\r
class CIfrSubtitle : public CIfrObj, public CIfrOpHeader, public CIfrStatementHeader {\r
private:\r
EFI_IFR_SUBTITLE *mSubtitle;\r
CIfrNumeric () : CIfrObj (EFI_IFR_NUMERIC_OP, (CHAR8 **)&mNumeric),\r
CIfrOpHeader (EFI_IFR_NUMERIC_OP, &mNumeric->Header),\r
CIfrQuestionHeader (&mNumeric->Question),\r
- CIfrMinMaxStepData (&mNumeric->data) {\r
+ CIfrMinMaxStepData (&mNumeric->data, TRUE) {\r
mNumeric->Flags = EFI_IFR_NUMERIC_SIZE_1 | EFI_IFR_DISPLAY_UINT_DEC;\r
- gCurrentQuestion = this;\r
- gCurrentIfrOpcode = this;\r
+ gCurrentQuestion = this;\r
+ gCurrentMinMaxData = this;\r
}\r
\r
~CIfrNumeric () {\r
- gCurrentQuestion = NULL;\r
- gCurrentIfrOpcode = NULL;\r
+ gCurrentQuestion = NULL;\r
+ gCurrentMinMaxData = NULL;\r
}\r
\r
EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, IN UINT8 LFlags) {\r
CIfrQuestionHeader (&mOneOf->Question),\r
CIfrMinMaxStepData (&mOneOf->data) {\r
mOneOf->Flags = 0;\r
- gCurrentQuestion = this;\r
- gCurrentIfrOpcode = this;\r
+ gCurrentQuestion = this;\r
+ gCurrentMinMaxData = this;\r
}\r
\r
~CIfrOneOf () {\r
- gCurrentQuestion = NULL;\r
- gCurrentIfrOpcode = NULL;\r
+ gCurrentQuestion = NULL;\r
+ gCurrentMinMaxData = NULL;\r
}\r
\r
EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, IN UINT8 LFlags) {\r
\r
class CIfrEqIdList : public CIfrObj, public CIfrOpHeader {\r
private:\r
- EFI_IFR_EQ_ID_LIST *mEqIdVList;\r
+ EFI_IFR_EQ_ID_VAL_LIST *mEqIdVList;\r
\r
public:\r
CIfrEqIdList (\r
IN UINT32 LineNo\r
- ) : CIfrObj (EFI_IFR_EQ_ID_LIST_OP, (CHAR8 **)&mEqIdVList, sizeof (EFI_IFR_EQ_ID_LIST), TRUE),\r
+ ) : CIfrObj (EFI_IFR_EQ_ID_LIST_OP, (CHAR8 **)&mEqIdVList, sizeof (EFI_IFR_EQ_ID_VAL_LIST), TRUE),\r
CIfrOpHeader (EFI_IFR_EQ_ID_LIST_OP, &mEqIdVList->Header) {\r
SetLineNo (LineNo);\r
mEqIdVList->QuestionId = EFI_QUESTION_ID_INVALID;\r
VOID UpdateIfrBuffer ( \r
) {\r
_EMIT_PENDING_OBJ();\r
- mEqIdVList = (EFI_IFR_EQ_ID_LIST *) GetObjBinAddr();\r
+ mEqIdVList = (EFI_IFR_EQ_ID_VAL_LIST *) GetObjBinAddr();\r
UpdateHeader (&mEqIdVList->Header);\r
}\r
\r
}\r
};\r
\r
+class CIfrSecurity : public CIfrObj, public CIfrOpHeader {\r
+private:\r
+ EFI_IFR_SECURITY *mSecurity;\r
+\r
+public:\r
+ CIfrSecurity (\r
+ IN UINT32 LineNo\r
+ ) : CIfrObj (EFI_IFR_SECURITY_OP, (CHAR8 **)&mSecurity),\r
+ CIfrOpHeader (EFI_IFR_SECURITY_OP, &mSecurity->Header) {\r
+ SetLineNo (LineNo);\r
+ memset (&mSecurity->Permissions, 0, sizeof (EFI_GUID));\r
+ }\r
+\r
+ VOID SetPermissions (IN EFI_GUID *Permissions) {\r
+ memcpy (&mSecurity->Permissions, Permissions, sizeof (EFI_GUID));\r
+ }\r
+};\r
+\r
class CIfrUint8 : public CIfrObj, public CIfrOpHeader {\r
private:\r
EFI_IFR_UINT8 *mUint8;\r
}\r
};\r
\r
+class CIfrMap : public CIfrObj, public CIfrOpHeader{\r
+private:\r
+ EFI_IFR_MAP *mMap;\r
+\r
+public:\r
+ CIfrMap (\r
+ IN UINT32 LineNo \r
+ ) : CIfrObj (EFI_IFR_MAP_OP, (CHAR8 **)&mMap),\r
+ CIfrOpHeader (EFI_IFR_MAP_OP, &mMap->Header) {\r
+ SetLineNo (LineNo);\r
+ }\r
+};\r
+\r
class CIfrMatch : public CIfrObj, public CIfrOpHeader {\r
private:\r
EFI_IFR_MATCH *mMatch;\r
projects / mirror_edk2.git / blobdiff