\r
The definition of CFormPkg's member function\r
\r
-Copyright (c) 2004 - 2008, Intel Corporation \r
-All rights reserved. This program and the accompanying materials \r
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
+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
http://opensource.org/licenses/bsd-license.php \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
struct SBufferNode *mNext;\r
};\r
\r
+typedef struct {\r
+ BOOLEAN CompatibleMode;\r
+ EFI_GUID *OverrideClassGuid;\r
+} INPUT_INFO_TO_SYNTAX;\r
+\r
class CFormPkg {\r
private:\r
UINT32 mBufferSize;\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
+ SBufferNode * GetBinBufferNodeForAddr (IN CHAR8 *);\r
+ SBufferNode * CreateNewNode ();\r
+ SBufferNode * GetNodeBefore (IN SBufferNode *);\r
+ EFI_VFR_RETURN_CODE InsertNodeBefore (IN SBufferNode *, IN SBufferNode *);\r
\r
private:\r
SPendingAssign *PendingAssignList;\r
\r
public:\r
- CFormPkg (IN UINT32 BufferSize);\r
+ CFormPkg (IN UINT32 BufferSize = 4096);\r
~CFormPkg ();\r
\r
CHAR8 * IfrBinBufferGet (IN UINT32);\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
IN CVfrDataStorage &lCVfrDataStorage,\r
IN CVfrQuestionDB &lCVfrQuestionDB,\r
IN EFI_GUID *LocalFormSetGuid,\r
- IN UINT32 LineNo\r
+ IN UINT32 LineNo,\r
+ OUT CHAR8 **InsertOpcodeAddr\r
+ );\r
+ EFI_VFR_RETURN_CODE AdjustDynamicInsertOpcode (\r
+ IN CHAR8 *LastFormEndAddr,\r
+ IN CHAR8 *InsertOpcodeAddr\r
+ );\r
+ CHAR8 * GetBufAddrBaseOnOffset (\r
+ IN UINT32 Offset\r
);\r
};\r
\r
-extern CFormPkg gCFormPkg;\r
+extern CFormPkg gCFormPkg;\r
+extern CVfrStringDB gCVfrStringDB;\r
+extern UINT32 gAdjustOpcodeOffset;\r
+extern BOOLEAN gNeedAdjustOpcode;\r
\r
struct SIfrRecord {\r
UINT32 mLineNo;\r
mSwitch = FALSE;\r
}\r
\r
+ SIfrRecord * GetRecordInfoFromOffset (IN UINT32);\r
+ VOID IfrAdjustOffsetForRecord (VOID);\r
+ BOOLEAN IfrAdjustDynamicOpcodeInRecords (VOID);\r
+\r
UINT32 IfrRecordRegister (IN UINT32, IN CHAR8 *, IN UINT8, IN UINT32);\r
VOID IfrRecordInfoUpdate (IN UINT32, IN UINT32, IN CHAR8*, IN UINT8, IN UINT32);\r
VOID IfrRecordOutput (IN FILE *, IN UINT32 LineNo);\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
return mObjBinBuf;\r
}\r
\r
+ inline UINT32 GetObjBinOffset (VOID) {\r
+ return mPkgOffset;\r
+ }\r
+\r
inline UINT8 GetObjBinLen (VOID) {\r
return mObjBinLen;\r
}\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
+ }\r
+\r
+ inline bool ShrinkObjBin (IN UINT8 Size) {\r
+ if ((mDelayEmit == TRUE) && (mObjBinLen > Size)) {\r
+ 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
VOID DecLength (UINT8 Size) {\r
if (mHeader->Length >= Size) {\r
- mHeader -= Size;\r
+ mHeader->Length -= Size;\r
}\r
}\r
\r
VOID VARSTORE_INFO (OUT EFI_VARSTORE_INFO *Info) {\r
if (Info != NULL) {\r
Info->mVarStoreId = mHeader->VarStoreId;\r
- memcpy (&Info->mVarStoreId, &mHeader->VarStoreInfo, sizeof (Info->mVarStoreId));\r
+ memmove (&Info->mVarStoreId, &mHeader->VarStoreInfo, sizeof (Info->mVarStoreId));\r
}\r
}\r
\r
\r
VOID SetVarStoreInfo (IN EFI_VARSTORE_INFO *Info) {\r
mHeader->VarStoreId = Info->mVarStoreId;\r
- mHeader->VarStoreInfo.VarName = Info->mInfo.mVarName;\r
+ mHeader->VarStoreInfo.VarName = Info->mInfo.mVarName;\r
mHeader->VarStoreInfo.VarOffset = Info->mInfo.mVarOffset;\r
}\r
\r
\r
return _FLAGS_ZERO (Flags) ? VFR_RETURN_SUCCESS : VFR_RETURN_FLAGS_UNSUPPORTED;\r
}\r
-};\r
\r
-static CIfrQuestionHeader *gCurrentQuestion = NULL;\r
+ VOID UpdateCIfrQuestionHeader (IN EFI_IFR_QUESTION_HEADER *Header) {\r
+ mHeader = Header;\r
+ }\r
+};\r
\r
/*\r
* The definition of CIfrMinMaxStepData\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
+ VOID UpdateCIfrMinMaxStepData (IN MINMAXSTEP_DATA *MinMaxStepData) {\r
+ mMinMaxStepData = MinMaxStepData;\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
- memcpy (&mFormSet->Guid, Guid, sizeof (EFI_GUID));\r
+ memmove (&mFormSet->Guid, Guid, sizeof (EFI_GUID));\r
}\r
\r
VOID SetFormSetTitle (IN EFI_STRING_ID FormSetTitle) {\r
}\r
\r
VOID SetClassGuid (IN EFI_GUID *Guid) {\r
- memcpy (&(mFormSet->ClassGuid[mFormSet->Flags++]), Guid, sizeof (EFI_GUID));\r
+ memmove (&(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
\r
EFI_VFR_RETURN_CODE SetFormId (IN EFI_FORM_ID FormId) {\r
- if (CIfrForm::ChekFormIdFree (FormId) == FALSE) {\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
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
+ memmove (&(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
}\r
\r
VOID SetGuid (IN EFI_GUID *Guid) {\r
- memcpy (&mVarStore->Guid, Guid, sizeof (EFI_GUID));\r
+ memmove (&mVarStore->Guid, Guid, sizeof (EFI_GUID));\r
}\r
\r
VOID SetVarStoreId (IN EFI_VARSTORE_ID VarStoreId) {\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
EFI_IFR_VARSTORE_EFI *mVarStoreEfi;\r
\r
public:\r
- CIfrVarStoreEfi () : CIfrObj (EFI_IFR_VARSTORE_EFI_OP, (CHAR8 **)&mVarStoreEfi), \r
+ CIfrVarStoreEfi () : CIfrObj (EFI_IFR_VARSTORE_EFI_OP, (CHAR8 **)&mVarStoreEfi, sizeof (EFI_IFR_VARSTORE_EFI), TRUE),\r
CIfrOpHeader (EFI_IFR_VARSTORE_EFI_OP, &mVarStoreEfi->Header) {\r
mVarStoreEfi->VarStoreId = EFI_VAROFFSET_INVALID;\r
+ mVarStoreEfi->Size = 0;\r
memset (&mVarStoreEfi->Guid, 0, sizeof (EFI_GUID));\r
+ mVarStoreEfi->Name[0] = '\0';\r
}\r
\r
VOID SetGuid (IN EFI_GUID *Guid) {\r
- memcpy (&mVarStoreEfi->Guid, Guid, sizeof (EFI_GUID));\r
+ memmove (&mVarStoreEfi->Guid, Guid, sizeof (EFI_GUID));\r
}\r
\r
VOID SetVarStoreId (IN UINT16 VarStoreId) {\r
VOID SetAttributes (IN UINT32 Attributes) {\r
mVarStoreEfi->Attributes = Attributes;\r
}\r
+ VOID SetSize (IN UINT16 Size) {\r
+ mVarStoreEfi->Size = Size;\r
+ }\r
+\r
+ VOID SetName (IN CHAR8 *Name) {\r
+ UINT8 Len;\r
+\r
+ if (Name != NULL) {\r
+ Len = (UINT8) strlen (Name);\r
+ if (Len != 0) {\r
+ if (ExpendObjBin (Len) == TRUE) {\r
+ IncLength (Len);\r
+ strcpy ((CHAR8 *)(mVarStoreEfi->Name), Name);\r
+ }\r
+ }\r
+ }\r
+ }\r
+\r
+ VOID SetBinaryLength (IN UINT16 Size) {\r
+ UINT16 Len;\r
+\r
+ Len = sizeof (EFI_IFR_VARSTORE_EFI);\r
+ if (Size > Len) {\r
+ ExpendObjBin(Size - Len);\r
+ IncLength(Size - Len);\r
+ } else {\r
+ ShrinkObjBin(Len - Size);\r
+ DecLength(Len - Size);\r
+ }\r
+ }\r
};\r
\r
class CIfrVarStoreNameValue : public CIfrObj, public CIfrOpHeader {\r
}\r
\r
VOID SetGuid (IN EFI_GUID *Guid) {\r
- memcpy (&mVarStoreNameValue->Guid, Guid, sizeof (EFI_GUID));\r
+ memmove (&mVarStoreNameValue->Guid, Guid, sizeof (EFI_GUID));\r
}\r
\r
VOID SetVarStoreId (IN UINT16 VarStoreId) {\r
\r
public:\r
CIfrImage () : CIfrObj (EFI_IFR_IMAGE_OP, (CHAR8 **)&mImage),\r
- CIfrOpHeader (EFI_IFR_FORM_OP, &mImage->Header) {\r
+ CIfrOpHeader (EFI_IFR_IMAGE_OP, &mImage->Header) {\r
mImage->Id = EFI_IMAGE_ID_INVALID;\r
}\r
\r
}\r
};\r
\r
+class CIfrModal : public CIfrObj, public CIfrOpHeader {\r
+private:\r
+ EFI_IFR_MODAL_TAG *mModal;\r
+\r
+public:\r
+ CIfrModal () : CIfrObj (EFI_IFR_MODAL_TAG_OP, (CHAR8 **)&mModal),\r
+ CIfrOpHeader (EFI_IFR_MODAL_TAG_OP, &mModal->Header) {\r
+ }\r
+};\r
+\r
+\r
class CIfrLocked : public CIfrObj, public CIfrOpHeader {\r
private:\r
EFI_IFR_LOCKED *mLocked;\r
\r
public:\r
CIfrDefault (\r
+ IN UINT8 Size,\r
IN UINT16 DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD,\r
IN UINT8 Type = EFI_IFR_TYPE_OTHER,\r
IN EFI_IFR_TYPE_VALUE Value = gZeroEfiIfrTypeValue\r
- ) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault),\r
- CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header) {\r
+ ) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault, Size),\r
+ CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header, Size) {\r
mDefault->Type = Type;\r
- mDefault->Value = Value;\r
mDefault->DefaultId = DefaultId;\r
+ memmove (&(mDefault->Value), &Value, Size - OFFSET_OF (EFI_IFR_DEFAULT, Value));\r
}\r
\r
VOID SetDefaultId (IN UINT16 DefaultId) {\r
}\r
\r
VOID SetValue (IN EFI_IFR_TYPE_VALUE Value) {\r
- mDefault->Value = Value;\r
+ memmove (&mDefault->Value, &Value, mDefault->Header.Length - OFFSET_OF (EFI_IFR_DEFAULT, Value));\r
+ }\r
+};\r
+\r
+class CIfrDefault2 : public CIfrObj, public CIfrOpHeader {\r
+private:\r
+ EFI_IFR_DEFAULT_2 *mDefault;\r
+\r
+public:\r
+ CIfrDefault2 (\r
+ IN UINT16 DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD,\r
+ IN UINT8 Type = EFI_IFR_TYPE_OTHER\r
+ ) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault, sizeof (EFI_IFR_DEFAULT_2)),\r
+ CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header, sizeof (EFI_IFR_DEFAULT_2)) {\r
+ mDefault->Type = Type;\r
+ mDefault->DefaultId = DefaultId;\r
+ }\r
+\r
+ VOID SetDefaultId (IN UINT16 DefaultId) {\r
+ mDefault->DefaultId = DefaultId;\r
+ }\r
+\r
+ VOID SetType (IN UINT8 Type) {\r
+ mDefault->Type = Type;\r
}\r
};\r
\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
public:\r
CIfrSubtitle () : CIfrObj (EFI_IFR_SUBTITLE_OP, (CHAR8 **)&mSubtitle),\r
CIfrOpHeader (EFI_IFR_SUBTITLE_OP, &mSubtitle->Header),\r
- CIfrStatementHeader (&mSubtitle->Statement) {\r
+ CIfrStatementHeader (&mSubtitle->Statement) {\r
mSubtitle->Flags = 0;\r
}\r
\r
mRef2->FormId = FormId;\r
}\r
\r
- EFI_VFR_RETURN_CODE SetQuestionId (IN EFI_QUESTION_ID QuestionId) {\r
- if (QuestionId == EFI_QUESTION_ID_INVALID) {\r
- return VFR_RETURN_UNDEFINED;\r
- }\r
+ VOID SetQuestionId (IN EFI_QUESTION_ID QuestionId) {\r
mRef2->QuestionId = QuestionId;\r
- return VFR_RETURN_SUCCESS;\r
}\r
};\r
\r
EFI_IFR_REF4 *mRef4;\r
\r
public:\r
- CIfrRef4 () : CIfrObj (EFI_IFR_REF_OP, (CHAR8 **)&mRef4, sizeof(EFI_IFR_REF3)),\r
- CIfrOpHeader (EFI_IFR_REF_OP, &mRef4->Header, sizeof (EFI_IFR_REF3)), \r
+ CIfrRef4 () : CIfrObj (EFI_IFR_REF_OP, (CHAR8 **)&mRef4, sizeof(EFI_IFR_REF4)),\r
+ CIfrOpHeader (EFI_IFR_REF_OP, &mRef4->Header, sizeof(EFI_IFR_REF4)), \r
CIfrQuestionHeader (&mRef4->Question) {\r
mRef4->FormId = 0;\r
mRef4->QuestionId = EFI_QUESTION_ID_INVALID;\r
}\r
};\r
\r
+class CIfrRef5 : public CIfrObj, public CIfrOpHeader, public CIfrQuestionHeader {\r
+private:\r
+ EFI_IFR_REF5 *mRef5;\r
+\r
+public:\r
+ CIfrRef5 () : CIfrObj (EFI_IFR_REF_OP, (CHAR8 **)&mRef5, sizeof (EFI_IFR_REF5)),\r
+ CIfrOpHeader (EFI_IFR_REF_OP, &mRef5->Header, sizeof (EFI_IFR_REF5)), \r
+ CIfrQuestionHeader (&mRef5->Question) {\r
+ }\r
+};\r
+\r
class CIfrResetButton : public CIfrObj, public CIfrOpHeader, public CIfrStatementHeader {\r
private:\r
EFI_IFR_RESET_BUTTON *mResetButton;\r
public:\r
CIfrResetButton () : CIfrObj (EFI_IFR_RESET_BUTTON_OP, (CHAR8 **)&mResetButton),\r
CIfrOpHeader (EFI_IFR_RESET_BUTTON_OP, &mResetButton->Header), \r
- CIfrStatementHeader (&mResetButton->Question.Header) {\r
+ CIfrStatementHeader (&mResetButton->Statement) {\r
mResetButton->DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
}\r
\r
CIfrOpHeader (EFI_IFR_CHECKBOX_OP, &mCheckBox->Header), \r
CIfrQuestionHeader (&mCheckBox->Question) {\r
mCheckBox->Flags = 0;\r
- gCurrentQuestion = this;\r
+ gCurrentQuestion = this;\r
}\r
\r
~CIfrCheckBox () {\r
- gCurrentQuestion = NULL;\r
+ gCurrentQuestion = NULL;\r
}\r
\r
EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, UINT8 LFlags) {\r
EFI_IFR_NUMERIC *mNumeric;\r
\r
public:\r
- CIfrNumeric () : CIfrObj (EFI_IFR_NUMERIC_OP, (CHAR8 **)&mNumeric),\r
+ CIfrNumeric () : CIfrObj (EFI_IFR_NUMERIC_OP, (CHAR8 **)&mNumeric, sizeof (EFI_IFR_NUMERIC), TRUE),\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
+ gCurrentQuestion = this;\r
+ gCurrentMinMaxData = this;\r
}\r
\r
~CIfrNumeric () {\r
- gCurrentQuestion = NULL;\r
+ gCurrentQuestion = NULL;\r
+ gCurrentMinMaxData = NULL;\r
}\r
\r
- EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, IN UINT8 LFlags) {\r
+ VOID ShrinkBinSize (IN UINT16 Size) {\r
+ //\r
+ // Update the buffer size which is truly be used later.\r
+ //\r
+ ShrinkObjBin(Size);\r
+ DecLength(Size);\r
+\r
+ //\r
+ // Allocate buffer in gCFormPkg.\r
+ //\r
+ _EMIT_PENDING_OBJ();\r
+\r
+ //\r
+ // Update the buffer pointer used by other class.\r
+ //\r
+ mNumeric = (EFI_IFR_NUMERIC *) GetObjBinAddr();\r
+ UpdateHeader (&mNumeric->Header);\r
+ UpdateCIfrQuestionHeader(&mNumeric->Question);\r
+ UpdateCIfrMinMaxStepData(&mNumeric->data);\r
+ }\r
+\r
+ EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, IN UINT8 LFlags, BOOLEAN DisplaySettingsSpecified = FALSE) {\r
EFI_VFR_RETURN_CODE Ret;\r
\r
Ret = CIfrQuestionHeader::SetFlags (HFlags);\r
return Ret;\r
}\r
\r
- if (LFlags & EFI_IFR_DISPLAY) {\r
- mNumeric->Flags = LFlags;\r
- } else {\r
+ if (DisplaySettingsSpecified == FALSE) {\r
mNumeric->Flags = LFlags | EFI_IFR_DISPLAY_UINT_DEC;\r
+ } else {\r
+ mNumeric->Flags = LFlags;\r
}\r
return VFR_RETURN_SUCCESS;\r
}\r
EFI_IFR_ONE_OF *mOneOf;\r
\r
public:\r
- CIfrOneOf () : CIfrObj (EFI_IFR_ONE_OF_OP, (CHAR8 **)&mOneOf),\r
+ CIfrOneOf () : CIfrObj (EFI_IFR_ONE_OF_OP, (CHAR8 **)&mOneOf, sizeof (EFI_IFR_ONE_OF), TRUE),\r
CIfrOpHeader (EFI_IFR_ONE_OF_OP, &mOneOf->Header),\r
CIfrQuestionHeader (&mOneOf->Question),\r
CIfrMinMaxStepData (&mOneOf->data) {\r
mOneOf->Flags = 0;\r
- gCurrentQuestion = this;\r
+ gCurrentQuestion = this;\r
+ gCurrentMinMaxData = this;\r
}\r
\r
~CIfrOneOf () {\r
- gCurrentQuestion = NULL;\r
+ gCurrentQuestion = NULL;\r
+ gCurrentMinMaxData = NULL;\r
}\r
\r
EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, IN UINT8 LFlags) {\r
}\r
return VFR_RETURN_SUCCESS;\r
}\r
+\r
+ VOID ShrinkBinSize (IN UINT16 Size) {\r
+ //\r
+ // Update the buffer size which is truly be used later.\r
+ //\r
+ ShrinkObjBin(Size);\r
+ DecLength(Size);\r
+\r
+ //\r
+ // Allocate buffer in gCFormPkg.\r
+ //\r
+ _EMIT_PENDING_OBJ();\r
+\r
+ //\r
+ // Update the buffer pointer used by other class.\r
+ //\r
+ mOneOf = (EFI_IFR_ONE_OF *) GetObjBinAddr();\r
+ UpdateHeader (&mOneOf->Header);\r
+ UpdateCIfrQuestionHeader(&mOneOf->Question);\r
+ UpdateCIfrMinMaxStepData(&mOneOf->data);\r
+ }\r
};\r
\r
class CIfrString : public CIfrObj, public CIfrOpHeader, public CIfrQuestionHeader {\r
}\r
};\r
\r
+class CIfrWarningIf : public CIfrObj, public CIfrOpHeader {\r
+private:\r
+ EFI_IFR_WARNING_IF *mWarningIf;\r
+\r
+public:\r
+ CIfrWarningIf () : CIfrObj (EFI_IFR_WARNING_IF_OP, (CHAR8 **)&mWarningIf),\r
+ CIfrOpHeader (EFI_IFR_WARNING_IF_OP, &mWarningIf->Header) {\r
+ mWarningIf->Warning = EFI_STRING_ID_INVALID;\r
+ mWarningIf->TimeOut = 0;\r
+ }\r
+\r
+ VOID SetWarning (IN EFI_STRING_ID Warning) {\r
+ mWarningIf->Warning = Warning;\r
+ }\r
+\r
+ VOID SetTimeOut (IN UINT8 TimeOut) {\r
+ mWarningIf->TimeOut = TimeOut;\r
+ }\r
+};\r
+\r
class CIfrNoSubmitIf : public CIfrObj, public CIfrOpHeader {\r
private:\r
EFI_IFR_NO_SUBMIT_IF *mNoSubmitIf;\r
}\r
};\r
\r
+class CIfrRefreshId : public CIfrObj, public CIfrOpHeader {\r
+private:\r
+ EFI_IFR_REFRESH_ID *mRefreshId;\r
+\r
+public:\r
+ CIfrRefreshId () : CIfrObj (EFI_IFR_REFRESH_ID_OP, (CHAR8 **)&mRefreshId),\r
+ CIfrOpHeader (EFI_IFR_REFRESH_ID_OP, &mRefreshId->Header) {\r
+ memset (&mRefreshId->RefreshEventGroupId, 0, sizeof (EFI_GUID));\r
+ }\r
+\r
+ VOID SetRefreshEventGroutId (IN EFI_GUID *RefreshEventGroupId) {\r
+ memmove (&mRefreshId->RefreshEventGroupId, RefreshEventGroupId, sizeof (EFI_GUID));\r
+ }\r
+};\r
+\r
class CIfrVarStoreDevice : public CIfrObj, public CIfrOpHeader {\r
private:\r
EFI_IFR_VARSTORE_DEVICE *mVarStoreDevice;\r
EFI_IFR_ONE_OF_OPTION *mOneOfOption;\r
\r
public:\r
- CIfrOneOfOption () : CIfrObj (EFI_IFR_ONE_OF_OPTION_OP, (CHAR8 **)&mOneOfOption),\r
- CIfrOpHeader (EFI_IFR_ONE_OF_OPTION_OP, &mOneOfOption->Header) {\r
+ CIfrOneOfOption (UINT8 Size) : CIfrObj (EFI_IFR_ONE_OF_OPTION_OP, (CHAR8 **)&mOneOfOption, Size),\r
+ CIfrOpHeader (EFI_IFR_ONE_OF_OPTION_OP, &mOneOfOption->Header, Size) {\r
mOneOfOption->Flags = 0;\r
mOneOfOption->Option = EFI_STRING_ID_INVALID;\r
mOneOfOption->Type = EFI_IFR_TYPE_OTHER;\r
- memset (&mOneOfOption->Value, 0, sizeof (mOneOfOption->Value));\r
+ memset (&mOneOfOption->Value, 0, Size - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
}\r
\r
VOID SetOption (IN EFI_STRING_ID Option) {\r
}\r
\r
VOID SetValue (IN EFI_IFR_TYPE_VALUE Value) {\r
- mOneOfOption->Value = Value;\r
+ memmove (&mOneOfOption->Value, &Value, mOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));\r
}\r
\r
UINT8 GetFlags (VOID) {\r
}\r
};\r
\r
+class CIfrGuid : public CIfrObj, public CIfrOpHeader {\r
+private:\r
+ EFI_IFR_GUID *mGuid;\r
+\r
+public:\r
+ CIfrGuid (UINT8 Size) : CIfrObj (EFI_IFR_GUID_OP, (CHAR8 **)&mGuid, sizeof (EFI_IFR_GUID)+Size),\r
+ CIfrOpHeader (EFI_IFR_GUID_OP, &mGuid->Header, sizeof (EFI_IFR_GUID)+Size) {\r
+ memset (&mGuid->Guid, 0, sizeof (EFI_GUID));\r
+ }\r
+\r
+ VOID SetGuid (IN EFI_GUID *Guid) {\r
+ memmove (&mGuid->Guid, Guid, sizeof (EFI_GUID));\r
+ }\r
+\r
+ VOID SetData (IN UINT8* DataBuff, IN UINT8 Size) {\r
+ memmove ((UINT8 *)mGuid + sizeof (EFI_IFR_GUID), DataBuff, Size);\r
+ }\r
+};\r
+\r
class CIfrDup : public CIfrObj, public CIfrOpHeader {\r
private:\r
EFI_IFR_DUP *mDup;\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
- CIfrOpHeader (EFI_IFR_EQ_ID_LIST_OP, &mEqIdVList->Header) {\r
+ ) : CIfrObj (EFI_IFR_EQ_ID_VAL_LIST_OP, (CHAR8 **)&mEqIdVList, sizeof (EFI_IFR_EQ_ID_VAL_LIST), TRUE),\r
+ CIfrOpHeader (EFI_IFR_EQ_ID_VAL_LIST_OP, &mEqIdVList->Header) {\r
SetLineNo (LineNo);\r
mEqIdVList->QuestionId = EFI_QUESTION_ID_INVALID;\r
mEqIdVList->ListLength = 0;\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
+ memmove (&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