)\r
{\r
EFI_STATUS 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
+\r
//\r
// Scan the local token space\r
//\r
return EFI_SUCCESS;\r
}\r
\r
- if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r
+ if (PeiExMapTableEmpty && DxeExMapTableEmpty) {\r
*TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
return EFI_NOT_FOUND;\r
}\r
\r
- if (!PEI_EXMAP_TABLE_EMPTY) {\r
+ if (!PeiExMapTableEmpty) {\r
Status = ExGetNextTokeNumber (\r
Guid,\r
TokenNumber,\r
return Status;\r
}\r
\r
- if (!DXE_EXMAP_TABLE_EMPTY) {\r
+ if (!DxeExMapTableEmpty) {\r
Status = ExGetNextTokeNumber (\r
Guid,\r
TokenNumber,\r
return Status;\r
}\r
\r
-\r
+STATIC\r
EFI_GUID **\r
GetDistinctTokenSpace (\r
IN OUT UINTN *ExMapTableSize,\r
EFI_GUID **PeiTokenSpaceTable;\r
EFI_GUID **DxeTokenSpaceTable;\r
BOOLEAN Match;\r
+ BOOLEAN PeiExMapTableEmpty;\r
+ BOOLEAN DxeExMapTableEmpty;\r
\r
if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
return EFI_UNSUPPORTED;\r
\r
ASSERT (Guid != NULL);\r
\r
- if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r
+ PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;\r
+ DxeExMapTableEmpty = DXE_EXMAP_TABLE_EMPTY;\r
+\r
+ if (PeiExMapTableEmpty && DxeExMapTableEmpty) {\r
if (*Guid != NULL) {\r
return EFI_NOT_FOUND;\r
} else {\r
if (TmpTokenSpaceBuffer[0] == NULL) {\r
PeiTokenSpaceTableSize = 0;\r
\r
- if (!PEI_EXMAP_TABLE_EMPTY) {\r
+ if (!PeiExMapTableEmpty) {\r
PeiTokenSpaceTableSize = PEI_EXMAPPING_TABLE_SIZE;\r
PeiTokenSpaceTable = GetDistinctTokenSpace (&PeiTokenSpaceTableSize,\r
mPcdDatabase->PeiDb.Init.ExMapTable,\r
CopyMem (TmpTokenSpaceBuffer, PeiTokenSpaceTable, sizeof (EFI_GUID*) * PeiTokenSpaceTableSize);\r
}\r
\r
- if (!DXE_EXMAP_TABLE_EMPTY) {\r
+ if (!DxeExMapTableEmpty) {\r
DxeTokenSpaceTableSize = DXE_EXMAPPING_TABLE_SIZE;\r
DxeTokenSpaceTable = GetDistinctTokenSpace (&DxeTokenSpaceTableSize,\r
mPcdDatabase->DxeDb.Init.ExMapTable,\r