\r
Vfr common library functions.\r
\r
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials \r
are licensed and made available under the terms and conditions of the BSD License \r
which accompanies this distribution. The full text of the license may be found at \r
\r
#include "stdio.h"\r
#include "stdlib.h"\r
+#include "CommonLib.h"\r
#include "VfrUtilityLib.h"\r
#include "VfrFormPkg.h"\r
\r
case EFI_IFR_TYPE_STRING :\r
memcpy (mValue, &Value.string, mWidth);\r
break;\r
+ case EFI_IFR_TYPE_BUFFER :\r
+ memcpy (mValue, &Value.u8, mWidth);\r
+ break;\r
+\r
case EFI_IFR_TYPE_OTHER :\r
return;\r
}\r
VOID\r
)\r
{\r
- BUFFER_SAFE_FREE (mValue);\r
+ ARRAY_SAFE_FREE (mValue);\r
}\r
\r
SConfigItem::SConfigItem (\r
IN CHAR8 *Name,\r
+ IN EFI_GUID *Guid,\r
IN CHAR8 *Id\r
)\r
{\r
mName = NULL;\r
- mId = 0;\r
+ mGuid = NULL;\r
+ mId = NULL;\r
mInfoStrList = NULL;\r
mNext = NULL;\r
\r
}\r
}\r
\r
+ if (Guid != NULL) {\r
+ if ((mGuid = (EFI_GUID *) new CHAR8[sizeof (EFI_GUID)]) != NULL) {\r
+ memcpy (mGuid, Guid, sizeof (EFI_GUID));\r
+ }\r
+ }\r
+\r
if (Id != NULL) {\r
if ((mId = new CHAR8[strlen (Id) + 1]) != NULL) {\r
strcpy (mId, Id);\r
\r
SConfigItem::SConfigItem (\r
IN CHAR8 *Name,\r
+ IN EFI_GUID *Guid,\r
IN CHAR8 *Id,\r
IN UINT8 Type,\r
IN UINT16 Offset,\r
)\r
{\r
mName = NULL;\r
+ mGuid = NULL;\r
mId = NULL;\r
mInfoStrList = NULL;\r
mNext = NULL;\r
}\r
}\r
\r
+ if (Guid != NULL) {\r
+ if ((mGuid = (EFI_GUID *) new CHAR8[sizeof (EFI_GUID)]) != NULL) {\r
+ memcpy (mGuid, Guid, sizeof (EFI_GUID));\r
+ }\r
+ }\r
+\r
if (Id != NULL) {\r
if ((mId = new CHAR8[strlen (Id) + 1]) != NULL) {\r
strcpy (mId, Id);\r
{\r
SConfigInfo *Info;\r
\r
- BUFFER_SAFE_FREE (mName);\r
- BUFFER_SAFE_FREE (mId);\r
+ ARRAY_SAFE_FREE (mName);\r
+ ARRAY_SAFE_FREE (mGuid);\r
+ ARRAY_SAFE_FREE (mId);\r
while (mInfoStrList != NULL) {\r
Info = mInfoStrList;\r
mInfoStrList = mInfoStrList->mNext;\r
UINT8\r
CVfrBufferConfig::Register (\r
IN CHAR8 *Name,\r
+ IN EFI_GUID *Guid,\r
IN CHAR8 *Id\r
)\r
{\r
SConfigItem *pNew;\r
\r
- if (Select (Name) == 0) {\r
+ if (Select (Name, Guid) == 0) {\r
return 1;\r
}\r
\r
- if ((pNew = new SConfigItem (Name, Id)) == NULL) {\r
+ if ((pNew = new SConfigItem (Name, Guid, Id)) == NULL) {\r
return 2;\r
}\r
+\r
if (mItemListHead == NULL) {\r
mItemListHead = pNew;\r
mItemListTail = pNew;\r
\r
UINT8\r
CVfrBufferConfig::Select (\r
- IN CHAR8 *Name,\r
- IN CHAR8 *Id\r
+ IN CHAR8 *Name,\r
+ IN EFI_GUID *Guid,\r
+ IN CHAR8 *Id\r
)\r
{\r
SConfigItem *p;\r
\r
- if (Name == NULL) {\r
+ if (Name == NULL || Guid == NULL) {\r
mItemListPos = mItemListHead;\r
return 0;\r
} else {\r
for (p = mItemListHead; p != NULL; p = p->mNext) {\r
- if (strcmp (p->mName, Name) != 0) {\r
+ if ((strcmp (p->mName, Name) != 0) || (memcmp (p->mGuid, Guid, sizeof (EFI_GUID)) != 0)) {\r
continue;\r
}\r
\r
CVfrBufferConfig::Write (\r
IN CONST CHAR8 Mode,\r
IN CHAR8 *Name,\r
+ IN EFI_GUID *Guid,\r
IN CHAR8 *Id,\r
IN UINT8 Type,\r
IN UINT16 Offset,\r
SConfigItem *pItem;\r
SConfigInfo *pInfo;\r
\r
- if ((Ret = Select (Name)) != 0) {\r
+ if ((Ret = Select (Name, Guid)) != 0) {\r
return Ret;\r
}\r
\r
switch (Mode) {\r
case 'a' : // add\r
- if (Select (Name, Id) != 0) {\r
- if ((pItem = new SConfigItem (Name, Id, Type, Offset, (UINT16) Width, Value)) == NULL) {\r
+ if (Select (Name, Guid, Id) != 0) {\r
+ if ((pItem = new SConfigItem (Name, Guid, Id, Type, Offset, (UINT16) Width, Value)) == NULL) {\r
return 2;\r
}\r
if (mItemListHead == NULL) {\r
// tranverse the list to find out if there's already the value for the same offset\r
for (pInfo = mItemListPos->mInfoStrList; pInfo != NULL; pInfo = pInfo->mNext) {\r
if (pInfo->mOffset == Offset) {\r
- // check if the value and width are the same; return error if not\r
- if ((Id != NULL) && (pInfo->mWidth != Width || memcmp(pInfo->mValue, &Value, Width) != 0)) {\r
- return VFR_RETURN_DEFAULT_VALUE_REDEFINED;\r
- }\r
return 0;\r
}\r
}\r
{\r
SVfrDataField *pField = NULL;\r
\r
- if ((FName == NULL) && (Type == NULL)) {\r
+ if ((FName == NULL) || (Type == NULL)) {\r
return VFR_RETURN_FATAL_ERROR;\r
}\r
\r
if (Guid != NULL) {\r
mGuid = *Guid;\r
} else {\r
- memset (&Guid, 0, sizeof (EFI_GUID));\r
+ memset (&mGuid, 0, sizeof (EFI_GUID));\r
}\r
if (StoreName != NULL) {\r
mVarStoreName = new CHAR8[strlen(StoreName) + 1];\r
if (Guid != NULL) {\r
mGuid = *Guid;\r
} else {\r
- memset (&Guid, 0, sizeof (EFI_GUID));\r
+ memset (&mGuid, 0, sizeof (EFI_GUID));\r
}\r
if (StoreName != NULL) {\r
mVarStoreName = new CHAR8[strlen(StoreName) + 1];\r
)\r
{\r
if (mVarStoreName != NULL) {\r
- delete mVarStoreName;\r
+ delete[] mVarStoreName;\r
}\r
\r
if (mVarStoreType == EFI_VFR_VARSTORE_NAME) {\r
mNameVarStoreList = NULL;\r
mCurrVarStorageNode = NULL;\r
mNewVarStorageNode = NULL;\r
+ mBufferFieldInfoListHead = NULL;\r
+ mBufferFieldInfoListTail = NULL;\r
}\r
\r
CVfrDataStorage::~CVfrDataStorage (\r
}\r
}\r
\r
+ if (Index == EFI_FREE_VARSTORE_ID_BITMAP_SIZE) {\r
+ return EFI_VARSTORE_ID_INVALID;\r
+ }\r
+\r
for (Offset = 0, Mask = 0x80000000; Mask != 0; Mask >>= 1, Offset++) {\r
if ((mFreeVarStoreIdBitMap[Index] & Mask) == 0) {\r
mFreeVarStoreIdBitMap[Index] |= Mask;\r
\r
EFI_VFR_RETURN_CODE\r
CVfrDataStorage::DeclareNameVarStoreBegin (\r
- IN CHAR8 *StoreName\r
+ IN CHAR8 *StoreName,\r
+ IN EFI_VARSTORE_ID VarStoreId\r
)\r
{\r
SVfrVarStorageNode *pNode = NULL;\r
- EFI_VARSTORE_ID VarStoreId;\r
+ EFI_VARSTORE_ID TmpVarStoreId;\r
\r
if (StoreName == NULL) {\r
return VFR_RETURN_FATAL_ERROR;\r
}\r
\r
- if (GetVarStoreId (StoreName, &VarStoreId) == VFR_RETURN_SUCCESS) {\r
+ if (GetVarStoreId (StoreName, &TmpVarStoreId) == VFR_RETURN_SUCCESS) {\r
return VFR_RETURN_REDEFINED;\r
}\r
+ \r
+ if (VarStoreId == EFI_VARSTORE_ID_INVALID) {\r
+ VarStoreId = GetFreeVarStoreId (EFI_VFR_VARSTORE_NAME);\r
+ } else {\r
+ if (ChekVarStoreIdFree (VarStoreId) == FALSE) {\r
+ return VFR_RETURN_VARSTOREID_REDEFINED;\r
+ }\r
+ MarkVarStoreIdUsed (VarStoreId);\r
+ }\r
\r
- VarStoreId = GetFreeVarStoreId (EFI_VFR_VARSTORE_NAME);\r
if ((pNode = new SVfrVarStorageNode (StoreName, VarStoreId)) == NULL) {\r
return VFR_RETURN_UNDEFINED;\r
}\r
return VFR_RETURN_EFIVARSTORE_SIZE_ERROR;\r
}\r
\r
- if (GetVarStoreId (StoreName, &VarStoreId) == VFR_RETURN_SUCCESS) {\r
+ if (GetVarStoreId (StoreName, &VarStoreId, Guid) == VFR_RETURN_SUCCESS) {\r
return VFR_RETURN_REDEFINED;\r
}\r
\r
return VFR_RETURN_FATAL_ERROR;\r
}\r
\r
- if (GetVarStoreId (StoreName, &TempVarStoreId) == VFR_RETURN_SUCCESS) {\r
+ if (GetVarStoreId (StoreName, &TempVarStoreId, Guid) == VFR_RETURN_SUCCESS) {\r
return VFR_RETURN_REDEFINED;\r
}\r
\r
pNew->mNext = mBufferVarStoreList;\r
mBufferVarStoreList = pNew;\r
\r
- if (gCVfrBufferConfig.Register(StoreName) != 0) {\r
+ if (gCVfrBufferConfig.Register(StoreName, Guid) != 0) {\r
return VFR_RETURN_FATAL_ERROR;\r
}\r
\r
EFI_VFR_RETURN_CODE \r
CVfrDataStorage::GetVarStoreByDataType (\r
IN CHAR8 *DataTypeName,\r
- OUT SVfrVarStorageNode **VarNode\r
+ OUT SVfrVarStorageNode **VarNode,\r
+ IN EFI_GUID *VarGuid\r
)\r
{\r
SVfrVarStorageNode *pNode;\r
\r
MatchNode = NULL;\r
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
- if (strcmp (pNode->mStorageInfo.mDataType->mTypeName, DataTypeName) == 0) {\r
+ if (strcmp (pNode->mStorageInfo.mDataType->mTypeName, DataTypeName) != 0) {\r
+ continue;\r
+ }\r
+\r
+ if ((VarGuid != NULL)) {\r
+ if (memcmp (VarGuid, &pNode->mGuid, sizeof (EFI_GUID)) == 0) {\r
+ *VarNode = pNode;\r
+ return VFR_RETURN_SUCCESS;\r
+ }\r
+ } else {\r
if (MatchNode == NULL) {\r
MatchNode = pNode;\r
} else {\r
return VFR_RETURN_SUCCESS;\r
}\r
\r
+EFI_VARSTORE_ID \r
+CVfrDataStorage::CheckGuidField (\r
+ IN SVfrVarStorageNode *pNode,\r
+ IN EFI_GUID *StoreGuid,\r
+ IN BOOLEAN *HasFoundOne,\r
+ OUT EFI_VFR_RETURN_CODE *ReturnCode\r
+ )\r
+{\r
+ if (StoreGuid != NULL) {\r
+ //\r
+ // If has guid info, compare the guid filed.\r
+ //\r
+ if (memcmp (StoreGuid, &pNode->mGuid, sizeof (EFI_GUID)) == 0) {\r
+ //\r
+ // Both name and guid are same, this this varstore.\r
+ //\r
+ mCurrVarStorageNode = pNode;\r
+ *ReturnCode = VFR_RETURN_SUCCESS;\r
+ return TRUE;\r
+ }\r
+ } else {\r
+ //\r
+ // Not has Guid field, check whether this name is the only one.\r
+ //\r
+ if (*HasFoundOne) {\r
+ //\r
+ // The name has conflict, return name redefined.\r
+ //\r
+ *ReturnCode = VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR;\r
+ return TRUE;\r
+ }\r
+\r
+ *HasFoundOne = TRUE;\r
+ mCurrVarStorageNode = pNode;\r
+ }\r
+\r
+ return FALSE;\r
+}\r
+\r
+/**\r
+ Base on the input store name and guid to find the varstore id. \r
+\r
+ If both name and guid are inputed, base on the name and guid to\r
+ found the varstore. If only name inputed, base on the name to\r
+ found the varstore and go on to check whether more than one varstore\r
+ has the same name. If only has found one varstore, return this\r
+ varstore; if more than one varstore has same name, return varstore\r
+ name redefined error. If no varstore found by varstore name, call\r
+ function GetVarStoreByDataType and use inputed varstore name as \r
+ data type name to search.\r
+**/\r
EFI_VFR_RETURN_CODE \r
CVfrDataStorage::GetVarStoreId (\r
IN CHAR8 *StoreName,\r
- OUT EFI_VARSTORE_ID *VarStoreId\r
+ OUT EFI_VARSTORE_ID *VarStoreId,\r
+ IN EFI_GUID *StoreGuid\r
)\r
{\r
EFI_VFR_RETURN_CODE ReturnCode;\r
SVfrVarStorageNode *pNode;\r
+ BOOLEAN HasFoundOne = FALSE;\r
+\r
+ mCurrVarStorageNode = NULL;\r
\r
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
- mCurrVarStorageNode = pNode;\r
- *VarStoreId = pNode->mVarStoreId;\r
- return VFR_RETURN_SUCCESS;\r
+ if (CheckGuidField(pNode, StoreGuid, &HasFoundOne, &ReturnCode)) {\r
+ *VarStoreId = mCurrVarStorageNode->mVarStoreId;\r
+ return ReturnCode;\r
+ }\r
}\r
}\r
\r
for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
- mCurrVarStorageNode = pNode;\r
- *VarStoreId = pNode->mVarStoreId;\r
- return VFR_RETURN_SUCCESS;\r
+ if (CheckGuidField(pNode, StoreGuid, &HasFoundOne, &ReturnCode)) {\r
+ *VarStoreId = mCurrVarStorageNode->mVarStoreId;\r
+ return ReturnCode;\r
+ }\r
}\r
}\r
\r
for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
- mCurrVarStorageNode = pNode;\r
- *VarStoreId = pNode->mVarStoreId;\r
- return VFR_RETURN_SUCCESS;\r
+ if (CheckGuidField(pNode, StoreGuid, &HasFoundOne, &ReturnCode)) {\r
+ *VarStoreId = mCurrVarStorageNode->mVarStoreId;\r
+ return ReturnCode;\r
+ }\r
}\r
}\r
\r
- mCurrVarStorageNode = NULL;\r
+ if (HasFoundOne) {\r
+ *VarStoreId = mCurrVarStorageNode->mVarStoreId;\r
+ return VFR_RETURN_SUCCESS;\r
+ }\r
+\r
*VarStoreId = EFI_VARSTORE_ID_INVALID;\r
\r
//\r
// Assume that Data strucutre name is used as StoreName, and check again. \r
//\r
- ReturnCode = GetVarStoreByDataType (StoreName, &pNode);\r
+ ReturnCode = GetVarStoreByDataType (StoreName, &pNode, StoreGuid);\r
if (pNode != NULL) {\r
mCurrVarStorageNode = pNode;\r
*VarStoreId = pNode->mVarStoreId;\r
\r
EFI_VFR_RETURN_CODE\r
CVfrDataStorage::GetBufferVarStoreDataTypeName (\r
- IN CHAR8 *StoreName,\r
+ IN EFI_VARSTORE_ID VarStoreId,\r
OUT CHAR8 **DataTypeName\r
)\r
{\r
SVfrVarStorageNode *pNode;\r
- EFI_VFR_RETURN_CODE ReturnCode;\r
\r
- if ((StoreName == NULL) || (DataTypeName == NULL)) {\r
+ if (VarStoreId == EFI_VARSTORE_ID_INVALID) {\r
return VFR_RETURN_FATAL_ERROR;\r
}\r
\r
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
- if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
- break;\r
+ if (pNode->mVarStoreId == VarStoreId) {\r
+ *DataTypeName = pNode->mStorageInfo.mDataType->mTypeName;\r
+ return VFR_RETURN_SUCCESS;\r
}\r
}\r
\r
- ReturnCode = VFR_RETURN_UNDEFINED;\r
- //\r
- // Assume that Data strucutre name is used as StoreName, and check again. \r
- //\r
- if (pNode == NULL) {\r
- ReturnCode = GetVarStoreByDataType (StoreName, &pNode);\r
- }\r
-\r
- if (pNode == NULL) {\r
- return ReturnCode;\r
- }\r
-\r
- if (pNode->mStorageInfo.mDataType == NULL) {\r
- return VFR_RETURN_FATAL_ERROR;\r
- }\r
-\r
- *DataTypeName = pNode->mStorageInfo.mDataType->mTypeName;\r
- return VFR_RETURN_SUCCESS;\r
+ return VFR_RETURN_UNDEFINED;\r
}\r
\r
-EFI_VFR_RETURN_CODE\r
+EFI_VFR_VARSTORE_TYPE\r
CVfrDataStorage::GetVarStoreType (\r
- IN CHAR8 *StoreName,\r
- OUT EFI_VFR_VARSTORE_TYPE &VarStoreType\r
+ IN EFI_VARSTORE_ID VarStoreId\r
)\r
{\r
SVfrVarStorageNode *pNode;\r
- EFI_VFR_RETURN_CODE ReturnCode;\r
+ EFI_VFR_VARSTORE_TYPE VarStoreType;\r
\r
- if (StoreName == NULL) {\r
- return VFR_RETURN_FATAL_ERROR;\r
+ VarStoreType = EFI_VFR_VARSTORE_INVALID;\r
+\r
+ if (VarStoreId == EFI_VARSTORE_ID_INVALID) {\r
+ return VarStoreType;\r
}\r
\r
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
- if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
+ if (pNode->mVarStoreId == VarStoreId) {\r
VarStoreType = pNode->mVarStoreType;\r
- return VFR_RETURN_SUCCESS;\r
+ return VarStoreType;\r
}\r
}\r
\r
for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
- if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
+ if (pNode->mVarStoreId == VarStoreId) {\r
VarStoreType = pNode->mVarStoreType;\r
- return VFR_RETURN_SUCCESS;\r
+ return VarStoreType;\r
}\r
}\r
\r
for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
- if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
+ if (pNode->mVarStoreId == VarStoreId) {\r
VarStoreType = pNode->mVarStoreType;\r
- return VFR_RETURN_SUCCESS;\r
+ return VarStoreType;\r
}\r
}\r
\r
- VarStoreType = EFI_VFR_VARSTORE_INVALID;\r
-\r
- //\r
- // Assume that Data strucutre name is used as StoreName, and check again. \r
- //\r
- ReturnCode = GetVarStoreByDataType (StoreName, &pNode);\r
- if (pNode != NULL) {\r
- VarStoreType = pNode->mVarStoreType;\r
- }\r
- \r
- return ReturnCode;\r
+ return VarStoreType;\r
}\r
\r
-EFI_VFR_VARSTORE_TYPE\r
-CVfrDataStorage::GetVarStoreType (\r
+EFI_GUID *\r
+CVfrDataStorage::GetVarStoreGuid (\r
IN EFI_VARSTORE_ID VarStoreId\r
)\r
{\r
SVfrVarStorageNode *pNode;\r
- EFI_VFR_VARSTORE_TYPE VarStoreType;\r
+ EFI_GUID *VarGuid;\r
\r
- VarStoreType = EFI_VFR_VARSTORE_INVALID;\r
+ VarGuid = NULL;\r
\r
if (VarStoreId == EFI_VARSTORE_ID_INVALID) {\r
- return VarStoreType;\r
+ return VarGuid;\r
}\r
\r
for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
if (pNode->mVarStoreId == VarStoreId) {\r
- VarStoreType = pNode->mVarStoreType;\r
- return VarStoreType;\r
+ VarGuid = &pNode->mGuid;\r
+ return VarGuid;\r
}\r
}\r
\r
for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
if (pNode->mVarStoreId == VarStoreId) {\r
- VarStoreType = pNode->mVarStoreType;\r
- return VarStoreType;\r
+ VarGuid = &pNode->mGuid;\r
+ return VarGuid;\r
}\r
}\r
\r
for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
if (pNode->mVarStoreId == VarStoreId) {\r
- VarStoreType = pNode->mVarStoreType;\r
- return VarStoreType;\r
+ VarGuid = &pNode->mGuid;\r
+ return VarGuid;\r
}\r
}\r
\r
- return VarStoreType;\r
+ return VarGuid;\r
}\r
\r
EFI_VFR_RETURN_CODE\r
return VFR_RETURN_SUCCESS;\r
}\r
\r
+EFI_VFR_RETURN_CODE\r
+CVfrDataStorage::AddBufferVarStoreFieldInfo (\r
+ IN EFI_VARSTORE_INFO *Info\r
+ )\r
+{\r
+ BufferVarStoreFieldInfoNode *pNew;\r
+\r
+ if ((pNew = new BufferVarStoreFieldInfoNode(Info)) == NULL) {\r
+ return VFR_RETURN_FATAL_ERROR;\r
+ }\r
+\r
+ if (mBufferFieldInfoListHead == NULL) {\r
+ mBufferFieldInfoListHead = pNew;\r
+ mBufferFieldInfoListTail= pNew;\r
+ } else {\r
+ mBufferFieldInfoListTail->mNext = pNew;\r
+ mBufferFieldInfoListTail = pNew;\r
+ }\r
+\r
+ return VFR_RETURN_SUCCESS;\r
+}\r
+\r
+EFI_VFR_RETURN_CODE\r
+CVfrDataStorage::GetBufferVarStoreFieldInfo (\r
+ IN OUT EFI_VARSTORE_INFO *Info\r
+ )\r
+{\r
+ BufferVarStoreFieldInfoNode *pNode;\r
+\r
+ pNode = mBufferFieldInfoListHead;\r
+ while (pNode != NULL) {\r
+ if (Info->mVarStoreId == pNode->mVarStoreInfo.mVarStoreId &&\r
+ Info->mInfo.mVarOffset == pNode->mVarStoreInfo.mInfo.mVarOffset) {\r
+ Info->mVarTotalSize = pNode->mVarStoreInfo.mVarTotalSize;\r
+ Info->mVarType = pNode->mVarStoreInfo.mVarType;\r
+ return VFR_RETURN_SUCCESS;\r
+ }\r
+ pNode = pNode->mNext;\r
+ }\r
+ return VFR_RETURN_FATAL_ERROR;\r
+}\r
+\r
EFI_VFR_RETURN_CODE\r
CVfrDataStorage::GetNameVarStoreInfo (\r
OUT EFI_VARSTORE_INFO *Info,\r
return VFR_RETURN_SUCCESS;\r
}\r
\r
-EFI_VFR_RETURN_CODE\r
-CVfrDataStorage::BufferVarStoreRequestElementAdd (\r
- IN CHAR8 *StoreName,\r
- IN EFI_VARSTORE_INFO &Info\r
- )\r
-{\r
- SVfrVarStorageNode *pNode = NULL;\r
- EFI_IFR_TYPE_VALUE Value = gZeroEfiIfrTypeValue;\r
- EFI_VFR_RETURN_CODE ReturnCode;\r
-\r
- for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
- if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
- break;\r
- }\r
- }\r
-\r
- ReturnCode = VFR_RETURN_UNDEFINED;\r
- //\r
- // Assume that Data strucutre name is used as StoreName, and check again. \r
- //\r
- if (pNode == NULL) {\r
- ReturnCode = GetVarStoreByDataType (StoreName, &pNode);\r
- }\r
-\r
- if (pNode == NULL) {\r
- return ReturnCode;\r
- }\r
-\r
- gCVfrBufferConfig.Open ();\r
- Value.u8 = 0;\r
- if (gCVfrBufferConfig.Write ('a', StoreName, NULL, EFI_IFR_TYPE_NUM_SIZE_8, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value) != 0) {\r
- return VFR_RETURN_FATAL_ERROR;\r
- }\r
- gCVfrBufferConfig.Close ();\r
-\r
- return VFR_RETURN_SUCCESS;\r
-}\r
-\r
SVfrDefaultStoreNode::SVfrDefaultStoreNode (\r
IN EFI_IFR_DEFAULTSTORE *ObjBinAddr,\r
IN CHAR8 *RefName, \r
)\r
{\r
if (mRefName != NULL) {\r
- delete mRefName;\r
+ delete[] mRefName;\r
}\r
}\r
\r
IN EFI_VARSTORE_ID DefaultId,\r
IN EFI_VARSTORE_INFO &Info,\r
IN CHAR8 *VarStoreName,\r
+ IN EFI_GUID *VarStoreGuid,\r
IN UINT8 Type,\r
IN EFI_IFR_TYPE_VALUE Value\r
)\r
gCVfrBufferConfig.Open ();\r
\r
sprintf (NewAltCfg, "%04x", pNode->mDefaultId);\r
- if ((Returnvalue = gCVfrBufferConfig.Select(VarStoreName)) == 0) {\r
- if ((Returnvalue = gCVfrBufferConfig.Write ('a', VarStoreName, NewAltCfg, Type, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value)) != 0) {\r
+ if ((Returnvalue = gCVfrBufferConfig.Select(VarStoreName, VarStoreGuid)) == 0) {\r
+ if ((Returnvalue = gCVfrBufferConfig.Write ('a', VarStoreName, VarStoreGuid, NewAltCfg, Type, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value)) != 0) {\r
goto WriteError;\r
}\r
}\r
)\r
{\r
if (mRuleName != NULL) {\r
- delete mRuleName;\r
+ delete[] mRuleName;\r
}\r
}\r
\r
mVarTotalSize = Info.mVarTotalSize;\r
}\r
\r
+EFI_VARSTORE_INFO&\r
+EFI_VARSTORE_INFO::operator= (\r
+ IN CONST EFI_VARSTORE_INFO &Info\r
+ )\r
+{\r
+ if (this != &Info) {\r
+ mVarStoreId = Info.mVarStoreId;\r
+ mInfo.mVarName = Info.mInfo.mVarName;\r
+ mInfo.mVarOffset = Info.mInfo.mVarOffset;\r
+ mVarType = Info.mVarType;\r
+ mVarTotalSize = Info.mVarTotalSize;\r
+ }\r
+\r
+ return *this;\r
+}\r
+\r
BOOLEAN\r
EFI_VARSTORE_INFO::operator == (\r
IN EFI_VARSTORE_INFO *Info\r
return FALSE;\r
}\r
\r
+BufferVarStoreFieldInfoNode::BufferVarStoreFieldInfoNode(\r
+ IN EFI_VARSTORE_INFO *Info\r
+ )\r
+{\r
+ mVarStoreInfo.mVarType = Info->mVarType;\r
+ mVarStoreInfo.mVarTotalSize = Info->mVarTotalSize;\r
+ mVarStoreInfo.mInfo.mVarOffset = Info->mInfo.mVarOffset;\r
+ mVarStoreInfo.mVarStoreId = Info->mVarStoreId;\r
+ mNext = NULL;\r
+}\r
+\r
+BufferVarStoreFieldInfoNode::~BufferVarStoreFieldInfoNode ()\r
+{\r
+ mVarStoreInfo.mVarType = EFI_IFR_TYPE_OTHER;\r
+ mVarStoreInfo.mVarTotalSize = 0;\r
+ mVarStoreInfo.mInfo.mVarOffset = EFI_VAROFFSET_INVALID;\r
+ mVarStoreInfo.mVarStoreId = EFI_VARSTORE_ID_INVALID;\r
+ mNext = NULL;\r
+}\r
+\r
static EFI_VARSTORE_INFO gEfiInvalidVarStoreInfo;\r
\r
EFI_QUESTION_ID\r
}\r
}\r
\r
+ if (Index == EFI_FREE_QUESTION_ID_BITMAP_SIZE) {\r
+ return EFI_QUESTION_ID_INVALID;\r
+ }\r
+\r
for (Offset = 0, Mask = 0x80000000; Mask != 0; Mask >>= 1, Offset++) {\r
if ((mFreeQIdBitMap[Index] & Mask) == 0) {\r
mFreeQIdBitMap[Index] |= Mask;\r
)\r
{\r
if (mName != NULL) {\r
- delete mName;\r
+ delete[] mName;\r
}\r
\r
if (mVarIdStr != NULL) {\r
- delete mVarIdStr;\r
+ delete[] mVarIdStr;\r
}\r
}\r
\r
CHAR8 *VarIdStr[3] = {NULL, };\r
CHAR8 Index;\r
\r
- if (BaseVarId == NULL) {\r
+ if (BaseVarId == NULL && Name == NULL) {\r
+ if (QuestionId == EFI_QUESTION_ID_INVALID) {\r
+ QuestionId = GetFreeQuestionId ();\r
+ } else {\r
+ if (ChekQuestionIdFree (QuestionId) == FALSE) {\r
+ goto Err;\r
+ }\r
+ MarkQuestionIdUsed (QuestionId);\r
+ }\r
return;\r
}\r
\r
- Len = strlen (BaseVarId);\r
+ if (BaseVarId != NULL) {\r
+ Len = strlen (BaseVarId);\r
\r
- VarIdStr[0] = new CHAR8[Len + strlen (".Year") + 1];\r
- if (VarIdStr[0] != NULL) {\r
- strcpy (VarIdStr[0], BaseVarId);\r
- strcat (VarIdStr[0], ".Year");\r
- }\r
- VarIdStr[1] = new CHAR8[Len + strlen (".Month") + 1];\r
- if (VarIdStr[1] != NULL) {\r
- strcpy (VarIdStr[1], BaseVarId);\r
- strcat (VarIdStr[1], ".Month");\r
- }\r
- VarIdStr[2] = new CHAR8[Len + strlen (".Day") + 1];\r
- if (VarIdStr[2] != NULL) {\r
- strcpy (VarIdStr[2], BaseVarId);\r
- strcat (VarIdStr[2], ".Day");\r
+ VarIdStr[0] = new CHAR8[Len + strlen (".Year") + 1];\r
+ if (VarIdStr[0] != NULL) {\r
+ strcpy (VarIdStr[0], BaseVarId);\r
+ strcat (VarIdStr[0], ".Year");\r
+ }\r
+ VarIdStr[1] = new CHAR8[Len + strlen (".Month") + 1];\r
+ if (VarIdStr[1] != NULL) {\r
+ strcpy (VarIdStr[1], BaseVarId);\r
+ strcat (VarIdStr[1], ".Month");\r
+ }\r
+ VarIdStr[2] = new CHAR8[Len + strlen (".Day") + 1];\r
+ if (VarIdStr[2] != NULL) {\r
+ strcpy (VarIdStr[2], BaseVarId);\r
+ strcat (VarIdStr[2], ".Day");\r
+ }\r
+ } else {\r
+ Len = strlen (Name);\r
+\r
+ VarIdStr[0] = new CHAR8[Len + strlen (".Year") + 1];\r
+ if (VarIdStr[0] != NULL) {\r
+ strcpy (VarIdStr[0], Name);\r
+ strcat (VarIdStr[0], ".Year");\r
+ }\r
+ VarIdStr[1] = new CHAR8[Len + strlen (".Month") + 1];\r
+ if (VarIdStr[1] != NULL) {\r
+ strcpy (VarIdStr[1], Name);\r
+ strcat (VarIdStr[1], ".Month");\r
+ }\r
+ VarIdStr[2] = new CHAR8[Len + strlen (".Day") + 1];\r
+ if (VarIdStr[2] != NULL) {\r
+ strcpy (VarIdStr[2], Name);\r
+ strcat (VarIdStr[2], ".Day");\r
+ }\r
}\r
\r
if ((pNode[0] = new SVfrQuestionNode (Name, VarIdStr[0], DATE_YEAR_BITMASK)) == NULL) {\r
CHAR8 *VarIdStr[3] = {NULL, };\r
CHAR8 Index;\r
\r
- if (BaseVarId == NULL) {\r
+ if (BaseVarId == NULL && Name == NULL) {\r
+ if (QuestionId == EFI_QUESTION_ID_INVALID) {\r
+ QuestionId = GetFreeQuestionId ();\r
+ } else {\r
+ if (ChekQuestionIdFree (QuestionId) == FALSE) {\r
+ goto Err;\r
+ }\r
+ MarkQuestionIdUsed (QuestionId);\r
+ }\r
return;\r
}\r
\r
- Len = strlen (BaseVarId);\r
+ if (BaseVarId != NULL) {\r
+ Len = strlen (BaseVarId);\r
\r
- VarIdStr[0] = new CHAR8[Len + strlen (".Hour") + 1];\r
- if (VarIdStr[0] != NULL) {\r
- strcpy (VarIdStr[0], BaseVarId);\r
- strcat (VarIdStr[0], ".Hour");\r
- }\r
- VarIdStr[1] = new CHAR8[Len + strlen (".Minute") + 1];\r
- if (VarIdStr[1] != NULL) {\r
- strcpy (VarIdStr[1], BaseVarId);\r
- strcat (VarIdStr[1], ".Minute");\r
- }\r
- VarIdStr[2] = new CHAR8[Len + strlen (".Second") + 1];\r
- if (VarIdStr[2] != NULL) {\r
- strcpy (VarIdStr[2], BaseVarId);\r
- strcat (VarIdStr[2], ".Second");\r
+ VarIdStr[0] = new CHAR8[Len + strlen (".Hour") + 1];\r
+ if (VarIdStr[0] != NULL) {\r
+ strcpy (VarIdStr[0], BaseVarId);\r
+ strcat (VarIdStr[0], ".Hour");\r
+ }\r
+ VarIdStr[1] = new CHAR8[Len + strlen (".Minute") + 1];\r
+ if (VarIdStr[1] != NULL) {\r
+ strcpy (VarIdStr[1], BaseVarId);\r
+ strcat (VarIdStr[1], ".Minute");\r
+ }\r
+ VarIdStr[2] = new CHAR8[Len + strlen (".Second") + 1];\r
+ if (VarIdStr[2] != NULL) {\r
+ strcpy (VarIdStr[2], BaseVarId);\r
+ strcat (VarIdStr[2], ".Second");\r
+ }\r
+ } else {\r
+ Len = strlen (Name);\r
+\r
+ VarIdStr[0] = new CHAR8[Len + strlen (".Hour") + 1];\r
+ if (VarIdStr[0] != NULL) {\r
+ strcpy (VarIdStr[0], Name);\r
+ strcat (VarIdStr[0], ".Hour");\r
+ }\r
+ VarIdStr[1] = new CHAR8[Len + strlen (".Minute") + 1];\r
+ if (VarIdStr[1] != NULL) {\r
+ strcpy (VarIdStr[1], Name);\r
+ strcat (VarIdStr[1], ".Minute");\r
+ }\r
+ VarIdStr[2] = new CHAR8[Len + strlen (".Second") + 1];\r
+ if (VarIdStr[2] != NULL) {\r
+ strcpy (VarIdStr[2], Name);\r
+ strcat (VarIdStr[2], ".Second");\r
+ }\r
}\r
\r
if ((pNode[0] = new SVfrQuestionNode (Name, VarIdStr[0], TIME_HOUR_BITMASK)) == NULL) {\r
CHAR8 *VarIdStr[4] = {NULL, };\r
CHAR8 Index;\r
\r
- if (BaseVarId == NULL) {\r
+ if (BaseVarId == NULL && Name == NULL) {\r
return;\r
}\r
\r
- Len = strlen (BaseVarId);\r
+ if (BaseVarId != NULL) {\r
+ Len = strlen (BaseVarId);\r
\r
- VarIdStr[0] = new CHAR8[Len + strlen (".QuestionId") + 1];\r
- if (VarIdStr[0] != NULL) {\r
- strcpy (VarIdStr[0], BaseVarId);\r
- strcat (VarIdStr[0], ".QuestionId");\r
- }\r
- VarIdStr[1] = new CHAR8[Len + strlen (".FormId") + 1];\r
- if (VarIdStr[1] != NULL) {\r
- strcpy (VarIdStr[1], BaseVarId);\r
- strcat (VarIdStr[1], ".FormId");\r
- }\r
- VarIdStr[2] = new CHAR8[Len + strlen (".FormSetGuid") + 1];\r
- if (VarIdStr[2] != NULL) {\r
- strcpy (VarIdStr[2], BaseVarId);\r
- strcat (VarIdStr[2], ".FormSetGuid");\r
- }\r
- VarIdStr[3] = new CHAR8[Len + strlen (".DevicePath") + 1];\r
- if (VarIdStr[3] != NULL) {\r
- strcpy (VarIdStr[3], BaseVarId);\r
- strcat (VarIdStr[3], ".DevicePath");\r
+ VarIdStr[0] = new CHAR8[Len + strlen (".QuestionId") + 1];\r
+ if (VarIdStr[0] != NULL) {\r
+ strcpy (VarIdStr[0], BaseVarId);\r
+ strcat (VarIdStr[0], ".QuestionId");\r
+ }\r
+ VarIdStr[1] = new CHAR8[Len + strlen (".FormId") + 1];\r
+ if (VarIdStr[1] != NULL) {\r
+ strcpy (VarIdStr[1], BaseVarId);\r
+ strcat (VarIdStr[1], ".FormId");\r
+ }\r
+ VarIdStr[2] = new CHAR8[Len + strlen (".FormSetGuid") + 1];\r
+ if (VarIdStr[2] != NULL) {\r
+ strcpy (VarIdStr[2], BaseVarId);\r
+ strcat (VarIdStr[2], ".FormSetGuid");\r
+ }\r
+ VarIdStr[3] = new CHAR8[Len + strlen (".DevicePath") + 1];\r
+ if (VarIdStr[3] != NULL) {\r
+ strcpy (VarIdStr[3], BaseVarId);\r
+ strcat (VarIdStr[3], ".DevicePath");\r
+ }\r
+ } else {\r
+ Len = strlen (Name);\r
+\r
+ VarIdStr[0] = new CHAR8[Len + strlen (".QuestionId") + 1];\r
+ if (VarIdStr[0] != NULL) {\r
+ strcpy (VarIdStr[0], Name);\r
+ strcat (VarIdStr[0], ".QuestionId");\r
+ }\r
+ VarIdStr[1] = new CHAR8[Len + strlen (".FormId") + 1];\r
+ if (VarIdStr[1] != NULL) {\r
+ strcpy (VarIdStr[1], Name);\r
+ strcat (VarIdStr[1], ".FormId");\r
+ }\r
+ VarIdStr[2] = new CHAR8[Len + strlen (".FormSetGuid") + 1];\r
+ if (VarIdStr[2] != NULL) {\r
+ strcpy (VarIdStr[2], Name);\r
+ strcat (VarIdStr[2], ".FormSetGuid");\r
+ }\r
+ VarIdStr[3] = new CHAR8[Len + strlen (".DevicePath") + 1];\r
+ if (VarIdStr[3] != NULL) {\r
+ strcpy (VarIdStr[3], Name);\r
+ strcat (VarIdStr[3], ".DevicePath");\r
+ }\r
}\r
\r
if ((pNode[0] = new SVfrQuestionNode (Name, VarIdStr[0])) == NULL) {\r
UINT8 BlockType;\r
EFI_HII_STRING_PACKAGE_HDR *PkgHeader;\r
\r
- if (mStringFileName == '\0' ) {\r
+ if (mStringFileName == NULL) {\r
return NULL;\r
}\r
\r
- if ((pInFile = fopen (mStringFileName, "rb")) == NULL) {\r
+ if ((pInFile = fopen (LongFilePath (mStringFileName), "rb")) == NULL) {\r
return NULL;\r
}\r
\r
// Check the String package.\r
//\r
if (PkgHeader->Header.Type != EFI_HII_PACKAGE_STRINGS) {\r
- delete StringPtr;\r
+ delete[] StringPtr;\r
return NULL;\r
}\r
\r
//\r
Status = FindStringBlock(Current, StringId, &NameOffset, &BlockType);\r
if (Status != EFI_SUCCESS) {\r
- delete StringPtr;\r
+ delete[] StringPtr;\r
return NULL;\r
}\r
\r
break;\r
}\r
\r
- delete StringPtr;\r
+ delete[] StringPtr;\r
\r
return VarStoreName;\r
}\r
BOOLEAN VfrCompatibleMode = FALSE;\r
\r
CVfrVarDataTypeDB gCVfrVarDataTypeDB;\r
+CVfrDefaultStore gCVfrDefaultStore;\r
+CVfrDataStorage gCVfrDataStorage;\r
\r
\r
projects / mirror_edk2.git / blobdiff