/** @file\r
PCD DXE driver manage all PCD entry initialized in PEI phase and DXE phase, and\r
- produce the implementation of PCD protocol.\r
+ produce the implementation of native PCD protocol and EFI_PCD_PROTOCOL defined in\r
+ PI 1.2 Vol3.\r
\r
-Copyright (c) 2006 - 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
http://opensource.org/licenses/bsd-license.php\r
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
\r
-\r
-Module Name: Pcd.c\r
-\r
**/\r
\r
#include "Service.h"\r
\r
-//\r
-// Just pre-allocate a memory buffer that is big enough to\r
-// host all distinct TokenSpace guid in both\r
-// PEI ExMap and DXE ExMap.\r
-//\r
-EFI_GUID *TmpTokenSpaceBuffer[PEI_EXMAPPING_TABLE_SIZE + DXE_EXMAPPING_TABLE_SIZE] = { 0 };\r
-\r
///\r
/// PCD database lock.\r
///\r
-EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_CALLBACK);\r
+EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_NOTIFY);\r
\r
+///\r
+/// PCD_PROTOCOL the EDKII native implementation which support dynamic \r
+/// type and dynamicEx type PCDs.\r
+///\r
PCD_PROTOCOL mPcdInstance = {\r
DxePcdSetSku,\r
\r
DxePcdGetNextTokenSpace\r
};\r
\r
+///\r
+/// EFI_PCD_PROTOCOL is defined in PI 1.2 Vol 3 which only support dynamicEx type\r
+/// PCD.\r
+///\r
+EFI_PCD_PROTOCOL mEfiPcdInstance = {\r
+ DxePcdSetSku,\r
+ DxePcdGet8Ex,\r
+ DxePcdGet16Ex,\r
+ DxePcdGet32Ex,\r
+ DxePcdGet64Ex,\r
+ DxePcdGetPtrEx,\r
+ DxePcdGetBoolEx,\r
+ DxePcdGetSizeEx,\r
+ DxePcdSet8Ex,\r
+ DxePcdSet16Ex,\r
+ DxePcdSet32Ex,\r
+ DxePcdSet64Ex,\r
+ DxePcdSetPtrEx,\r
+ DxePcdSetBoolEx,\r
+ (EFI_PCD_PROTOCOL_CALLBACK_ON_SET) DxeRegisterCallBackOnSet,\r
+ (EFI_PCD_PROTOCOL_CANCEL_CALLBACK) DxeUnRegisterCallBackOnSet,\r
+ DxePcdGetNextToken,\r
+ DxePcdGetNextTokenSpace\r
+};\r
\r
-//\r
-// Static global to reduce the code size\r
-//\r
-EFI_HANDLE mNewHandle = NULL;\r
+///\r
+/// Instance of GET_PCD_INFO_PROTOCOL protocol is EDKII native implementation.\r
+/// This protocol instance support dynamic and dynamicEx type PCDs.\r
+///\r
+GET_PCD_INFO_PROTOCOL mGetPcdInfoInstance = {\r
+ DxeGetPcdInfoGetInfo,\r
+ DxeGetPcdInfoGetInfoEx,\r
+ DxeGetPcdInfoGetSku\r
+};\r
+\r
+///\r
+/// Instance of EFI_GET_PCD_INFO_PROTOCOL which is defined in PI 1.2.1 Vol 3.\r
+/// This PPI instance only support dyanmicEx type PCD.\r
+///\r
+EFI_GET_PCD_INFO_PROTOCOL mEfiGetPcdInfoInstance = {\r
+ DxeGetPcdInfoGetInfoEx,\r
+ DxeGetPcdInfoGetSku\r
+};\r
+\r
+EFI_HANDLE mPcdHandle = NULL;\r
\r
/**\r
Main entry for PCD DXE driver.\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
-\r
+ EFI_STATUS Status;\r
+ \r
//\r
// Make sure the Pcd Protocol is not already installed in the system\r
//\r
\r
BuildPcdDxeDataBase ();\r
\r
- Status = gBS->InstallProtocolInterface (\r
- &mNewHandle,\r
- &gPcdProtocolGuid,\r
- EFI_NATIVE_INTERFACE,\r
- &mPcdInstance\r
+ //\r
+ // Install PCD_PROTOCOL to handle dynamic type PCD\r
+ // Install EFI_PCD_PROTOCOL to handle dynamicEx type PCD\r
+ //\r
+ Status = gBS->InstallMultipleProtocolInterfaces (\r
+ &mPcdHandle,\r
+ &gPcdProtocolGuid, &mPcdInstance,\r
+ &gEfiPcdProtocolGuid, &mEfiPcdInstance,\r
+ NULL\r
);\r
-\r
ASSERT_EFI_ERROR (Status);\r
\r
- return EFI_SUCCESS;\r
+ if (FeaturePcdGet (PcdPcdInfoGeneration) && mPcdDatabase.DxeDb->PcdNameTableOffset != 0) {\r
+ //\r
+ // Install GET_PCD_INFO_PROTOCOL to handle dynamic type PCD\r
+ // Install EFI_GET_PCD_INFO_PROTOCOL to handle dynamicEx type PCD\r
+ //\r
+ Status = gBS->InstallMultipleProtocolInterfaces (\r
+ &mPcdHandle,\r
+ &gGetPcdInfoProtocolGuid, &mGetPcdInfoInstance,\r
+ &gEfiGetPcdInfoProtocolGuid, &mEfiGetPcdInfoInstance,\r
+ NULL\r
+ );\r
+ ASSERT_EFI_ERROR (Status);\r
+ }\r
+\r
+ return Status;\r
+}\r
+\r
+/**\r
+ Retrieve additional information associated with a PCD token in the default token space.\r
+\r
+ This includes information such as the type of value the TokenNumber is associated with as well as possible\r
+ human readable name that is associated with the token.\r
+\r
+ @param[in] TokenNumber The PCD token number.\r
+ @param[out] PcdInfo The returned information associated with the requested TokenNumber.\r
+ The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.\r
+\r
+ @retval EFI_SUCCESS The PCD information was returned successfully.\r
+ @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+DxeGetPcdInfoGetInfo (\r
+ IN UINTN TokenNumber,\r
+ OUT EFI_PCD_INFO *PcdInfo\r
+ )\r
+{\r
+ return DxeGetPcdInfo (NULL, TokenNumber, PcdInfo);\r
+}\r
+\r
+/**\r
+ Retrieve additional information associated with a PCD token.\r
+\r
+ This includes information such as the type of value the TokenNumber is associated with as well as possible\r
+ human readable name that is associated with the token.\r
+\r
+ @param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
+ @param[in] TokenNumber The PCD token number.\r
+ @param[out] PcdInfo The returned information associated with the requested TokenNumber.\r
+ The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.\r
+\r
+ @retval EFI_SUCCESS The PCD information was returned successfully.\r
+ @retval EFI_NOT_FOUND The PCD service could not find the requested token number.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+DxeGetPcdInfoGetInfoEx (\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN TokenNumber,\r
+ OUT EFI_PCD_INFO *PcdInfo\r
+ )\r
+{\r
+ return DxeGetPcdInfo (Guid, TokenNumber, PcdInfo);\r
+}\r
+\r
+/**\r
+ Retrieve the currently set SKU Id.\r
\r
+ @return The currently set SKU Id. If the platform has not set at a SKU Id, then the\r
+ default SKU Id value of 0 is returned. If the platform has set a SKU Id, then the currently set SKU\r
+ Id is returned.\r
+**/\r
+UINTN\r
+EFIAPI\r
+DxeGetPcdInfoGetSku (\r
+ VOID\r
+ )\r
+{\r
+ if (!FeaturePcdGet (PcdPcdInfoGeneration)) {\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+ return mPcdDatabase.PeiDb->SystemSkuId;\r
}\r
\r
/**\r
IN UINTN SkuId\r
)\r
{\r
- mPcdDatabase->PeiDb.Init.SystemSkuId = (SKU_ID) SkuId;\r
+ mPcdDatabase.PeiDb->SystemSkuId = (SKU_ID) SkuId;\r
\r
return;\r
}\r
// EBC compiler is very choosy. It may report warning about comparison\r
// between UINTN and 0 . So we add 1 in each size of the \r
// comparison.\r
- ASSERT (TokenNumber + 1 < PCD_TOTAL_TOKEN_NUMBER + 1);\r
+ ASSERT (TokenNumber + 1 < mPcdTotalTokenCount + 1);\r
\r
// EBC compiler is very choosy. It may report warning about comparison\r
// between UINTN and 0 . So we add 1 in each size of the \r
// comparison.\r
- IsPeiDb = (BOOLEAN) (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1);\r
+ IsPeiDb = (BOOLEAN) (TokenNumber + 1 < mPeiLocalTokenCount + 1);\r
\r
TokenNumber = IsPeiDb ? TokenNumber : \r
- (TokenNumber - PEI_LOCAL_TOKEN_NUMBER);\r
+ (TokenNumber - mPeiLocalTokenCount);\r
\r
- LocalTokenNumberTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable \r
- : mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
+ LocalTokenNumberTable = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset) \r
+ : (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);\r
\r
Size = (LocalTokenNumberTable[TokenNumber] & PCD_DATUM_TYPE_ALL_SET) >> PCD_DATUM_TYPE_SHIFT;\r
\r
{\r
EFI_STATUS Status;\r
\r
- ASSERT (CallBackFunction != NULL);\r
- \r
+ if (CallBackFunction == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
//\r
// Aquire lock to prevent reentrance from TPL_CALLBACK level\r
//\r
{\r
EFI_STATUS Status;\r
\r
- ASSERT (CallBackFunction != NULL);\r
+ if (CallBackFunction == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
\r
//\r
// Aquire lock to prevent reentrance from TPL_CALLBACK level\r
}\r
\r
/**\r
- Retrieves the next valid PCD token for a given namespace.\r
-\r
- @param[in] Guid The 128-bit unique value that designates the namespace from which to extract the value.\r
- @param[in, out] TokenNumber A pointer to the PCD token number to use to find the subsequent token number. \r
- If the input token namespace or token number does not exist on the platform, \r
- an error is returned and the value of *TokenNumber is undefined. To retrieve the "first" token, \r
- have the pointer reference a TokenNumber value of 0. If the input token number is 0 and \r
- there is no valid token number for this token namespace, *TokenNumber will be assigned to \r
- 0 and the function return EFI_SUCCESS. If the token number is the last valid token number, \r
- *TokenNumber will be assigned to 0 and the function return EFI_SUCCESS.\r
-\r
- @retval EFI_SUCCESS The PCD service retrieved the next valid token number. Or the input token number \r
- is already the last valid token number in the PCD database. \r
- In the later case, *TokenNumber is updated with the value of 0.\r
- @retval EFI_NOT_FOUND If this input token number and token namespace does not exist on the platform.\r
+ Retrieves the next valid token number in a given namespace. \r
+ \r
+ This is useful since the PCD infrastructure contains a sparse list of token numbers, \r
+ and one cannot a priori know what token numbers are valid in the database. \r
+ \r
+ If TokenNumber is 0 and Guid is not NULL, then the first token from the token space specified by Guid is returned. \r
+ If TokenNumber is not 0 and Guid is not NULL, then the next token in the token space specified by Guid is returned. \r
+ If TokenNumber is 0 and Guid is NULL, then the first token in the default token space is returned. \r
+ If TokenNumber is not 0 and Guid is NULL, then the next token in the default token space is returned. \r
+ The token numbers in the default token space may not be related to token numbers in token spaces that are named by Guid. \r
+ If the next token number can be retrieved, then it is returned in TokenNumber, and EFI_SUCCESS is returned. \r
+ If TokenNumber represents the last token number in the token space specified by Guid, then EFI_NOT_FOUND is returned. \r
+ If TokenNumber is not present in the token space specified by Guid, then EFI_NOT_FOUND is returned.\r
+\r
+\r
+ @param[in] Guid The 128-bit unique value that designates the namespace from which to retrieve the next token. \r
+ This is an optional parameter that may be NULL. If this parameter is NULL, then a request is \r
+ being made to retrieve tokens from the default token space.\r
+ @param[in, out] TokenNumber \r
+ A pointer to the PCD token number to use to find the subsequent token number. \r
+\r
+ @retval EFI_SUCCESS The PCD service has retrieved the next valid token number.\r
+ @retval EFI_NOT_FOUND The PCD service could not find data from the requested token number.\r
\r
**/\r
EFI_STATUS\r
BOOLEAN PeiExMapTableEmpty;\r
BOOLEAN DxeExMapTableEmpty;\r
\r
- if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
- return EFI_UNSUPPORTED;\r
- }\r
-\r
Status = EFI_NOT_FOUND;\r
- PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;\r
- DxeExMapTableEmpty = DXE_EXMAP_TABLE_EMPTY;\r
+ PeiExMapTableEmpty = mPeiExMapTableEmpty;\r
+ DxeExMapTableEmpty = mDxeExMapTableEmpty;\r
\r
//\r
// Scan the local token space\r
// EBC compiler is very choosy. It may report warning about comparison\r
// between UINTN and 0 . So we add 1 in each size of the \r
// comparison.\r
- if (((*TokenNumber + 1 > PEI_NEX_TOKEN_NUMBER + 1) && (*TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1)) ||\r
- ((*TokenNumber + 1 > (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER + 1)))) {\r
- return EFI_NOT_FOUND;\r
+ if (((*TokenNumber + 1 > mPeiNexTokenCount + 1) && (*TokenNumber + 1 <= mPeiLocalTokenCount + 1)) ||\r
+ ((*TokenNumber + 1 > (mPeiLocalTokenCount + mDxeNexTokenCount + 1)))) {\r
+ return EFI_NOT_FOUND;\r
}\r
\r
(*TokenNumber)++;\r
- if ((*TokenNumber + 1 > PEI_NEX_TOKEN_NUMBER + 1) &&\r
- (*TokenNumber <= PEI_LOCAL_TOKEN_NUMBER)) {\r
+ if ((*TokenNumber + 1 > mPeiNexTokenCount + 1) &&\r
+ (*TokenNumber + 1 <= mPeiLocalTokenCount + 1)) {\r
//\r
// The first Non-Ex type Token Number for DXE PCD \r
- // database is PEI_LOCAL_TOKEN_NUMBER\r
+ // database is mPeiLocalTokenCount + 1\r
//\r
- *TokenNumber = PEI_LOCAL_TOKEN_NUMBER;\r
- } else if (*TokenNumber + 1 > DXE_NEX_TOKEN_NUMBER + PEI_LOCAL_TOKEN_NUMBER + 1) {\r
+ if (mDxeNexTokenCount > 0) {\r
+ *TokenNumber = mPeiLocalTokenCount + 1;\r
+ } else {\r
+ *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
+ return EFI_NOT_FOUND;\r
+ }\r
+ } else if (*TokenNumber + 1 > mDxeNexTokenCount + mPeiLocalTokenCount + 1) {\r
*TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
+ return EFI_NOT_FOUND;\r
}\r
return EFI_SUCCESS;\r
}\r
\r
if (PeiExMapTableEmpty && DxeExMapTableEmpty) {\r
- *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
return EFI_NOT_FOUND;\r
}\r
\r
Status = ExGetNextTokeNumber (\r
Guid,\r
TokenNumber,\r
- mPcdDatabase->PeiDb.Init.GuidTable,\r
- sizeof(mPcdDatabase->PeiDb.Init.GuidTable),\r
- mPcdDatabase->PeiDb.Init.ExMapTable,\r
- sizeof(mPcdDatabase->PeiDb.Init.ExMapTable)\r
+ (EFI_GUID *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->GuidTableOffset),\r
+ mPeiGuidTableSize,\r
+ (DYNAMICEX_MAPPING *)((UINT8 *) mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->ExMapTableOffset),\r
+ mPeiExMapppingTableSize\r
);\r
}\r
\r
Status = ExGetNextTokeNumber (\r
Guid,\r
TokenNumber,\r
- mPcdDatabase->DxeDb.Init.GuidTable,\r
- sizeof(mPcdDatabase->DxeDb.Init.GuidTable),\r
- mPcdDatabase->DxeDb.Init.ExMapTable,\r
- sizeof(mPcdDatabase->DxeDb.Init.ExMapTable)\r
+ (EFI_GUID *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->GuidTableOffset),\r
+ mDxeGuidTableSize,\r
+ (DYNAMICEX_MAPPING *)((UINT8 *) mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->ExMapTableOffset),\r
+ mDxeExMapppingTableSize\r
);\r
}\r
\r
/**\r
Get all token space guid table which is different with given token space guid.\r
\r
- @param ExMapTableSize The size of guid table\r
+ @param ExMapTableSize The size of ExMapTable in item\r
@param ExMapTable Token space guid table that want to be scaned.\r
@param GuidTable Guid table\r
\r
EFI_GUID **DistinctTokenSpace;\r
UINTN OldGuidIndex;\r
UINTN TsIdx;\r
+ UINTN TempTsIdx;\r
UINTN Idx;\r
-\r
+ BOOLEAN Match;\r
\r
DistinctTokenSpace = AllocateZeroPool (*ExMapTableSize * sizeof (EFI_GUID *));\r
ASSERT (DistinctTokenSpace != NULL);\r
OldGuidIndex = ExMapTable[0].ExGuidIndex;\r
DistinctTokenSpace[TsIdx] = &GuidTable[OldGuidIndex];\r
for (Idx = 1; Idx < *ExMapTableSize; Idx++) {\r
- if (ExMapTable[Idx].ExGuidIndex != OldGuidIndex) {\r
- OldGuidIndex = ExMapTable[Idx].ExGuidIndex;\r
+ Match = FALSE;\r
+ OldGuidIndex = ExMapTable[Idx].ExGuidIndex;\r
+ for (TempTsIdx = 0; TempTsIdx <= TsIdx; TempTsIdx++) {\r
+ if (&GuidTable[OldGuidIndex] == DistinctTokenSpace[TempTsIdx]) {\r
+ //\r
+ // Have recorded this GUID.\r
+ //\r
+ Match = TRUE;\r
+ break;\r
+ }\r
+ }\r
+ if (!Match) {\r
DistinctTokenSpace[++TsIdx] = &GuidTable[OldGuidIndex];\r
}\r
}\r
}\r
\r
/**\r
- Get next token space in PCD database according to given token space guid.\r
- \r
- This routine is enable only when feature flag PCD PcdDxePcdDatabaseTraverseEnabled \r
- is TRUE.\r
- \r
- @param Guid Given token space guid. If NULL, then Guid will be set to \r
- the first PCD token space in PCD database, If not NULL, then\r
- Guid will be set to next PCD token space.\r
-\r
- @retval EFI_UNSUPPORTED If feature flag PCD PcdDxePcdDatabaseTraverseEnabled is FALSE.\r
- @retval EFI_NOT_FOUND If PCD database has no token space table or can not find given\r
- token space in PCD database.\r
- @retval EFI_SUCCESS Success to get next token space guid.\r
+ Retrieves the next valid PCD token namespace for a given namespace.\r
+\r
+ Gets the next valid token namespace for a given namespace. This is useful to traverse the valid\r
+ token namespaces on a platform.\r
+\r
+ @param[in, out] Guid An indirect pointer to EFI_GUID. On input it designates a known token\r
+ namespace from which the search will start. On output, it designates the next valid\r
+ token namespace on the platform. If *Guid is NULL, then the GUID of the first token\r
+ space of the current platform is returned. If the search cannot locate the next valid\r
+ token namespace, an error is returned and the value of *Guid is undefined.\r
+ \r
+ @retval EFI_SUCCESS The PCD service retrieved the value requested.\r
+ @retval EFI_NOT_FOUND The PCD service could not find the next valid token namespace.\r
+\r
**/\r
EFI_STATUS\r
EFIAPI\r
BOOLEAN PeiExMapTableEmpty;\r
BOOLEAN DxeExMapTableEmpty;\r
\r
- if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
- return EFI_UNSUPPORTED;\r
- }\r
-\r
ASSERT (Guid != NULL);\r
\r
- PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;\r
- DxeExMapTableEmpty = DXE_EXMAP_TABLE_EMPTY;\r
+ PeiExMapTableEmpty = mPeiExMapTableEmpty;\r
+ DxeExMapTableEmpty = mDxeExMapTableEmpty;\r
\r
if (PeiExMapTableEmpty && DxeExMapTableEmpty) {\r
- if (*Guid != NULL) {\r
- return EFI_NOT_FOUND;\r
- } else {\r
- return EFI_SUCCESS;\r
- }\r
+ return EFI_NOT_FOUND;\r
}\r
\r
- \r
if (TmpTokenSpaceBuffer[0] == NULL) {\r
PeiTokenSpaceTableSize = 0;\r
\r
if (!PeiExMapTableEmpty) {\r
- PeiTokenSpaceTableSize = PEI_EXMAPPING_TABLE_SIZE;\r
+ PeiTokenSpaceTableSize = mPeiExMapppingTableSize / sizeof(DYNAMICEX_MAPPING);\r
PeiTokenSpaceTable = GetDistinctTokenSpace (&PeiTokenSpaceTableSize,\r
- mPcdDatabase->PeiDb.Init.ExMapTable,\r
- mPcdDatabase->PeiDb.Init.GuidTable\r
+ (DYNAMICEX_MAPPING *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->ExMapTableOffset),\r
+ (EFI_GUID *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->GuidTableOffset)\r
);\r
CopyMem (TmpTokenSpaceBuffer, PeiTokenSpaceTable, sizeof (EFI_GUID*) * PeiTokenSpaceTableSize);\r
+ FreePool (PeiTokenSpaceTable);\r
}\r
\r
if (!DxeExMapTableEmpty) {\r
- DxeTokenSpaceTableSize = DXE_EXMAPPING_TABLE_SIZE;\r
+ DxeTokenSpaceTableSize = mDxeExMapppingTableSize / sizeof(DYNAMICEX_MAPPING);\r
DxeTokenSpaceTable = GetDistinctTokenSpace (&DxeTokenSpaceTableSize,\r
- mPcdDatabase->DxeDb.Init.ExMapTable,\r
- mPcdDatabase->DxeDb.Init.GuidTable\r
+ (DYNAMICEX_MAPPING *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->ExMapTableOffset),\r
+ (EFI_GUID *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->GuidTableOffset)\r
);\r
\r
//\r
TmpTokenSpaceBuffer[Idx3++] = DxeTokenSpaceTable[Idx2];\r
}\r
}\r
+\r
+ TmpTokenSpaceBufferCount = Idx3;\r
+ FreePool (DxeTokenSpaceTable);\r
}\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
- for (Idx = 0; Idx < (PEI_EXMAPPING_TABLE_SIZE + DXE_EXMAPPING_TABLE_SIZE); Idx++) {\r
- if(CompareGuid (*Guid, TmpTokenSpaceBuffer[Idx])) {\r
- Idx++;\r
- *Guid = TmpTokenSpaceBuffer[Idx];\r
- return EFI_SUCCESS;\r
+ for (Idx = 0; Idx < TmpTokenSpaceBufferCount; Idx++) {\r
+ if (CompareGuid (*Guid, TmpTokenSpaceBuffer[Idx])) {\r
+ if (Idx == TmpTokenSpaceBufferCount - 1) {\r
+ //\r
+ // It has been the last token namespace.\r
+ //\r
+ *Guid = NULL;\r
+ return EFI_NOT_FOUND;\r
+ } else {\r
+ Idx++;\r
+ *Guid = TmpTokenSpaceBuffer[Idx];\r
+ return EFI_SUCCESS;\r
+ }\r
}\r
}\r
\r
projects / mirror_edk2.git / blobdiff