Sync BaseTool trunk (version r2599) into EDKII BaseTools.
Signed-off-by: Liming Gao <liming.gao@intel.com> Reviewed-by: Heshen Chen <chen.heshen@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14591 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -38,6 +38,8 @@ Abstract:
|
||||
#define EFI_STRING_ID_INVALID 0x0
|
||||
#define EFI_IMAGE_ID_INVALID 0xFFFF
|
||||
|
||||
#define EFI_IFR_MAX_DEFAULT_TYPE 0x10
|
||||
|
||||
typedef enum {
|
||||
QUESTION_NORMAL,
|
||||
QUESTION_DATE,
|
||||
|
@@ -1,5 +1,5 @@
|
||||
## @file
|
||||
# Windows makefile for 'VfrCompile' module build.
|
||||
# GNU/Linux makefile for 'VfrCompile' module build.
|
||||
#
|
||||
# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
|
||||
# This program and the accompanying materials
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
VfrCompiler main class and main function.
|
||||
|
||||
Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -82,6 +82,7 @@ CVfrCompiler::OptionInitialization (
|
||||
mOptions.CPreprocessorOptions = NULL;
|
||||
mOptions.CompatibleMode = FALSE;
|
||||
mOptions.HasOverrideClassGuid = FALSE;
|
||||
mOptions.WarningAsError = FALSE;
|
||||
memset (&mOptions.OverrideClassGuid, 0, sizeof (EFI_GUID));
|
||||
|
||||
if (Argc == 1) {
|
||||
@@ -153,6 +154,8 @@ CVfrCompiler::OptionInitialization (
|
||||
goto Fail;
|
||||
}
|
||||
mOptions.HasOverrideClassGuid = TRUE;
|
||||
} else if (stricmp(Argv[Index], "-w") == 0 || stricmp(Argv[Index], "--warning-as-error") == 0) {
|
||||
mOptions.WarningAsError = TRUE;
|
||||
} else {
|
||||
DebugError (NULL, 0, 1000, "Unknown option", "unrecognized option %s", Argv[Index]);
|
||||
goto Fail;
|
||||
@@ -425,6 +428,8 @@ CVfrCompiler::Usage (
|
||||
" -g, --guid",
|
||||
" override class guid input",
|
||||
" format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
|
||||
" -w --warning-as-error",
|
||||
" treat warning as an error",
|
||||
NULL
|
||||
};
|
||||
for (Index = 0; Help[Index] != NULL; Index++) {
|
||||
@@ -516,6 +521,7 @@ CVfrCompiler::Compile (
|
||||
InFileName = (mOptions.SkipCPreprocessor == TRUE) ? mOptions.VfrFileName : mOptions.PreprocessorOutputFileName;
|
||||
|
||||
gCVfrErrorHandle.SetInputFile (InFileName);
|
||||
gCVfrErrorHandle.SetWarningAsError(mOptions.WarningAsError);
|
||||
|
||||
if ((pInFile = fopen (InFileName, "r")) == NULL) {
|
||||
DebugError (NULL, 0, 0001, "Error opening the input file", InFileName);
|
||||
@@ -553,12 +559,55 @@ Fail:
|
||||
}
|
||||
}
|
||||
|
||||
VOID
|
||||
CVfrCompiler::UpdateInfoForDynamicOpcode (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
SIfrRecord *pRecord;
|
||||
|
||||
if (!gNeedAdjustOpcode) {
|
||||
return;
|
||||
}
|
||||
|
||||
//
|
||||
// Base on the original offset info to update the record list.
|
||||
//
|
||||
if (!gCIfrRecordInfoDB.IfrAdjustDynamicOpcodeInRecords()) {
|
||||
DebugError (NULL, 0, 1001, "Error parsing vfr file", "Can find the offset in the record.");
|
||||
}
|
||||
|
||||
//
|
||||
// Base on the opcode binary length to recalculate the offset for each opcode.
|
||||
//
|
||||
gCIfrRecordInfoDB.IfrAdjustOffsetForRecord();
|
||||
|
||||
//
|
||||
// Base on the offset to find the binary address.
|
||||
//
|
||||
pRecord = gCIfrRecordInfoDB.GetRecordInfoFromOffset(gAdjustOpcodeOffset);
|
||||
while (pRecord != NULL) {
|
||||
pRecord->mIfrBinBuf = gCFormPkg.GetBufAddrBaseOnOffset(pRecord->mOffset);
|
||||
if (pRecord->mIfrBinBuf == NULL) {
|
||||
DebugError (NULL, 0, 0001, "Error parsing vfr file", " 0x%X. offset not allocated.", pRecord->mOffset);
|
||||
}
|
||||
pRecord = pRecord->mNext;
|
||||
}
|
||||
}
|
||||
|
||||
VOID
|
||||
CVfrCompiler::AdjustBin (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
EFI_VFR_RETURN_CODE Status;
|
||||
|
||||
if (!IS_RUN_STATUS(STATUS_COMPILEED)) {
|
||||
return;
|
||||
}
|
||||
|
||||
UpdateInfoForDynamicOpcode ();
|
||||
|
||||
//
|
||||
// Check Binary Code consistent between Form and IfrRecord
|
||||
//
|
||||
@@ -759,6 +808,8 @@ main (
|
||||
)
|
||||
{
|
||||
COMPILER_RUN_STATUS Status;
|
||||
|
||||
SetPrintLevel(WARNING_LOG_LEVEL);
|
||||
CVfrCompiler Compiler(Argc, Argv);
|
||||
|
||||
Compiler.PreProcess();
|
||||
|
@@ -57,6 +57,7 @@ typedef struct {
|
||||
BOOLEAN CompatibleMode;
|
||||
BOOLEAN HasOverrideClassGuid;
|
||||
EFI_GUID OverrideClassGuid;
|
||||
BOOLEAN WarningAsError;
|
||||
} OPTIONS;
|
||||
|
||||
typedef enum {
|
||||
@@ -87,6 +88,7 @@ private:
|
||||
|
||||
VOID SET_RUN_STATUS (IN COMPILER_RUN_STATUS);
|
||||
BOOLEAN IS_RUN_STATUS (IN COMPILER_RUN_STATUS);
|
||||
VOID UpdateInfoForDynamicOpcode (VOID);
|
||||
|
||||
public:
|
||||
COMPILER_RUN_STATUS RunStatus (VOID) {
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
VfrCompiler error handler.
|
||||
|
||||
Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -45,17 +45,24 @@ static SVFR_ERROR_HANDLE VFR_ERROR_HANDLE_TABLE [] = {
|
||||
{ VFR_RETURN_DATA_STRING_ERROR, ": data field string error or not support"},
|
||||
{ VFR_RETURN_DEFAULT_VALUE_REDEFINED, ": default value re-defined with different value"},
|
||||
{ VFR_RETURN_CONSTANT_ONLY, ": only constant is allowed in the expression"},
|
||||
{ VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR, ": Varstore name is defined by more than one varstores, it can't be referred as varstore, only varstore strucure name could be used."},
|
||||
{ VFR_RETURN_CODEUNDEFINED, ": undefined Error Code" }
|
||||
};
|
||||
|
||||
static SVFR_WARNING_HANDLE VFR_WARNING_HANDLE_TABLE [] = {
|
||||
{ VFR_WARNING_DEFAULT_VALUE_REDEFINED, ": default value re-defined with different value"},
|
||||
{ VFR_WARNING_CODEUNDEFINED, ": undefined Warning Code" }
|
||||
};
|
||||
|
||||
CVfrErrorHandle::CVfrErrorHandle (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
mInputFileName = NULL;
|
||||
mScopeRecordListHead = NULL;
|
||||
mScopeRecordListTail = NULL;
|
||||
mVfrErrorHandleTable = VFR_ERROR_HANDLE_TABLE;
|
||||
mInputFileName = NULL;
|
||||
mScopeRecordListHead = NULL;
|
||||
mScopeRecordListTail = NULL;
|
||||
mVfrErrorHandleTable = VFR_ERROR_HANDLE_TABLE;
|
||||
mVfrWarningHandleTable = VFR_WARNING_HANDLE_TABLE;
|
||||
}
|
||||
|
||||
CVfrErrorHandle::~CVfrErrorHandle (
|
||||
@@ -74,9 +81,18 @@ CVfrErrorHandle::~CVfrErrorHandle (
|
||||
delete pNode;
|
||||
}
|
||||
|
||||
mScopeRecordListHead = NULL;
|
||||
mScopeRecordListTail = NULL;
|
||||
mVfrErrorHandleTable = NULL;
|
||||
mScopeRecordListHead = NULL;
|
||||
mScopeRecordListTail = NULL;
|
||||
mVfrErrorHandleTable = NULL;
|
||||
mVfrWarningHandleTable = NULL;
|
||||
}
|
||||
|
||||
VOID
|
||||
CVfrErrorHandle::SetWarningAsError (
|
||||
IN BOOLEAN WarningAsError
|
||||
)
|
||||
{
|
||||
mWarningAsError = WarningAsError;
|
||||
}
|
||||
|
||||
VOID
|
||||
@@ -242,4 +258,41 @@ CVfrErrorHandle::HandleError (
|
||||
}
|
||||
}
|
||||
|
||||
UINT8
|
||||
CVfrErrorHandle::HandleWarning (
|
||||
IN EFI_VFR_WARNING_CODE WarningCode,
|
||||
IN UINT32 LineNum,
|
||||
IN CHAR8 *TokName
|
||||
)
|
||||
{
|
||||
UINT32 Index;
|
||||
CHAR8 *FileName = NULL;
|
||||
UINT32 FileLine;
|
||||
CONST CHAR8 *WarningMsg = NULL;
|
||||
|
||||
if (mVfrWarningHandleTable == NULL) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
GetFileNameLineNum (LineNum, &FileName, &FileLine);
|
||||
|
||||
if (mWarningAsError) {
|
||||
Error (FileName, FileLine, 0x2220, "warning treated as error", NULL);
|
||||
}
|
||||
|
||||
for (Index = 0; mVfrWarningHandleTable[Index].mWarningCode != VFR_WARNING_CODEUNDEFINED; Index++) {
|
||||
if (WarningCode == mVfrWarningHandleTable[Index].mWarningCode) {
|
||||
WarningMsg = mVfrWarningHandleTable[Index].mWarningMsg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (WarningMsg != NULL) {
|
||||
Warning (FileName, FileLine, 0, TokName, (CHAR8 *) "\t%s\n", (CHAR8 *) WarningMsg);
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
CVfrErrorHandle gCVfrErrorHandle;
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
VfrCompiler Error definition
|
||||
|
||||
Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -43,14 +43,25 @@ typedef enum {
|
||||
VFR_RETURN_DATA_STRING_ERROR,
|
||||
VFR_RETURN_DEFAULT_VALUE_REDEFINED,
|
||||
VFR_RETURN_CONSTANT_ONLY,
|
||||
VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR,
|
||||
VFR_RETURN_CODEUNDEFINED
|
||||
} EFI_VFR_RETURN_CODE;
|
||||
|
||||
typedef enum {
|
||||
VFR_WARNING_DEFAULT_VALUE_REDEFINED = 0,
|
||||
VFR_WARNING_CODEUNDEFINED
|
||||
} EFI_VFR_WARNING_CODE;
|
||||
|
||||
typedef struct _SVFR_ERROR_HANDLE {
|
||||
EFI_VFR_RETURN_CODE mErrorCode;
|
||||
CONST CHAR8 *mErrorMsg;
|
||||
} SVFR_ERROR_HANDLE;
|
||||
|
||||
typedef struct _SVFR_WARNING_HANDLE {
|
||||
EFI_VFR_WARNING_CODE mWarningCode;
|
||||
CONST CHAR8 *mWarningMsg;
|
||||
} SVFR_WARNING_HANDLE;
|
||||
|
||||
struct SVfrFileScopeRecord {
|
||||
CHAR8 *mFileName;
|
||||
UINT32 mWholeScopeLine;
|
||||
@@ -65,17 +76,21 @@ class CVfrErrorHandle {
|
||||
private:
|
||||
CHAR8 *mInputFileName;
|
||||
SVFR_ERROR_HANDLE *mVfrErrorHandleTable;
|
||||
SVFR_WARNING_HANDLE *mVfrWarningHandleTable;
|
||||
SVfrFileScopeRecord *mScopeRecordListHead;
|
||||
SVfrFileScopeRecord *mScopeRecordListTail;
|
||||
BOOLEAN mWarningAsError;
|
||||
|
||||
public:
|
||||
CVfrErrorHandle (VOID);
|
||||
~CVfrErrorHandle (VOID);
|
||||
|
||||
VOID SetWarningAsError (IN BOOLEAN);
|
||||
VOID SetInputFile (IN CHAR8 *);
|
||||
VOID ParseFileScopeRecord (IN CHAR8 *, IN UINT32);
|
||||
VOID GetFileNameLineNum (IN UINT32, OUT CHAR8 **, OUT UINT32 *);
|
||||
UINT8 HandleError (IN EFI_VFR_RETURN_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);
|
||||
UINT8 HandleWarning (IN EFI_VFR_WARNING_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);
|
||||
VOID PrintMsg (IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL, IN CONST CHAR8 *MsgType = "Error", IN CONST CHAR8 *ErrorMsg = "");
|
||||
};
|
||||
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
The definition of CFormPkg's member function
|
||||
|
||||
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -152,12 +152,39 @@ CFormPkg::~CFormPkg ()
|
||||
PendingAssignList = NULL;
|
||||
}
|
||||
|
||||
SBufferNode *
|
||||
CFormPkg::CreateNewNode (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
SBufferNode *Node;
|
||||
|
||||
Node = new SBufferNode;
|
||||
if (Node == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Node->mBufferStart = new CHAR8[mBufferSize];
|
||||
if (Node->mBufferStart == NULL) {
|
||||
delete Node;
|
||||
return NULL;
|
||||
} else {
|
||||
memset (Node->mBufferStart, 0, mBufferSize);
|
||||
Node->mBufferEnd = Node->mBufferStart + mBufferSize;
|
||||
Node->mBufferFree = Node->mBufferStart;
|
||||
Node->mNext = NULL;
|
||||
}
|
||||
|
||||
return Node;
|
||||
}
|
||||
|
||||
CHAR8 *
|
||||
CFormPkg::IfrBinBufferGet (
|
||||
IN UINT32 Len
|
||||
)
|
||||
{
|
||||
CHAR8 *BinBuffer = NULL;
|
||||
CHAR8 *BinBuffer = NULL;
|
||||
SBufferNode *Node = NULL;
|
||||
|
||||
if ((Len == 0) || (Len > mBufferSize)) {
|
||||
return NULL;
|
||||
@@ -167,24 +194,11 @@ CFormPkg::IfrBinBufferGet (
|
||||
BinBuffer = mCurrBufferNode->mBufferFree;
|
||||
mCurrBufferNode->mBufferFree += Len;
|
||||
} else {
|
||||
SBufferNode *Node;
|
||||
|
||||
Node = new SBufferNode;
|
||||
Node = CreateNewNode ();
|
||||
if (Node == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Node->mBufferStart = new CHAR8[mBufferSize];
|
||||
if (Node->mBufferStart == NULL) {
|
||||
delete Node;
|
||||
return NULL;
|
||||
} else {
|
||||
memset (Node->mBufferStart, 0, mBufferSize);
|
||||
Node->mBufferEnd = Node->mBufferStart + mBufferSize;
|
||||
Node->mBufferFree = Node->mBufferStart;
|
||||
Node->mNext = NULL;
|
||||
}
|
||||
|
||||
if (mBufferNodeQueueTail == NULL) {
|
||||
mBufferNodeQueueHead = mBufferNodeQueueTail = Node;
|
||||
} else {
|
||||
@@ -245,7 +259,7 @@ CFormPkg::Read (
|
||||
}
|
||||
|
||||
if (mReadBufferNode == NULL) {
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (Index = 0; Index < Size; Index++) {
|
||||
@@ -256,7 +270,7 @@ CFormPkg::Read (
|
||||
return Index;
|
||||
} else {
|
||||
mReadBufferOffset = 0;
|
||||
Buffer[Index] = mReadBufferNode->mBufferStart[mReadBufferOffset++];
|
||||
Index --;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -402,6 +416,9 @@ CFormPkg::_WRITE_PKG_END (
|
||||
}
|
||||
|
||||
#define BYTES_PRE_LINE 0x10
|
||||
UINT32 gAdjustOpcodeOffset = 0;
|
||||
BOOLEAN gNeedAdjustOpcode = FALSE;
|
||||
UINT32 gAdjustOpcodeLen = 0;
|
||||
|
||||
EFI_VFR_RETURN_CODE
|
||||
CFormPkg::GenCFile (
|
||||
@@ -548,13 +565,236 @@ CFormPkg::PendingAssignPrintAll (
|
||||
}
|
||||
}
|
||||
|
||||
SBufferNode *
|
||||
CFormPkg::GetBinBufferNodeForAddr (
|
||||
IN CHAR8 *BinBuffAddr
|
||||
)
|
||||
{
|
||||
SBufferNode *TmpNode;
|
||||
|
||||
TmpNode = mBufferNodeQueueHead;
|
||||
|
||||
while (TmpNode != NULL) {
|
||||
if (TmpNode->mBufferStart <= BinBuffAddr && TmpNode->mBufferFree >= BinBuffAddr) {
|
||||
return TmpNode;
|
||||
}
|
||||
|
||||
TmpNode = TmpNode->mNext;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
SBufferNode *
|
||||
CFormPkg::GetNodeBefore(
|
||||
IN SBufferNode *CurrentNode
|
||||
)
|
||||
{
|
||||
SBufferNode *FirstNode = mBufferNodeQueueHead;
|
||||
SBufferNode *LastNode = mBufferNodeQueueHead;
|
||||
|
||||
while (FirstNode != NULL) {
|
||||
if (FirstNode == CurrentNode) {
|
||||
break;
|
||||
}
|
||||
|
||||
LastNode = FirstNode;
|
||||
FirstNode = FirstNode->mNext;
|
||||
}
|
||||
|
||||
if (FirstNode == NULL) {
|
||||
LastNode = NULL;
|
||||
}
|
||||
|
||||
return LastNode;
|
||||
}
|
||||
|
||||
EFI_VFR_RETURN_CODE
|
||||
CFormPkg::InsertNodeBefore(
|
||||
IN SBufferNode *CurrentNode,
|
||||
IN SBufferNode *NewNode
|
||||
)
|
||||
{
|
||||
SBufferNode *LastNode = GetNodeBefore (CurrentNode);
|
||||
|
||||
if (LastNode == NULL) {
|
||||
return VFR_RETURN_MISMATCHED;
|
||||
}
|
||||
|
||||
NewNode->mNext = LastNode->mNext;
|
||||
LastNode->mNext = NewNode;
|
||||
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
CHAR8 *
|
||||
CFormPkg::GetBufAddrBaseOnOffset (
|
||||
IN UINT32 Offset
|
||||
)
|
||||
{
|
||||
SBufferNode *TmpNode;
|
||||
UINT32 TotalBufLen;
|
||||
UINT32 CurrentBufLen;
|
||||
|
||||
TotalBufLen = 0;
|
||||
|
||||
for (TmpNode = mBufferNodeQueueHead; TmpNode != NULL; TmpNode = TmpNode->mNext) {
|
||||
CurrentBufLen = TmpNode->mBufferFree - TmpNode->mBufferStart;
|
||||
if (Offset >= TotalBufLen && Offset < TotalBufLen + CurrentBufLen) {
|
||||
return TmpNode->mBufferStart + (Offset - TotalBufLen);
|
||||
}
|
||||
|
||||
TotalBufLen += CurrentBufLen;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EFI_VFR_RETURN_CODE
|
||||
CFormPkg::AdjustDynamicInsertOpcode (
|
||||
IN CHAR8 *LastFormEndAddr,
|
||||
IN CHAR8 *InsertOpcodeAddr
|
||||
)
|
||||
{
|
||||
SBufferNode *LastFormEndNode;
|
||||
SBufferNode *InsertOpcodeNode;
|
||||
SBufferNode *NewRestoreNodeBegin;
|
||||
SBufferNode *NewRestoreNodeEnd;
|
||||
SBufferNode *NewLastEndNode;
|
||||
SBufferNode *TmpNode;
|
||||
UINT32 NeedRestoreCodeLen;
|
||||
|
||||
NewRestoreNodeEnd = NULL;
|
||||
|
||||
LastFormEndNode = GetBinBufferNodeForAddr(LastFormEndAddr);
|
||||
InsertOpcodeNode = GetBinBufferNodeForAddr(InsertOpcodeAddr);
|
||||
|
||||
if (LastFormEndNode == InsertOpcodeNode) {
|
||||
//
|
||||
// Create New Node to save the restore opcode.
|
||||
//
|
||||
NeedRestoreCodeLen = InsertOpcodeAddr - LastFormEndAddr;
|
||||
gAdjustOpcodeLen = NeedRestoreCodeLen;
|
||||
NewRestoreNodeBegin = CreateNewNode ();
|
||||
if (NewRestoreNodeBegin == NULL) {
|
||||
return VFR_RETURN_OUT_FOR_RESOURCES;
|
||||
}
|
||||
memcpy (NewRestoreNodeBegin->mBufferFree, LastFormEndAddr, NeedRestoreCodeLen);
|
||||
NewRestoreNodeBegin->mBufferFree += NeedRestoreCodeLen;
|
||||
|
||||
//
|
||||
// Override the restore buffer data.
|
||||
//
|
||||
memcpy (LastFormEndAddr, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);
|
||||
InsertOpcodeNode->mBufferFree -= NeedRestoreCodeLen;
|
||||
memset (InsertOpcodeNode->mBufferFree, 0, NeedRestoreCodeLen);
|
||||
} else {
|
||||
//
|
||||
// Create New Node to save the restore opcode.
|
||||
//
|
||||
NeedRestoreCodeLen = LastFormEndNode->mBufferFree - LastFormEndAddr;
|
||||
gAdjustOpcodeLen = NeedRestoreCodeLen;
|
||||
NewRestoreNodeBegin = CreateNewNode ();
|
||||
if (NewRestoreNodeBegin == NULL) {
|
||||
return VFR_RETURN_OUT_FOR_RESOURCES;
|
||||
}
|
||||
memcpy (NewRestoreNodeBegin->mBufferFree, LastFormEndAddr, NeedRestoreCodeLen);
|
||||
NewRestoreNodeBegin->mBufferFree += NeedRestoreCodeLen;
|
||||
//
|
||||
// Override the restore buffer data.
|
||||
//
|
||||
LastFormEndNode->mBufferFree -= NeedRestoreCodeLen;
|
||||
//
|
||||
// Link the restore data to new node.
|
||||
//
|
||||
NewRestoreNodeBegin->mNext = LastFormEndNode->mNext;
|
||||
|
||||
//
|
||||
// Count the Adjust opcode len.
|
||||
//
|
||||
TmpNode = LastFormEndNode->mNext;
|
||||
while (TmpNode != InsertOpcodeNode) {
|
||||
gAdjustOpcodeLen += TmpNode->mBufferFree - TmpNode->mBufferStart;
|
||||
TmpNode = TmpNode->mNext;
|
||||
}
|
||||
|
||||
//
|
||||
// Create New Node to save the last node of restore opcode.
|
||||
//
|
||||
NeedRestoreCodeLen = InsertOpcodeAddr - InsertOpcodeNode->mBufferStart;
|
||||
gAdjustOpcodeLen += NeedRestoreCodeLen;
|
||||
if (NeedRestoreCodeLen > 0) {
|
||||
NewRestoreNodeEnd = CreateNewNode ();
|
||||
if (NewRestoreNodeEnd == NULL) {
|
||||
return VFR_RETURN_OUT_FOR_RESOURCES;
|
||||
}
|
||||
memcpy (NewRestoreNodeEnd->mBufferFree, InsertOpcodeNode->mBufferStart, NeedRestoreCodeLen);
|
||||
NewRestoreNodeEnd->mBufferFree += NeedRestoreCodeLen;
|
||||
//
|
||||
// Override the restore buffer data.
|
||||
//
|
||||
memcpy (InsertOpcodeNode->mBufferStart, InsertOpcodeAddr, InsertOpcodeNode->mBufferFree - InsertOpcodeAddr);
|
||||
InsertOpcodeNode->mBufferFree -= InsertOpcodeAddr - InsertOpcodeNode->mBufferStart;
|
||||
|
||||
//
|
||||
// Insert the last restore data node.
|
||||
//
|
||||
TmpNode = GetNodeBefore (InsertOpcodeNode);
|
||||
if (TmpNode == LastFormEndNode) {
|
||||
NewRestoreNodeBegin->mNext = NewRestoreNodeEnd;
|
||||
} else {
|
||||
TmpNode->mNext = NewRestoreNodeEnd;
|
||||
}
|
||||
//
|
||||
// Connect the dynamic opcode node to the node before last form end node.
|
||||
//
|
||||
LastFormEndNode->mNext = InsertOpcodeNode;
|
||||
}
|
||||
}
|
||||
|
||||
if (mBufferNodeQueueTail->mBufferFree - mBufferNodeQueueTail->mBufferStart > 2) {
|
||||
//
|
||||
// End form set opcode all in the mBufferNodeQueueTail node.
|
||||
//
|
||||
NewLastEndNode = CreateNewNode ();
|
||||
if (NewLastEndNode == NULL) {
|
||||
return VFR_RETURN_OUT_FOR_RESOURCES;
|
||||
}
|
||||
NewLastEndNode->mBufferStart[0] = 0x29;
|
||||
NewLastEndNode->mBufferStart[1] = 0x02;
|
||||
NewLastEndNode->mBufferFree += 2;
|
||||
|
||||
mBufferNodeQueueTail->mBufferFree -= 2;
|
||||
|
||||
mBufferNodeQueueTail->mNext = NewRestoreNodeBegin;
|
||||
if (NewRestoreNodeEnd != NULL) {
|
||||
NewRestoreNodeEnd->mNext = NewLastEndNode;
|
||||
} else {
|
||||
NewRestoreNodeBegin->mNext = NewLastEndNode;
|
||||
}
|
||||
|
||||
mBufferNodeQueueTail = NewLastEndNode;
|
||||
} else if (mBufferNodeQueueTail->mBufferFree - mBufferNodeQueueTail->mBufferStart == 2) {
|
||||
TmpNode = GetNodeBefore(mBufferNodeQueueTail);
|
||||
TmpNode->mNext = NewRestoreNodeBegin;
|
||||
if (NewRestoreNodeEnd != NULL) {
|
||||
NewRestoreNodeEnd->mNext = mBufferNodeQueueTail;
|
||||
} else {
|
||||
NewRestoreNodeBegin->mNext = mBufferNodeQueueTail;
|
||||
}
|
||||
}
|
||||
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
EFI_VFR_RETURN_CODE
|
||||
CFormPkg::DeclarePendingQuestion (
|
||||
IN CVfrVarDataTypeDB &lCVfrVarDataTypeDB,
|
||||
IN CVfrDataStorage &lCVfrDataStorage,
|
||||
IN CVfrQuestionDB &lCVfrQuestionDB,
|
||||
IN EFI_GUID *LocalFormSetGuid,
|
||||
IN UINT32 LineNo
|
||||
IN UINT32 LineNo,
|
||||
OUT CHAR8 **InsertOpcodeAddr
|
||||
)
|
||||
{
|
||||
SPendingAssign *pNode;
|
||||
@@ -563,8 +803,10 @@ CFormPkg::DeclarePendingQuestion (
|
||||
CHAR8 FName[MAX_NAME_LEN];
|
||||
CHAR8 *SName;
|
||||
CHAR8 *NewStr;
|
||||
UINT32 ShrinkSize;
|
||||
EFI_VFR_RETURN_CODE ReturnCode;
|
||||
EFI_VFR_VARSTORE_TYPE VarStoreType = EFI_VFR_VARSTORE_INVALID;
|
||||
EFI_VARSTORE_ID VarStoreId = EFI_VARSTORE_ID_INVALID;
|
||||
|
||||
//
|
||||
// Declare all questions as Numeric in DisableIf True
|
||||
@@ -572,6 +814,7 @@ CFormPkg::DeclarePendingQuestion (
|
||||
// DisableIf
|
||||
CIfrDisableIf DIObj;
|
||||
DIObj.SetLineNo (LineNo);
|
||||
*InsertOpcodeAddr = DIObj.GetObjBinAddr ();
|
||||
|
||||
//TrueOpcode
|
||||
CIfrTrue TObj (LineNo);
|
||||
@@ -581,7 +824,7 @@ CFormPkg::DeclarePendingQuestion (
|
||||
if (pNode->mFlag == PENDING) {
|
||||
CIfrNumeric CNObj;
|
||||
EFI_VARSTORE_INFO Info;
|
||||
EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID;
|
||||
EFI_QUESTION_ID QId = EFI_QUESTION_ID_INVALID;
|
||||
|
||||
CNObj.SetLineNo (LineNo);
|
||||
CNObj.SetPrompt (0x0);
|
||||
@@ -611,7 +854,7 @@ CFormPkg::DeclarePendingQuestion (
|
||||
//
|
||||
// Get VarStoreType
|
||||
//
|
||||
ReturnCode = lCVfrDataStorage.GetVarStoreType (FName, VarStoreType);
|
||||
ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId);
|
||||
if (ReturnCode == VFR_RETURN_UNDEFINED) {
|
||||
lCVfrDataStorage.DeclareBufferVarStore (
|
||||
FName,
|
||||
@@ -621,18 +864,13 @@ CFormPkg::DeclarePendingQuestion (
|
||||
EFI_VARSTORE_ID_INVALID,
|
||||
FALSE
|
||||
);
|
||||
ReturnCode = lCVfrDataStorage.GetVarStoreType (FName, VarStoreType);
|
||||
ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId, LocalFormSetGuid);
|
||||
}
|
||||
if (ReturnCode != VFR_RETURN_SUCCESS) {
|
||||
gCVfrErrorHandle.PrintMsg (pNode->mLineNo, FName, "Error", "Var Store Type is not defined");
|
||||
return ReturnCode;
|
||||
}
|
||||
|
||||
ReturnCode = lCVfrDataStorage.GetVarStoreId (FName, &Info.mVarStoreId);
|
||||
if (ReturnCode != VFR_RETURN_SUCCESS) {
|
||||
gCVfrErrorHandle.PrintMsg (pNode->mLineNo, FName, "Error", "Var Store Type is not defined");
|
||||
return ReturnCode;
|
||||
}
|
||||
VarStoreType = lCVfrDataStorage.GetVarStoreType (Info.mVarStoreId);
|
||||
|
||||
if (*VarStr == '\0' && ArrayIdx != INVALID_ARRAY_INDEX) {
|
||||
ReturnCode = lCVfrDataStorage.GetNameVarStoreInfo (&Info, ArrayIdx);
|
||||
@@ -642,7 +880,7 @@ CFormPkg::DeclarePendingQuestion (
|
||||
} else if (VarStoreType == EFI_VFR_VARSTORE_BUFFER) {
|
||||
VarStr = pNode->mKey;
|
||||
//convert VarStr with store name to VarStr with structure name
|
||||
ReturnCode = lCVfrDataStorage.GetBufferVarStoreDataTypeName (FName, &SName);
|
||||
ReturnCode = lCVfrDataStorage.GetBufferVarStoreDataTypeName (Info.mVarStoreId, &SName);
|
||||
if (ReturnCode == VFR_RETURN_SUCCESS) {
|
||||
NewStr = new CHAR8[strlen (VarStr) + strlen (SName) + 1];
|
||||
NewStr[0] = '\0';
|
||||
@@ -676,19 +914,24 @@ CFormPkg::DeclarePendingQuestion (
|
||||
switch (Info.mVarType) {
|
||||
case EFI_IFR_TYPE_NUM_SIZE_64:
|
||||
CNObj.SetMinMaxStepData ((UINT64) 0, (UINT64) -1 , (UINT64) 0);
|
||||
ShrinkSize = 0;
|
||||
break;
|
||||
case EFI_IFR_TYPE_NUM_SIZE_32:
|
||||
CNObj.SetMinMaxStepData ((UINT32) 0, (UINT32) -1 , (UINT32) 0);
|
||||
ShrinkSize = 12;
|
||||
break;
|
||||
case EFI_IFR_TYPE_NUM_SIZE_16:
|
||||
CNObj.SetMinMaxStepData ((UINT16) 0, (UINT16) -1 , (UINT16) 0);
|
||||
ShrinkSize = 18;
|
||||
break;
|
||||
case EFI_IFR_TYPE_NUM_SIZE_8:
|
||||
CNObj.SetMinMaxStepData ((UINT8) 0, (UINT8) -1 , (UINT8) 0);
|
||||
ShrinkSize = 21;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
CNObj.ShrinkBinSize (ShrinkSize);
|
||||
|
||||
//
|
||||
// For undefined Efi VarStore type question
|
||||
@@ -698,7 +941,7 @@ CFormPkg::DeclarePendingQuestion (
|
||||
CIfrVarEqName CVNObj (QId, Info.mInfo.mVarName);
|
||||
CVNObj.SetLineNo (LineNo);
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// End for Numeric
|
||||
//
|
||||
@@ -983,6 +1226,94 @@ CIfrRecordInfoDB::GetOpcodeQuestionId (
|
||||
return QuestionHead->QuestionId;
|
||||
}
|
||||
|
||||
SIfrRecord *
|
||||
CIfrRecordInfoDB::GetRecordInfoFromOffset (
|
||||
IN UINT32 Offset
|
||||
)
|
||||
{
|
||||
SIfrRecord *pNode = NULL;
|
||||
|
||||
for (pNode = mIfrRecordListHead; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (pNode->mOffset == Offset) {
|
||||
return pNode;
|
||||
}
|
||||
}
|
||||
|
||||
return pNode;
|
||||
}
|
||||
|
||||
/*
|
||||
Add just the op code position.
|
||||
|
||||
From
|
||||
|
||||
| form end opcode + end of if opcode for form ... + Dynamic opcode + form set end opcode |
|
||||
|
||||
To
|
||||
|
||||
| Dynamic opcode + form end opcode + end of if opcode for form ... + form set end opcode |
|
||||
|
||||
*/
|
||||
BOOLEAN
|
||||
CIfrRecordInfoDB::IfrAdjustDynamicOpcodeInRecords (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
UINT32 OpcodeOffset;
|
||||
SIfrRecord *pNode, *pPreNode;
|
||||
SIfrRecord *pStartNode, *pNodeBeforeStart;
|
||||
SIfrRecord *pEndNode;
|
||||
|
||||
pStartNode = NULL;
|
||||
pEndNode = NULL;
|
||||
OpcodeOffset = 0;
|
||||
|
||||
//
|
||||
// Base on the offset info to get the node.
|
||||
//
|
||||
for (pNode = mIfrRecordListHead; pNode->mNext != NULL; pPreNode = pNode,pNode = pNode->mNext) {
|
||||
if (OpcodeOffset == gAdjustOpcodeOffset) {
|
||||
pStartNode = pNode;
|
||||
pNodeBeforeStart = pPreNode;
|
||||
} else if (OpcodeOffset == gAdjustOpcodeOffset + gAdjustOpcodeLen) {
|
||||
pEndNode = pPreNode;
|
||||
}
|
||||
|
||||
OpcodeOffset += pNode->mBinBufLen;
|
||||
}
|
||||
|
||||
//
|
||||
// Check the value.
|
||||
//
|
||||
if (pEndNode == NULL || pStartNode == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
//
|
||||
// Adjust the node. pPreNode save the Node before mIfrRecordListTail
|
||||
//
|
||||
pNodeBeforeStart->mNext = pEndNode->mNext;
|
||||
pPreNode->mNext = pStartNode;
|
||||
pEndNode->mNext = mIfrRecordListTail;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
VOID
|
||||
CIfrRecordInfoDB::IfrAdjustOffsetForRecord (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
UINT32 OpcodeOffset;
|
||||
SIfrRecord *pNode;
|
||||
|
||||
OpcodeOffset = 0;
|
||||
for (pNode = mIfrRecordListHead; pNode != NULL; pNode = pNode->mNext) {
|
||||
pNode->mOffset = OpcodeOffset;
|
||||
OpcodeOffset += pNode->mBinBufLen;
|
||||
}
|
||||
}
|
||||
|
||||
EFI_VFR_RETURN_CODE
|
||||
CIfrRecordInfoDB::IfrRecordAdjust (
|
||||
VOID
|
||||
@@ -1195,11 +1526,7 @@ CIfrRecordInfoDB::IfrRecordAdjust (
|
||||
// Update Ifr Opcode Offset
|
||||
//
|
||||
if (Status == VFR_RETURN_SUCCESS) {
|
||||
OpcodeOffset = 0;
|
||||
for (pNode = mIfrRecordListHead; pNode != NULL; pNode = pNode->mNext) {
|
||||
pNode->mOffset = OpcodeOffset;
|
||||
OpcodeOffset += pNode->mBinBufLen;
|
||||
}
|
||||
IfrAdjustOffsetForRecord ();
|
||||
}
|
||||
return Status;
|
||||
}
|
||||
@@ -1344,7 +1671,7 @@ static struct {
|
||||
{ sizeof (EFI_IFR_CATENATE), 0 }, // EFI_IFR_CATENATE_OP
|
||||
{ sizeof (EFI_IFR_GUID), 0 }, // EFI_IFR_GUID_OP
|
||||
{ sizeof (EFI_IFR_SECURITY), 0 }, // EFI_IFR_SECURITY_OP - 0x60
|
||||
{ sizeof (EFI_IFR_MODAL), 0}, // EFI_IFR_MODAL_OP - 0x61
|
||||
{ sizeof (EFI_IFR_MODAL_TAG), 0}, // EFI_IFR_MODAL_TAG_OP - 0x61
|
||||
{ sizeof (EFI_IFR_REFRESH_ID), 0}, // EFI_IFR_REFRESH_ID_OP - 0x62
|
||||
};
|
||||
|
||||
@@ -1368,7 +1695,7 @@ static struct {
|
||||
"EFI_IFR_STRING_REF1","EFI_IFR_STRING_REF2", "EFI_IFR_CONDITIONAL", "EFI_IFR_QUESTION_REF3", "EFI_IFR_ZERO", "EFI_IFR_ONE",
|
||||
"EFI_IFR_ONES", "EFI_IFR_UNDEFINED", "EFI_IFR_LENGTH", "EFI_IFR_DUP", "EFI_IFR_THIS", "EFI_IFR_SPAN",
|
||||
"EFI_IFR_VALUE", "EFI_IFR_DEFAULT", "EFI_IFR_DEFAULTSTORE", "EFI_IFR_FORM_MAP", "EFI_IFR_CATENATE", "EFI_IFR_GUID",
|
||||
"EFI_IFR_SECURITY", "EFI_IFR_MODAL", "EFI_IFR_REFRESH_ID",
|
||||
"EFI_IFR_SECURITY", "EFI_IFR_MODAL_TAG", "EFI_IFR_REFRESH_ID",
|
||||
};
|
||||
|
||||
VOID
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
The definition of CFormPkg's member function
|
||||
|
||||
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -115,6 +115,10 @@ private:
|
||||
|
||||
VOID _WRITE_PKG_LINE (IN FILE *, IN UINT32 , IN CONST CHAR8 *, IN CHAR8 *, IN UINT32);
|
||||
VOID _WRITE_PKG_END (IN FILE *, IN UINT32 , IN CONST CHAR8 *, IN CHAR8 *, IN UINT32);
|
||||
SBufferNode * GetBinBufferNodeForAddr (IN CHAR8 *);
|
||||
SBufferNode * CreateNewNode ();
|
||||
SBufferNode * GetNodeBefore (IN SBufferNode *);
|
||||
EFI_VFR_RETURN_CODE InsertNodeBefore (IN SBufferNode *, IN SBufferNode *);
|
||||
|
||||
private:
|
||||
SPendingAssign *PendingAssignList;
|
||||
@@ -145,12 +149,22 @@ public:
|
||||
IN CVfrDataStorage &lCVfrDataStorage,
|
||||
IN CVfrQuestionDB &lCVfrQuestionDB,
|
||||
IN EFI_GUID *LocalFormSetGuid,
|
||||
IN UINT32 LineNo
|
||||
IN UINT32 LineNo,
|
||||
OUT CHAR8 **InsertOpcodeAddr
|
||||
);
|
||||
EFI_VFR_RETURN_CODE AdjustDynamicInsertOpcode (
|
||||
IN CHAR8 *LastFormEndAddr,
|
||||
IN CHAR8 *InsertOpcodeAddr
|
||||
);
|
||||
CHAR8 * GetBufAddrBaseOnOffset (
|
||||
IN UINT32 Offset
|
||||
);
|
||||
};
|
||||
|
||||
extern CFormPkg gCFormPkg;
|
||||
extern CVfrStringDB gCVfrStringDB;
|
||||
extern UINT32 gAdjustOpcodeOffset;
|
||||
extern BOOLEAN gNeedAdjustOpcode;
|
||||
|
||||
struct SIfrRecord {
|
||||
UINT32 mLineNo;
|
||||
@@ -189,6 +203,10 @@ public:
|
||||
mSwitch = FALSE;
|
||||
}
|
||||
|
||||
SIfrRecord * GetRecordInfoFromOffset (IN UINT32);
|
||||
VOID IfrAdjustOffsetForRecord (VOID);
|
||||
BOOLEAN IfrAdjustDynamicOpcodeInRecords (VOID);
|
||||
|
||||
UINT32 IfrRecordRegister (IN UINT32, IN CHAR8 *, IN UINT8, IN UINT32);
|
||||
VOID IfrRecordInfoUpdate (IN UINT32, IN UINT32, IN CHAR8*, IN UINT8, IN UINT32);
|
||||
VOID IfrRecordOutput (IN FILE *, IN UINT32 LineNo);
|
||||
@@ -227,6 +245,10 @@ public:
|
||||
return mObjBinBuf;
|
||||
}
|
||||
|
||||
inline UINT32 GetObjBinOffset (VOID) {
|
||||
return mPkgOffset;
|
||||
}
|
||||
|
||||
inline UINT8 GetObjBinLen (VOID) {
|
||||
return mObjBinLen;
|
||||
}
|
||||
@@ -411,6 +433,10 @@ public:
|
||||
|
||||
return _FLAGS_ZERO (Flags) ? VFR_RETURN_SUCCESS : VFR_RETURN_FLAGS_UNSUPPORTED;
|
||||
}
|
||||
|
||||
VOID UpdateCIfrQuestionHeader (IN EFI_IFR_QUESTION_HEADER *Header) {
|
||||
mHeader = Header;
|
||||
}
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -561,6 +587,10 @@ public:
|
||||
BOOLEAN IsNumericOpcode () {
|
||||
return IsNumeric;
|
||||
}
|
||||
|
||||
VOID UpdateCIfrMinMaxStepData (IN MINMAXSTEP_DATA *MinMaxStepData) {
|
||||
mMinMaxStepData = MinMaxStepData;
|
||||
}
|
||||
};
|
||||
|
||||
static CIfrQuestionHeader *gCurrentQuestion = NULL;
|
||||
@@ -858,7 +888,7 @@ public:
|
||||
|
||||
class CIfrModal : public CIfrObj, public CIfrOpHeader {
|
||||
private:
|
||||
EFI_IFR_MODAL *mModal;
|
||||
EFI_IFR_MODAL_TAG *mModal;
|
||||
|
||||
public:
|
||||
CIfrModal () : CIfrObj (EFI_IFR_MODAL_TAG_OP, (CHAR8 **)&mModal),
|
||||
@@ -900,14 +930,15 @@ private:
|
||||
|
||||
public:
|
||||
CIfrDefault (
|
||||
IN UINT8 Size,
|
||||
IN UINT16 DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD,
|
||||
IN UINT8 Type = EFI_IFR_TYPE_OTHER,
|
||||
IN EFI_IFR_TYPE_VALUE Value = gZeroEfiIfrTypeValue
|
||||
) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault),
|
||||
CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header) {
|
||||
) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault, Size),
|
||||
CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header, Size) {
|
||||
mDefault->Type = Type;
|
||||
mDefault->Value = Value;
|
||||
mDefault->DefaultId = DefaultId;
|
||||
memcpy (&(mDefault->Value), &Value, Size - OFFSET_OF (EFI_IFR_DEFAULT, Value));
|
||||
}
|
||||
|
||||
VOID SetDefaultId (IN UINT16 DefaultId) {
|
||||
@@ -919,7 +950,30 @@ public:
|
||||
}
|
||||
|
||||
VOID SetValue (IN EFI_IFR_TYPE_VALUE Value) {
|
||||
mDefault->Value = Value;
|
||||
memcpy (&mDefault->Value, &Value, mDefault->Header.Length - OFFSET_OF (EFI_IFR_DEFAULT, Value));
|
||||
}
|
||||
};
|
||||
|
||||
class CIfrDefault2 : public CIfrObj, public CIfrOpHeader {
|
||||
private:
|
||||
EFI_IFR_DEFAULT_2 *mDefault;
|
||||
|
||||
public:
|
||||
CIfrDefault2 (
|
||||
IN UINT16 DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD,
|
||||
IN UINT8 Type = EFI_IFR_TYPE_OTHER
|
||||
) : CIfrObj (EFI_IFR_DEFAULT_OP, (CHAR8 **)&mDefault, sizeof (EFI_IFR_DEFAULT_2)),
|
||||
CIfrOpHeader (EFI_IFR_DEFAULT_OP, &mDefault->Header, sizeof (EFI_IFR_DEFAULT_2)) {
|
||||
mDefault->Type = Type;
|
||||
mDefault->DefaultId = DefaultId;
|
||||
}
|
||||
|
||||
VOID SetDefaultId (IN UINT16 DefaultId) {
|
||||
mDefault->DefaultId = DefaultId;
|
||||
}
|
||||
|
||||
VOID SetType (IN UINT8 Type) {
|
||||
mDefault->Type = Type;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1254,7 +1308,7 @@ private:
|
||||
EFI_IFR_NUMERIC *mNumeric;
|
||||
|
||||
public:
|
||||
CIfrNumeric () : CIfrObj (EFI_IFR_NUMERIC_OP, (CHAR8 **)&mNumeric),
|
||||
CIfrNumeric () : CIfrObj (EFI_IFR_NUMERIC_OP, (CHAR8 **)&mNumeric, sizeof (EFI_IFR_NUMERIC), TRUE),
|
||||
CIfrOpHeader (EFI_IFR_NUMERIC_OP, &mNumeric->Header),
|
||||
CIfrQuestionHeader (&mNumeric->Question),
|
||||
CIfrMinMaxStepData (&mNumeric->data, TRUE) {
|
||||
@@ -1268,6 +1322,27 @@ public:
|
||||
gCurrentMinMaxData = NULL;
|
||||
}
|
||||
|
||||
VOID ShrinkBinSize (IN UINT16 Size) {
|
||||
//
|
||||
// Update the buffer size which is truly be used later.
|
||||
//
|
||||
ShrinkObjBin(Size);
|
||||
DecLength(Size);
|
||||
|
||||
//
|
||||
// Allocate buffer in gCFormPkg.
|
||||
//
|
||||
_EMIT_PENDING_OBJ();
|
||||
|
||||
//
|
||||
// Update the buffer pointer used by other class.
|
||||
//
|
||||
mNumeric = (EFI_IFR_NUMERIC *) GetObjBinAddr();
|
||||
UpdateHeader (&mNumeric->Header);
|
||||
UpdateCIfrQuestionHeader(&mNumeric->Question);
|
||||
UpdateCIfrMinMaxStepData(&mNumeric->data);
|
||||
}
|
||||
|
||||
EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, IN UINT8 LFlags) {
|
||||
EFI_VFR_RETURN_CODE Ret;
|
||||
|
||||
@@ -1290,7 +1365,7 @@ private:
|
||||
EFI_IFR_ONE_OF *mOneOf;
|
||||
|
||||
public:
|
||||
CIfrOneOf () : CIfrObj (EFI_IFR_ONE_OF_OP, (CHAR8 **)&mOneOf),
|
||||
CIfrOneOf () : CIfrObj (EFI_IFR_ONE_OF_OP, (CHAR8 **)&mOneOf, sizeof (EFI_IFR_ONE_OF), TRUE),
|
||||
CIfrOpHeader (EFI_IFR_ONE_OF_OP, &mOneOf->Header),
|
||||
CIfrQuestionHeader (&mOneOf->Question),
|
||||
CIfrMinMaxStepData (&mOneOf->data) {
|
||||
@@ -1319,6 +1394,27 @@ public:
|
||||
}
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
VOID ShrinkBinSize (IN UINT16 Size) {
|
||||
//
|
||||
// Update the buffer size which is truly be used later.
|
||||
//
|
||||
ShrinkObjBin(Size);
|
||||
DecLength(Size);
|
||||
|
||||
//
|
||||
// Allocate buffer in gCFormPkg.
|
||||
//
|
||||
_EMIT_PENDING_OBJ();
|
||||
|
||||
//
|
||||
// Update the buffer pointer used by other class.
|
||||
//
|
||||
mOneOf = (EFI_IFR_ONE_OF *) GetObjBinAddr();
|
||||
UpdateHeader (&mOneOf->Header);
|
||||
UpdateCIfrQuestionHeader(&mOneOf->Question);
|
||||
UpdateCIfrMinMaxStepData(&mOneOf->data);
|
||||
}
|
||||
};
|
||||
|
||||
class CIfrString : public CIfrObj, public CIfrOpHeader, public CIfrQuestionHeader {
|
||||
@@ -1581,12 +1677,12 @@ private:
|
||||
EFI_IFR_ONE_OF_OPTION *mOneOfOption;
|
||||
|
||||
public:
|
||||
CIfrOneOfOption () : CIfrObj (EFI_IFR_ONE_OF_OPTION_OP, (CHAR8 **)&mOneOfOption),
|
||||
CIfrOpHeader (EFI_IFR_ONE_OF_OPTION_OP, &mOneOfOption->Header) {
|
||||
CIfrOneOfOption (UINT8 Size) : CIfrObj (EFI_IFR_ONE_OF_OPTION_OP, (CHAR8 **)&mOneOfOption, Size),
|
||||
CIfrOpHeader (EFI_IFR_ONE_OF_OPTION_OP, &mOneOfOption->Header, Size) {
|
||||
mOneOfOption->Flags = 0;
|
||||
mOneOfOption->Option = EFI_STRING_ID_INVALID;
|
||||
mOneOfOption->Type = EFI_IFR_TYPE_OTHER;
|
||||
memset (&mOneOfOption->Value, 0, sizeof (mOneOfOption->Value));
|
||||
memset (&mOneOfOption->Value, 0, Size - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));
|
||||
}
|
||||
|
||||
VOID SetOption (IN EFI_STRING_ID Option) {
|
||||
@@ -1639,7 +1735,7 @@ public:
|
||||
}
|
||||
|
||||
VOID SetValue (IN EFI_IFR_TYPE_VALUE Value) {
|
||||
mOneOfOption->Value = Value;
|
||||
memcpy (&mOneOfOption->Value, &Value, mOneOfOption->Header.Length - OFFSET_OF (EFI_IFR_ONE_OF_OPTION, Value));
|
||||
}
|
||||
|
||||
UINT8 GetFlags (VOID) {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*++
|
||||
Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -494,6 +494,7 @@ vfrFormSetDefinition :
|
||||
UINT8 ClassGuidNum = 0;
|
||||
CIfrFormSet *FSObj = NULL;
|
||||
UINT16 C, SC;
|
||||
CHAR8* InsertOpcodeAddr = NULL;
|
||||
>>
|
||||
L:FormSet
|
||||
Uuid "=" guidDefinition[Guid] ","
|
||||
@@ -585,7 +586,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;
|
||||
}
|
||||
>>
|
||||
";"
|
||||
;
|
||||
@@ -866,7 +898,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);
|
||||
@@ -952,7 +984,7 @@ vfrStatementVarStoreEfi :
|
||||
TypeName,
|
||||
VarStoreId
|
||||
), LineNum);
|
||||
_PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId), SN);
|
||||
_PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId, &Guid), SN);
|
||||
_PCATCH(gCVfrVarDataTypeDB.GetDataTypeSize(TypeName, &Size), LineNum);
|
||||
} else {
|
||||
_PCATCH(mCVfrDataStorage.DeclareBufferVarStore (
|
||||
@@ -962,7 +994,7 @@ vfrStatementVarStoreEfi :
|
||||
TypeName,
|
||||
VarStoreId
|
||||
), LineNum);
|
||||
_PCATCH(mCVfrDataStorage.GetVarStoreId(TN->getText(), &VarStoreId), VN);
|
||||
_PCATCH(mCVfrDataStorage.GetVarStoreId(TN->getText(), &VarStoreId, &Guid), VN);
|
||||
_PCATCH(gCVfrVarDataTypeDB.GetDataTypeSize(TypeName, &Size), N->getLine());
|
||||
}
|
||||
VSEObj.SetGuid (&Guid);
|
||||
@@ -995,7 +1027,7 @@ vfrStatementVarStoreNameValue :
|
||||
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);
|
||||
>>
|
||||
";"
|
||||
@@ -1069,9 +1101,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 "," <<
|
||||
@@ -1119,8 +1156,8 @@ vfrQuestionHeader[CIfrQuestionHeader & QHObj, EFI_QUESION_TYPE QType = QUESTION_
|
||||
<<
|
||||
if (VarIdStr != NULL) {
|
||||
delete VarIdStr;
|
||||
_SAVE_CURRQEST_VARINFO (Info);
|
||||
}
|
||||
_SAVE_CURRQEST_VARINFO (Info);
|
||||
>>
|
||||
;
|
||||
|
||||
@@ -1144,6 +1181,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()); >>
|
||||
@@ -1154,7 +1192,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,
|
||||
@@ -1164,11 +1202,10 @@ 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);
|
||||
}
|
||||
|
||||
@@ -1179,7 +1216,7 @@ vfrStorageVarId[EFI_VARSTORE_INFO & Info, CHAR8 *&QuestVarIdStr, BOOLEAN CheckFl
|
||||
(
|
||||
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,
|
||||
@@ -1189,13 +1226,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);
|
||||
}
|
||||
}
|
||||
@@ -1234,13 +1271,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,
|
||||
@@ -1389,23 +1429,7 @@ vfrFormDefinition :
|
||||
LObj3.SetNumber (0xffff); //add end label for UEFI, label number hardcode 0xffff
|
||||
}
|
||||
|
||||
//
|
||||
// Declare undefined Question so that they can be used in expression.
|
||||
//
|
||||
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 ();}
|
||||
>>
|
||||
";"
|
||||
;
|
||||
@@ -1455,42 +1479,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;}
|
||||
>>
|
||||
)
|
||||
;
|
||||
@@ -1755,7 +1809,11 @@ vfrStatementGoto :
|
||||
default: break;
|
||||
}
|
||||
>>
|
||||
vfrQuestionHeader[*QHObj, QUESTION_REF]
|
||||
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); >>
|
||||
@@ -1824,49 +1882,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"
|
||||
);
|
||||
}
|
||||
}
|
||||
>>
|
||||
}
|
||||
@@ -1962,11 +2033,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
|
||||
)
|
||||
@@ -1998,7 +2074,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 )*
|
||||
)
|
||||
@@ -2126,38 +2202,45 @@ vfrSetMinMaxStep[CIfrMinMaxStepData & MMSDObj] :
|
||||
vfrStatementNumeric :
|
||||
<<
|
||||
CIfrNumeric NObj;
|
||||
UINT32 DataTypeSize;
|
||||
BOOLEAN IsSupported;
|
||||
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]
|
||||
vfrStatementQuestionOptionList
|
||||
E:EndNumeric <<
|
||||
IsSupported = FALSE;
|
||||
vfrSetMinMaxStep[NObj] <<
|
||||
switch (_GET_CURRQEST_DATATYPE()) {
|
||||
case EFI_IFR_TYPE_NUM_SIZE_8:
|
||||
case EFI_IFR_TYPE_NUM_SIZE_16:
|
||||
case EFI_IFR_TYPE_NUM_SIZE_32:
|
||||
case EFI_IFR_TYPE_NUM_SIZE_64:
|
||||
IsSupported = TRUE;
|
||||
break;
|
||||
default:
|
||||
//
|
||||
// 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);
|
||||
>>
|
||||
";"
|
||||
@@ -2168,32 +2251,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; >>
|
||||
@@ -2204,36 +2292,44 @@ vfrStatementOneOf :
|
||||
<<
|
||||
CIfrOneOf OObj;
|
||||
UINT32 DataTypeSize;
|
||||
BOOLEAN IsSupported;
|
||||
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]
|
||||
}
|
||||
vfrStatementQuestionOptionList
|
||||
E:EndOneOf <<
|
||||
IsSupported = FALSE;
|
||||
<<
|
||||
switch (_GET_CURRQEST_DATATYPE()) {
|
||||
case EFI_IFR_TYPE_NUM_SIZE_8:
|
||||
case EFI_IFR_TYPE_NUM_SIZE_16:
|
||||
case EFI_IFR_TYPE_NUM_SIZE_32:
|
||||
case EFI_IFR_TYPE_NUM_SIZE_64:
|
||||
IsSupported = TRUE;
|
||||
break;
|
||||
//
|
||||
// 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);
|
||||
>>
|
||||
";"
|
||||
@@ -2244,21 +2340,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);
|
||||
>>
|
||||
@@ -2423,11 +2524,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
|
||||
)
|
||||
@@ -2459,7 +2565,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 )*
|
||||
)
|
||||
@@ -2774,11 +2880,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] ","
|
||||
<<
|
||||
@@ -2807,24 +2934,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());
|
||||
}
|
||||
}
|
||||
>>
|
||||
{
|
||||
@@ -3237,8 +3371,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) {
|
||||
@@ -3249,7 +3383,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,
|
||||
@@ -3887,6 +4021,13 @@ 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
|
||||
@@ -3902,6 +4043,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 *);
|
||||
@@ -4485,7 +4627,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);
|
||||
@@ -4510,7 +4652,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);
|
||||
@@ -4531,7 +4673,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);
|
||||
@@ -4762,4 +4904,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;
|
||||
}
|
||||
>>
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
Vfr common library functions.
|
||||
|
||||
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -123,11 +123,13 @@ SConfigInfo::~SConfigInfo (
|
||||
|
||||
SConfigItem::SConfigItem (
|
||||
IN CHAR8 *Name,
|
||||
IN EFI_GUID *Guid,
|
||||
IN CHAR8 *Id
|
||||
)
|
||||
{
|
||||
mName = NULL;
|
||||
mId = 0;
|
||||
mGuid = NULL;
|
||||
mId = NULL;
|
||||
mInfoStrList = NULL;
|
||||
mNext = NULL;
|
||||
|
||||
@@ -137,6 +139,12 @@ SConfigItem::SConfigItem (
|
||||
}
|
||||
}
|
||||
|
||||
if (Guid != NULL) {
|
||||
if ((mGuid = (EFI_GUID *) new CHAR8[sizeof (EFI_GUID)]) != NULL) {
|
||||
memcpy (mGuid, Guid, sizeof (EFI_GUID));
|
||||
}
|
||||
}
|
||||
|
||||
if (Id != NULL) {
|
||||
if ((mId = new CHAR8[strlen (Id) + 1]) != NULL) {
|
||||
strcpy (mId, Id);
|
||||
@@ -146,6 +154,7 @@ SConfigItem::SConfigItem (
|
||||
|
||||
SConfigItem::SConfigItem (
|
||||
IN CHAR8 *Name,
|
||||
IN EFI_GUID *Guid,
|
||||
IN CHAR8 *Id,
|
||||
IN UINT8 Type,
|
||||
IN UINT16 Offset,
|
||||
@@ -154,6 +163,7 @@ SConfigItem::SConfigItem (
|
||||
)
|
||||
{
|
||||
mName = NULL;
|
||||
mGuid = NULL;
|
||||
mId = NULL;
|
||||
mInfoStrList = NULL;
|
||||
mNext = NULL;
|
||||
@@ -164,6 +174,12 @@ SConfigItem::SConfigItem (
|
||||
}
|
||||
}
|
||||
|
||||
if (Guid != NULL) {
|
||||
if ((mGuid = (EFI_GUID *) new CHAR8[sizeof (EFI_GUID)]) != NULL) {
|
||||
memcpy (mGuid, Guid, sizeof (EFI_GUID));
|
||||
}
|
||||
}
|
||||
|
||||
if (Id != NULL) {
|
||||
if ((mId = new CHAR8[strlen (Id) + 1]) != NULL) {
|
||||
strcpy (mId, Id);
|
||||
@@ -180,6 +196,7 @@ SConfigItem::~SConfigItem (
|
||||
SConfigInfo *Info;
|
||||
|
||||
BUFFER_SAFE_FREE (mName);
|
||||
BUFFER_SAFE_FREE (mGuid);
|
||||
BUFFER_SAFE_FREE (mId);
|
||||
while (mInfoStrList != NULL) {
|
||||
Info = mInfoStrList;
|
||||
@@ -192,18 +209,20 @@ SConfigItem::~SConfigItem (
|
||||
UINT8
|
||||
CVfrBufferConfig::Register (
|
||||
IN CHAR8 *Name,
|
||||
IN EFI_GUID *Guid,
|
||||
IN CHAR8 *Id
|
||||
)
|
||||
{
|
||||
SConfigItem *pNew;
|
||||
|
||||
if (Select (Name) == 0) {
|
||||
if (Select (Name, Guid) == 0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ((pNew = new SConfigItem (Name, Id)) == NULL) {
|
||||
if ((pNew = new SConfigItem (Name, Guid, Id)) == NULL) {
|
||||
return 2;
|
||||
}
|
||||
|
||||
if (mItemListHead == NULL) {
|
||||
mItemListHead = pNew;
|
||||
mItemListTail = pNew;
|
||||
@@ -234,18 +253,19 @@ CVfrBufferConfig::Eof(
|
||||
|
||||
UINT8
|
||||
CVfrBufferConfig::Select (
|
||||
IN CHAR8 *Name,
|
||||
IN CHAR8 *Id
|
||||
IN CHAR8 *Name,
|
||||
IN EFI_GUID *Guid,
|
||||
IN CHAR8 *Id
|
||||
)
|
||||
{
|
||||
SConfigItem *p;
|
||||
|
||||
if (Name == NULL) {
|
||||
if (Name == NULL || Guid == NULL) {
|
||||
mItemListPos = mItemListHead;
|
||||
return 0;
|
||||
} else {
|
||||
for (p = mItemListHead; p != NULL; p = p->mNext) {
|
||||
if (strcmp (p->mName, Name) != 0) {
|
||||
if ((strcmp (p->mName, Name) != 0) || (memcmp (p->mGuid, Guid, sizeof (EFI_GUID)) != 0)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -269,6 +289,7 @@ UINT8
|
||||
CVfrBufferConfig::Write (
|
||||
IN CONST CHAR8 Mode,
|
||||
IN CHAR8 *Name,
|
||||
IN EFI_GUID *Guid,
|
||||
IN CHAR8 *Id,
|
||||
IN UINT8 Type,
|
||||
IN UINT16 Offset,
|
||||
@@ -280,14 +301,14 @@ CVfrBufferConfig::Write (
|
||||
SConfigItem *pItem;
|
||||
SConfigInfo *pInfo;
|
||||
|
||||
if ((Ret = Select (Name)) != 0) {
|
||||
if ((Ret = Select (Name, Guid)) != 0) {
|
||||
return Ret;
|
||||
}
|
||||
|
||||
switch (Mode) {
|
||||
case 'a' : // add
|
||||
if (Select (Name, Id) != 0) {
|
||||
if ((pItem = new SConfigItem (Name, Id, Type, Offset, (UINT16) Width, Value)) == NULL) {
|
||||
if (Select (Name, Guid, Id) != 0) {
|
||||
if ((pItem = new SConfigItem (Name, Guid, Id, Type, Offset, (UINT16) Width, Value)) == NULL) {
|
||||
return 2;
|
||||
}
|
||||
if (mItemListHead == NULL) {
|
||||
@@ -302,10 +323,6 @@ CVfrBufferConfig::Write (
|
||||
// tranverse the list to find out if there's already the value for the same offset
|
||||
for (pInfo = mItemListPos->mInfoStrList; pInfo != NULL; pInfo = pInfo->mNext) {
|
||||
if (pInfo->mOffset == Offset) {
|
||||
// check if the value and width are the same; return error if not
|
||||
if ((Id != NULL) && (pInfo->mWidth != Width || memcmp(pInfo->mValue, &Value, Width) != 0)) {
|
||||
return VFR_RETURN_DEFAULT_VALUE_REDEFINED;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -1578,7 +1595,7 @@ CVfrDataStorage::DeclareEfiVarStore (
|
||||
return VFR_RETURN_EFIVARSTORE_SIZE_ERROR;
|
||||
}
|
||||
|
||||
if (GetVarStoreId (StoreName, &VarStoreId) == VFR_RETURN_SUCCESS) {
|
||||
if (GetVarStoreId (StoreName, &VarStoreId, Guid) == VFR_RETURN_SUCCESS) {
|
||||
return VFR_RETURN_REDEFINED;
|
||||
}
|
||||
|
||||
@@ -1611,7 +1628,7 @@ CVfrDataStorage::DeclareBufferVarStore (
|
||||
return VFR_RETURN_FATAL_ERROR;
|
||||
}
|
||||
|
||||
if (GetVarStoreId (StoreName, &TempVarStoreId) == VFR_RETURN_SUCCESS) {
|
||||
if (GetVarStoreId (StoreName, &TempVarStoreId, Guid) == VFR_RETURN_SUCCESS) {
|
||||
return VFR_RETURN_REDEFINED;
|
||||
}
|
||||
|
||||
@@ -1633,7 +1650,7 @@ CVfrDataStorage::DeclareBufferVarStore (
|
||||
pNew->mNext = mBufferVarStoreList;
|
||||
mBufferVarStoreList = pNew;
|
||||
|
||||
if (gCVfrBufferConfig.Register(StoreName) != 0) {
|
||||
if (gCVfrBufferConfig.Register(StoreName, Guid) != 0) {
|
||||
return VFR_RETURN_FATAL_ERROR;
|
||||
}
|
||||
|
||||
@@ -1643,7 +1660,8 @@ CVfrDataStorage::DeclareBufferVarStore (
|
||||
EFI_VFR_RETURN_CODE
|
||||
CVfrDataStorage::GetVarStoreByDataType (
|
||||
IN CHAR8 *DataTypeName,
|
||||
OUT SVfrVarStorageNode **VarNode
|
||||
OUT SVfrVarStorageNode **VarNode,
|
||||
IN EFI_GUID *VarGuid
|
||||
)
|
||||
{
|
||||
SVfrVarStorageNode *pNode;
|
||||
@@ -1658,7 +1676,16 @@ CVfrDataStorage::GetVarStoreByDataType (
|
||||
|
||||
MatchNode = NULL;
|
||||
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (strcmp (pNode->mStorageInfo.mDataType->mTypeName, DataTypeName) == 0) {
|
||||
if (strcmp (pNode->mStorageInfo.mDataType->mTypeName, DataTypeName) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ((VarGuid != NULL)) {
|
||||
if (memcmp (VarGuid, &pNode->mGuid, sizeof (EFI_GUID)) == 0) {
|
||||
*VarNode = pNode;
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
} else {
|
||||
if (MatchNode == NULL) {
|
||||
MatchNode = pNode;
|
||||
} else {
|
||||
@@ -1678,46 +1705,108 @@ CVfrDataStorage::GetVarStoreByDataType (
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
EFI_VARSTORE_ID
|
||||
CVfrDataStorage::CheckGuidField (
|
||||
IN SVfrVarStorageNode *pNode,
|
||||
IN EFI_GUID *StoreGuid,
|
||||
IN BOOLEAN *HasFoundOne,
|
||||
OUT EFI_VFR_RETURN_CODE *ReturnCode
|
||||
)
|
||||
{
|
||||
if (StoreGuid != NULL) {
|
||||
//
|
||||
// If has guid info, compare the guid filed.
|
||||
//
|
||||
if (memcmp (StoreGuid, &pNode->mGuid, sizeof (EFI_GUID)) == 0) {
|
||||
//
|
||||
// Both name and guid are same, this this varstore.
|
||||
//
|
||||
mCurrVarStorageNode = pNode;
|
||||
*ReturnCode = VFR_RETURN_SUCCESS;
|
||||
return TRUE;
|
||||
}
|
||||
} else {
|
||||
//
|
||||
// Not has Guid field, check whether this name is the only one.
|
||||
//
|
||||
if (*HasFoundOne) {
|
||||
//
|
||||
// The name has conflict, return name redefined.
|
||||
//
|
||||
*ReturnCode = VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
*HasFoundOne = TRUE;
|
||||
mCurrVarStorageNode = pNode;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
Base on the input store name and guid to find the varstore id.
|
||||
|
||||
If both name and guid are inputed, base on the name and guid to
|
||||
found the varstore. If only name inputed, base on the name to
|
||||
found the varstore and go on to check whether more than one varstore
|
||||
has the same name. If only has found one varstore, return this
|
||||
varstore; if more than one varstore has same name, return varstore
|
||||
name redefined error. If no varstore found by varstore name, call
|
||||
function GetVarStoreByDataType and use inputed varstore name as
|
||||
data type name to search.
|
||||
**/
|
||||
EFI_VFR_RETURN_CODE
|
||||
CVfrDataStorage::GetVarStoreId (
|
||||
IN CHAR8 *StoreName,
|
||||
OUT EFI_VARSTORE_ID *VarStoreId
|
||||
OUT EFI_VARSTORE_ID *VarStoreId,
|
||||
IN EFI_GUID *StoreGuid
|
||||
)
|
||||
{
|
||||
EFI_VFR_RETURN_CODE ReturnCode;
|
||||
SVfrVarStorageNode *pNode;
|
||||
BOOLEAN HasFoundOne = FALSE;
|
||||
|
||||
mCurrVarStorageNode = NULL;
|
||||
|
||||
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
|
||||
mCurrVarStorageNode = pNode;
|
||||
*VarStoreId = pNode->mVarStoreId;
|
||||
return VFR_RETURN_SUCCESS;
|
||||
if (CheckGuidField(pNode, StoreGuid, &HasFoundOne, &ReturnCode)) {
|
||||
*VarStoreId = mCurrVarStorageNode->mVarStoreId;
|
||||
return ReturnCode;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
|
||||
mCurrVarStorageNode = pNode;
|
||||
*VarStoreId = pNode->mVarStoreId;
|
||||
return VFR_RETURN_SUCCESS;
|
||||
if (CheckGuidField(pNode, StoreGuid, &HasFoundOne, &ReturnCode)) {
|
||||
*VarStoreId = mCurrVarStorageNode->mVarStoreId;
|
||||
return ReturnCode;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
|
||||
mCurrVarStorageNode = pNode;
|
||||
*VarStoreId = pNode->mVarStoreId;
|
||||
return VFR_RETURN_SUCCESS;
|
||||
if (CheckGuidField(pNode, StoreGuid, &HasFoundOne, &ReturnCode)) {
|
||||
*VarStoreId = mCurrVarStorageNode->mVarStoreId;
|
||||
return ReturnCode;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mCurrVarStorageNode = NULL;
|
||||
if (HasFoundOne) {
|
||||
*VarStoreId = mCurrVarStorageNode->mVarStoreId;
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
*VarStoreId = EFI_VARSTORE_ID_INVALID;
|
||||
|
||||
//
|
||||
// Assume that Data strucutre name is used as StoreName, and check again.
|
||||
//
|
||||
ReturnCode = GetVarStoreByDataType (StoreName, &pNode);
|
||||
ReturnCode = GetVarStoreByDataType (StoreName, &pNode, StoreGuid);
|
||||
if (pNode != NULL) {
|
||||
mCurrVarStorageNode = pNode;
|
||||
*VarStoreId = pNode->mVarStoreId;
|
||||
@@ -1728,88 +1817,24 @@ CVfrDataStorage::GetVarStoreId (
|
||||
|
||||
EFI_VFR_RETURN_CODE
|
||||
CVfrDataStorage::GetBufferVarStoreDataTypeName (
|
||||
IN CHAR8 *StoreName,
|
||||
IN EFI_VARSTORE_ID VarStoreId,
|
||||
OUT CHAR8 **DataTypeName
|
||||
)
|
||||
{
|
||||
SVfrVarStorageNode *pNode;
|
||||
EFI_VFR_RETURN_CODE ReturnCode;
|
||||
|
||||
if ((StoreName == NULL) || (DataTypeName == NULL)) {
|
||||
if (VarStoreId == EFI_VARSTORE_ID_INVALID) {
|
||||
return VFR_RETURN_FATAL_ERROR;
|
||||
}
|
||||
|
||||
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ReturnCode = VFR_RETURN_UNDEFINED;
|
||||
//
|
||||
// Assume that Data strucutre name is used as StoreName, and check again.
|
||||
//
|
||||
if (pNode == NULL) {
|
||||
ReturnCode = GetVarStoreByDataType (StoreName, &pNode);
|
||||
}
|
||||
|
||||
if (pNode == NULL) {
|
||||
return ReturnCode;
|
||||
}
|
||||
|
||||
if (pNode->mStorageInfo.mDataType == NULL) {
|
||||
return VFR_RETURN_FATAL_ERROR;
|
||||
}
|
||||
|
||||
*DataTypeName = pNode->mStorageInfo.mDataType->mTypeName;
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
EFI_VFR_RETURN_CODE
|
||||
CVfrDataStorage::GetVarStoreType (
|
||||
IN CHAR8 *StoreName,
|
||||
OUT EFI_VFR_VARSTORE_TYPE &VarStoreType
|
||||
)
|
||||
{
|
||||
SVfrVarStorageNode *pNode;
|
||||
EFI_VFR_RETURN_CODE ReturnCode;
|
||||
|
||||
if (StoreName == NULL) {
|
||||
return VFR_RETURN_FATAL_ERROR;
|
||||
}
|
||||
|
||||
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
|
||||
VarStoreType = pNode->mVarStoreType;
|
||||
if (pNode->mVarStoreId == VarStoreId) {
|
||||
*DataTypeName = pNode->mStorageInfo.mDataType->mTypeName;
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
|
||||
VarStoreType = pNode->mVarStoreType;
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
|
||||
VarStoreType = pNode->mVarStoreType;
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
VarStoreType = EFI_VFR_VARSTORE_INVALID;
|
||||
|
||||
//
|
||||
// Assume that Data strucutre name is used as StoreName, and check again.
|
||||
//
|
||||
ReturnCode = GetVarStoreByDataType (StoreName, &pNode);
|
||||
if (pNode != NULL) {
|
||||
VarStoreType = pNode->mVarStoreType;
|
||||
}
|
||||
|
||||
return ReturnCode;
|
||||
return VFR_RETURN_UNDEFINED;
|
||||
}
|
||||
|
||||
EFI_VFR_VARSTORE_TYPE
|
||||
@@ -1850,6 +1875,44 @@ CVfrDataStorage::GetVarStoreType (
|
||||
return VarStoreType;
|
||||
}
|
||||
|
||||
EFI_GUID *
|
||||
CVfrDataStorage::GetVarStoreGuid (
|
||||
IN EFI_VARSTORE_ID VarStoreId
|
||||
)
|
||||
{
|
||||
SVfrVarStorageNode *pNode;
|
||||
EFI_GUID *VarGuid;
|
||||
|
||||
VarGuid = NULL;
|
||||
|
||||
if (VarStoreId == EFI_VARSTORE_ID_INVALID) {
|
||||
return VarGuid;
|
||||
}
|
||||
|
||||
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (pNode->mVarStoreId == VarStoreId) {
|
||||
VarGuid = &pNode->mGuid;
|
||||
return VarGuid;
|
||||
}
|
||||
}
|
||||
|
||||
for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (pNode->mVarStoreId == VarStoreId) {
|
||||
VarGuid = &pNode->mGuid;
|
||||
return VarGuid;
|
||||
}
|
||||
}
|
||||
|
||||
for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (pNode->mVarStoreId == VarStoreId) {
|
||||
VarGuid = &pNode->mGuid;
|
||||
return VarGuid;
|
||||
}
|
||||
}
|
||||
|
||||
return VarGuid;
|
||||
}
|
||||
|
||||
EFI_VFR_RETURN_CODE
|
||||
CVfrDataStorage::GetVarStoreName (
|
||||
IN EFI_VARSTORE_ID VarStoreId,
|
||||
@@ -1951,44 +2014,6 @@ CVfrDataStorage::GetNameVarStoreInfo (
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
EFI_VFR_RETURN_CODE
|
||||
CVfrDataStorage::BufferVarStoreRequestElementAdd (
|
||||
IN CHAR8 *StoreName,
|
||||
IN EFI_VARSTORE_INFO &Info
|
||||
)
|
||||
{
|
||||
SVfrVarStorageNode *pNode = NULL;
|
||||
EFI_IFR_TYPE_VALUE Value = gZeroEfiIfrTypeValue;
|
||||
EFI_VFR_RETURN_CODE ReturnCode;
|
||||
|
||||
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {
|
||||
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ReturnCode = VFR_RETURN_UNDEFINED;
|
||||
//
|
||||
// Assume that Data strucutre name is used as StoreName, and check again.
|
||||
//
|
||||
if (pNode == NULL) {
|
||||
ReturnCode = GetVarStoreByDataType (StoreName, &pNode);
|
||||
}
|
||||
|
||||
if (pNode == NULL) {
|
||||
return ReturnCode;
|
||||
}
|
||||
|
||||
gCVfrBufferConfig.Open ();
|
||||
Value.u8 = 0;
|
||||
if (gCVfrBufferConfig.Write ('a', StoreName, NULL, EFI_IFR_TYPE_NUM_SIZE_8, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value) != 0) {
|
||||
return VFR_RETURN_FATAL_ERROR;
|
||||
}
|
||||
gCVfrBufferConfig.Close ();
|
||||
|
||||
return VFR_RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
SVfrDefaultStoreNode::SVfrDefaultStoreNode (
|
||||
IN EFI_IFR_DEFAULTSTORE *ObjBinAddr,
|
||||
IN CHAR8 *RefName,
|
||||
@@ -2155,6 +2180,7 @@ CVfrDefaultStore::BufferVarStoreAltConfigAdd (
|
||||
IN EFI_VARSTORE_ID DefaultId,
|
||||
IN EFI_VARSTORE_INFO &Info,
|
||||
IN CHAR8 *VarStoreName,
|
||||
IN EFI_GUID *VarStoreGuid,
|
||||
IN UINT8 Type,
|
||||
IN EFI_IFR_TYPE_VALUE Value
|
||||
)
|
||||
@@ -2180,8 +2206,8 @@ CVfrDefaultStore::BufferVarStoreAltConfigAdd (
|
||||
gCVfrBufferConfig.Open ();
|
||||
|
||||
sprintf (NewAltCfg, "%04x", pNode->mDefaultId);
|
||||
if ((Returnvalue = gCVfrBufferConfig.Select(VarStoreName)) == 0) {
|
||||
if ((Returnvalue = gCVfrBufferConfig.Write ('a', VarStoreName, NewAltCfg, Type, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value)) != 0) {
|
||||
if ((Returnvalue = gCVfrBufferConfig.Select(VarStoreName, VarStoreGuid)) == 0) {
|
||||
if ((Returnvalue = gCVfrBufferConfig.Write ('a', VarStoreName, VarStoreGuid, NewAltCfg, Type, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value)) != 0) {
|
||||
goto WriteError;
|
||||
}
|
||||
}
|
||||
@@ -2592,26 +2618,46 @@ CVfrQuestionDB::RegisterNewDateQuestion (
|
||||
CHAR8 *VarIdStr[3] = {NULL, };
|
||||
CHAR8 Index;
|
||||
|
||||
if (BaseVarId == NULL) {
|
||||
if (BaseVarId == NULL && Name == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
Len = strlen (BaseVarId);
|
||||
if (BaseVarId != NULL) {
|
||||
Len = strlen (BaseVarId);
|
||||
|
||||
VarIdStr[0] = new CHAR8[Len + strlen (".Year") + 1];
|
||||
if (VarIdStr[0] != NULL) {
|
||||
strcpy (VarIdStr[0], BaseVarId);
|
||||
strcat (VarIdStr[0], ".Year");
|
||||
}
|
||||
VarIdStr[1] = new CHAR8[Len + strlen (".Month") + 1];
|
||||
if (VarIdStr[1] != NULL) {
|
||||
strcpy (VarIdStr[1], BaseVarId);
|
||||
strcat (VarIdStr[1], ".Month");
|
||||
}
|
||||
VarIdStr[2] = new CHAR8[Len + strlen (".Day") + 1];
|
||||
if (VarIdStr[2] != NULL) {
|
||||
strcpy (VarIdStr[2], BaseVarId);
|
||||
strcat (VarIdStr[2], ".Day");
|
||||
VarIdStr[0] = new CHAR8[Len + strlen (".Year") + 1];
|
||||
if (VarIdStr[0] != NULL) {
|
||||
strcpy (VarIdStr[0], BaseVarId);
|
||||
strcat (VarIdStr[0], ".Year");
|
||||
}
|
||||
VarIdStr[1] = new CHAR8[Len + strlen (".Month") + 1];
|
||||
if (VarIdStr[1] != NULL) {
|
||||
strcpy (VarIdStr[1], BaseVarId);
|
||||
strcat (VarIdStr[1], ".Month");
|
||||
}
|
||||
VarIdStr[2] = new CHAR8[Len + strlen (".Day") + 1];
|
||||
if (VarIdStr[2] != NULL) {
|
||||
strcpy (VarIdStr[2], BaseVarId);
|
||||
strcat (VarIdStr[2], ".Day");
|
||||
}
|
||||
} else {
|
||||
Len = strlen (Name);
|
||||
|
||||
VarIdStr[0] = new CHAR8[Len + strlen (".Year") + 1];
|
||||
if (VarIdStr[0] != NULL) {
|
||||
strcpy (VarIdStr[0], Name);
|
||||
strcat (VarIdStr[0], ".Year");
|
||||
}
|
||||
VarIdStr[1] = new CHAR8[Len + strlen (".Month") + 1];
|
||||
if (VarIdStr[1] != NULL) {
|
||||
strcpy (VarIdStr[1], Name);
|
||||
strcat (VarIdStr[1], ".Month");
|
||||
}
|
||||
VarIdStr[2] = new CHAR8[Len + strlen (".Day") + 1];
|
||||
if (VarIdStr[2] != NULL) {
|
||||
strcpy (VarIdStr[2], Name);
|
||||
strcat (VarIdStr[2], ".Day");
|
||||
}
|
||||
}
|
||||
|
||||
if ((pNode[0] = new SVfrQuestionNode (Name, VarIdStr[0], DATE_YEAR_BITMASK)) == NULL) {
|
||||
@@ -2740,26 +2786,46 @@ CVfrQuestionDB::RegisterNewTimeQuestion (
|
||||
CHAR8 *VarIdStr[3] = {NULL, };
|
||||
CHAR8 Index;
|
||||
|
||||
if (BaseVarId == NULL) {
|
||||
if (BaseVarId == NULL && Name == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
Len = strlen (BaseVarId);
|
||||
if (BaseVarId != NULL) {
|
||||
Len = strlen (BaseVarId);
|
||||
|
||||
VarIdStr[0] = new CHAR8[Len + strlen (".Hour") + 1];
|
||||
if (VarIdStr[0] != NULL) {
|
||||
strcpy (VarIdStr[0], BaseVarId);
|
||||
strcat (VarIdStr[0], ".Hour");
|
||||
}
|
||||
VarIdStr[1] = new CHAR8[Len + strlen (".Minute") + 1];
|
||||
if (VarIdStr[1] != NULL) {
|
||||
strcpy (VarIdStr[1], BaseVarId);
|
||||
strcat (VarIdStr[1], ".Minute");
|
||||
}
|
||||
VarIdStr[2] = new CHAR8[Len + strlen (".Second") + 1];
|
||||
if (VarIdStr[2] != NULL) {
|
||||
strcpy (VarIdStr[2], BaseVarId);
|
||||
strcat (VarIdStr[2], ".Second");
|
||||
VarIdStr[0] = new CHAR8[Len + strlen (".Hour") + 1];
|
||||
if (VarIdStr[0] != NULL) {
|
||||
strcpy (VarIdStr[0], BaseVarId);
|
||||
strcat (VarIdStr[0], ".Hour");
|
||||
}
|
||||
VarIdStr[1] = new CHAR8[Len + strlen (".Minute") + 1];
|
||||
if (VarIdStr[1] != NULL) {
|
||||
strcpy (VarIdStr[1], BaseVarId);
|
||||
strcat (VarIdStr[1], ".Minute");
|
||||
}
|
||||
VarIdStr[2] = new CHAR8[Len + strlen (".Second") + 1];
|
||||
if (VarIdStr[2] != NULL) {
|
||||
strcpy (VarIdStr[2], BaseVarId);
|
||||
strcat (VarIdStr[2], ".Second");
|
||||
}
|
||||
} else {
|
||||
Len = strlen (Name);
|
||||
|
||||
VarIdStr[0] = new CHAR8[Len + strlen (".Hour") + 1];
|
||||
if (VarIdStr[0] != NULL) {
|
||||
strcpy (VarIdStr[0], Name);
|
||||
strcat (VarIdStr[0], ".Hour");
|
||||
}
|
||||
VarIdStr[1] = new CHAR8[Len + strlen (".Minute") + 1];
|
||||
if (VarIdStr[1] != NULL) {
|
||||
strcpy (VarIdStr[1], Name);
|
||||
strcat (VarIdStr[1], ".Minute");
|
||||
}
|
||||
VarIdStr[2] = new CHAR8[Len + strlen (".Second") + 1];
|
||||
if (VarIdStr[2] != NULL) {
|
||||
strcpy (VarIdStr[2], Name);
|
||||
strcat (VarIdStr[2], ".Second");
|
||||
}
|
||||
}
|
||||
|
||||
if ((pNode[0] = new SVfrQuestionNode (Name, VarIdStr[0], TIME_HOUR_BITMASK)) == NULL) {
|
||||
@@ -2828,31 +2894,56 @@ CVfrQuestionDB::RegisterRefQuestion (
|
||||
CHAR8 *VarIdStr[4] = {NULL, };
|
||||
CHAR8 Index;
|
||||
|
||||
if (BaseVarId == NULL) {
|
||||
if (BaseVarId == NULL && Name == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
Len = strlen (BaseVarId);
|
||||
if (BaseVarId != NULL) {
|
||||
Len = strlen (BaseVarId);
|
||||
|
||||
VarIdStr[0] = new CHAR8[Len + strlen (".QuestionId") + 1];
|
||||
if (VarIdStr[0] != NULL) {
|
||||
strcpy (VarIdStr[0], BaseVarId);
|
||||
strcat (VarIdStr[0], ".QuestionId");
|
||||
}
|
||||
VarIdStr[1] = new CHAR8[Len + strlen (".FormId") + 1];
|
||||
if (VarIdStr[1] != NULL) {
|
||||
strcpy (VarIdStr[1], BaseVarId);
|
||||
strcat (VarIdStr[1], ".FormId");
|
||||
}
|
||||
VarIdStr[2] = new CHAR8[Len + strlen (".FormSetGuid") + 1];
|
||||
if (VarIdStr[2] != NULL) {
|
||||
strcpy (VarIdStr[2], BaseVarId);
|
||||
strcat (VarIdStr[2], ".FormSetGuid");
|
||||
}
|
||||
VarIdStr[3] = new CHAR8[Len + strlen (".DevicePath") + 1];
|
||||
if (VarIdStr[3] != NULL) {
|
||||
strcpy (VarIdStr[3], BaseVarId);
|
||||
strcat (VarIdStr[3], ".DevicePath");
|
||||
VarIdStr[0] = new CHAR8[Len + strlen (".QuestionId") + 1];
|
||||
if (VarIdStr[0] != NULL) {
|
||||
strcpy (VarIdStr[0], BaseVarId);
|
||||
strcat (VarIdStr[0], ".QuestionId");
|
||||
}
|
||||
VarIdStr[1] = new CHAR8[Len + strlen (".FormId") + 1];
|
||||
if (VarIdStr[1] != NULL) {
|
||||
strcpy (VarIdStr[1], BaseVarId);
|
||||
strcat (VarIdStr[1], ".FormId");
|
||||
}
|
||||
VarIdStr[2] = new CHAR8[Len + strlen (".FormSetGuid") + 1];
|
||||
if (VarIdStr[2] != NULL) {
|
||||
strcpy (VarIdStr[2], BaseVarId);
|
||||
strcat (VarIdStr[2], ".FormSetGuid");
|
||||
}
|
||||
VarIdStr[3] = new CHAR8[Len + strlen (".DevicePath") + 1];
|
||||
if (VarIdStr[3] != NULL) {
|
||||
strcpy (VarIdStr[3], BaseVarId);
|
||||
strcat (VarIdStr[3], ".DevicePath");
|
||||
}
|
||||
} else {
|
||||
Len = strlen (Name);
|
||||
|
||||
VarIdStr[0] = new CHAR8[Len + strlen (".QuestionId") + 1];
|
||||
if (VarIdStr[0] != NULL) {
|
||||
strcpy (VarIdStr[0], Name);
|
||||
strcat (VarIdStr[0], ".QuestionId");
|
||||
}
|
||||
VarIdStr[1] = new CHAR8[Len + strlen (".FormId") + 1];
|
||||
if (VarIdStr[1] != NULL) {
|
||||
strcpy (VarIdStr[1], Name);
|
||||
strcat (VarIdStr[1], ".FormId");
|
||||
}
|
||||
VarIdStr[2] = new CHAR8[Len + strlen (".FormSetGuid") + 1];
|
||||
if (VarIdStr[2] != NULL) {
|
||||
strcpy (VarIdStr[2], Name);
|
||||
strcat (VarIdStr[2], ".FormSetGuid");
|
||||
}
|
||||
VarIdStr[3] = new CHAR8[Len + strlen (".DevicePath") + 1];
|
||||
if (VarIdStr[3] != NULL) {
|
||||
strcpy (VarIdStr[3], Name);
|
||||
strcat (VarIdStr[3], ".DevicePath");
|
||||
}
|
||||
}
|
||||
|
||||
if ((pNode[0] = new SVfrQuestionNode (Name, VarIdStr[0])) == NULL) {
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
Vfr common library functions.
|
||||
|
||||
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
|
||||
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
|
||||
@@ -57,13 +57,14 @@ struct SConfigInfo {
|
||||
|
||||
struct SConfigItem {
|
||||
CHAR8 *mName; // varstore name
|
||||
CHAR8 *mId; // varstore ID
|
||||
EFI_GUID *mGuid; // varstore guid, varstore name + guid deside one varstore
|
||||
CHAR8 *mId; // default ID
|
||||
SConfigInfo *mInfoStrList; // list of Offset/Value in the varstore
|
||||
SConfigItem *mNext;
|
||||
|
||||
public:
|
||||
SConfigItem (IN CHAR8 *, IN CHAR8 *);
|
||||
SConfigItem (IN CHAR8 *, IN CHAR8 *, IN UINT8, IN UINT16, IN UINT16, IN EFI_IFR_TYPE_VALUE);
|
||||
SConfigItem (IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *);
|
||||
SConfigItem (IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *, IN UINT8, IN UINT16, IN UINT16, IN EFI_IFR_TYPE_VALUE);
|
||||
virtual ~SConfigItem ();
|
||||
};
|
||||
|
||||
@@ -77,11 +78,11 @@ public:
|
||||
CVfrBufferConfig (VOID);
|
||||
virtual ~CVfrBufferConfig (VOID);
|
||||
|
||||
virtual UINT8 Register (IN CHAR8 *, IN CHAR8 *Info = NULL);
|
||||
virtual UINT8 Register (IN CHAR8 *, IN EFI_GUID *,IN CHAR8 *Info = NULL);
|
||||
virtual VOID Open (VOID);
|
||||
virtual BOOLEAN Eof(VOID);
|
||||
virtual UINT8 Select (IN CHAR8 *, IN CHAR8 *Info = NULL);
|
||||
virtual UINT8 Write (IN CONST CHAR8, IN CHAR8 *, IN CHAR8 *, IN UINT8, IN UINT16, IN UINT32, IN EFI_IFR_TYPE_VALUE);
|
||||
virtual UINT8 Select (IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *Info = NULL);
|
||||
virtual UINT8 Write (IN CONST CHAR8, IN CHAR8 *, IN EFI_GUID *, IN CHAR8 *, IN UINT8, IN UINT16, IN UINT32, IN EFI_IFR_TYPE_VALUE);
|
||||
#if 0
|
||||
virtual UINT8 Read (OUT CHAR8 **, OUT CHAR8 **, OUT CHAR8 **, OUT CHAR8 **, OUT CHAR8 **);
|
||||
#endif
|
||||
@@ -284,6 +285,10 @@ private:
|
||||
BOOLEAN ChekVarStoreIdFree (IN EFI_VARSTORE_ID);
|
||||
VOID MarkVarStoreIdUsed (IN EFI_VARSTORE_ID);
|
||||
VOID MarkVarStoreIdUnused (IN EFI_VARSTORE_ID);
|
||||
EFI_VARSTORE_ID CheckGuidField (IN SVfrVarStorageNode *,
|
||||
IN EFI_GUID *,
|
||||
IN BOOLEAN *,
|
||||
OUT EFI_VFR_RETURN_CODE *);
|
||||
|
||||
public:
|
||||
CVfrDataStorage ();
|
||||
@@ -303,17 +308,15 @@ public:
|
||||
|
||||
EFI_VFR_RETURN_CODE DeclareBufferVarStore (IN CHAR8 *, IN EFI_GUID *, IN CVfrVarDataTypeDB *, IN CHAR8 *, IN EFI_VARSTORE_ID, IN BOOLEAN Flag = TRUE);
|
||||
|
||||
EFI_VFR_RETURN_CODE GetVarStoreId (IN CHAR8 *, OUT EFI_VARSTORE_ID *);
|
||||
EFI_VFR_RETURN_CODE GetVarStoreType (IN CHAR8 *, OUT EFI_VFR_VARSTORE_TYPE &);
|
||||
EFI_VFR_RETURN_CODE GetVarStoreId (IN CHAR8 *, OUT EFI_VARSTORE_ID *, IN EFI_GUID *VarGuid = NULL);
|
||||
EFI_VFR_VARSTORE_TYPE GetVarStoreType (IN EFI_VARSTORE_ID);
|
||||
EFI_GUID * GetVarStoreGuid (IN EFI_VARSTORE_ID);
|
||||
EFI_VFR_RETURN_CODE GetVarStoreName (IN EFI_VARSTORE_ID, OUT CHAR8 **);
|
||||
EFI_VFR_RETURN_CODE GetVarStoreByDataType (IN CHAR8 *, OUT SVfrVarStorageNode **);
|
||||
EFI_VFR_RETURN_CODE GetVarStoreByDataType (IN CHAR8 *, OUT SVfrVarStorageNode **, IN EFI_GUID *VarGuid = NULL);
|
||||
|
||||
EFI_VFR_RETURN_CODE GetBufferVarStoreDataTypeName (IN CHAR8 *, OUT CHAR8 **);
|
||||
EFI_VFR_RETURN_CODE GetBufferVarStoreDataTypeName (IN EFI_VARSTORE_ID, OUT CHAR8 **);
|
||||
EFI_VFR_RETURN_CODE GetEfiVarStoreInfo (IN EFI_VARSTORE_INFO *);
|
||||
EFI_VFR_RETURN_CODE GetNameVarStoreInfo (IN EFI_VARSTORE_INFO *, IN UINT32);
|
||||
|
||||
EFI_VFR_RETURN_CODE BufferVarStoreRequestElementAdd (IN CHAR8 *, IN EFI_VARSTORE_INFO &);
|
||||
};
|
||||
|
||||
#define EFI_QUESTION_ID_MAX 0xFFFF
|
||||
@@ -396,7 +399,7 @@ public:
|
||||
EFI_VFR_RETURN_CODE ReRegisterDefaultStoreById (IN UINT16, IN CHAR8 *, IN EFI_STRING_ID);
|
||||
BOOLEAN DefaultIdRegistered (IN UINT16);
|
||||
EFI_VFR_RETURN_CODE GetDefaultId (IN CHAR8 *, OUT UINT16 *);
|
||||
EFI_VFR_RETURN_CODE BufferVarStoreAltConfigAdd (IN EFI_VARSTORE_ID, IN EFI_VARSTORE_INFO &, IN CHAR8 *, IN UINT8, IN EFI_IFR_TYPE_VALUE);
|
||||
EFI_VFR_RETURN_CODE BufferVarStoreAltConfigAdd (IN EFI_VARSTORE_ID, IN EFI_VARSTORE_INFO &, IN CHAR8 *, IN EFI_GUID *, IN UINT8, IN EFI_IFR_TYPE_VALUE);
|
||||
};
|
||||
|
||||
#define EFI_RULE_ID_START 0x01
|
||||
|
Reference in New Issue
Block a user