PeiPcdSetPtrEx, \r
PeiPcdSetBoolEx,\r
\r
- PcdRegisterCallBackOnSet,\r
+ PeiRegisterCallBackOnSet,\r
PcdUnRegisterCallBackOnSet,\r
- PeiPcdGetNextToken\r
+ PeiPcdGetNextToken,\r
+ PeiPcdGetNextTokenSpace\r
};\r
\r
\r
\r
BuildPcdDatabase ();\r
\r
- Status = PeiCoreInstallPpi (&mPpiPCD);\r
+ Status = PeiServicesInstallPpi (&mPpiPCD);\r
\r
ASSERT_EFI_ERROR (Status);\r
\r
VOID\r
EFIAPI\r
PeiPcdSetSku (\r
- IN SKU_ID SkuId\r
+ IN UINTN SkuId\r
)\r
{\r
\r
- GetPcdDatabase()->Init.SystemSkuId = SkuId;\r
+ GetPcdDatabase()->Init.SystemSkuId = (SKU_ID) SkuId;\r
\r
return;\r
}\r
UINT8\r
EFIAPI\r
PeiPcdGet8 (\r
- IN PCD_TOKEN_NUMBER TokenNumber\r
+ IN UINTN TokenNumber\r
)\r
{\r
return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));\r
UINT16\r
EFIAPI\r
PeiPcdGet16 (\r
- IN PCD_TOKEN_NUMBER TokenNumber\r
+ IN UINTN TokenNumber\r
)\r
{\r
return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));\r
UINT32\r
EFIAPI\r
PeiPcdGet32 (\r
- IN PCD_TOKEN_NUMBER TokenNumber\r
+ IN UINTN TokenNumber\r
)\r
{\r
return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));\r
UINT64\r
EFIAPI\r
PeiPcdGet64 (\r
- IN PCD_TOKEN_NUMBER TokenNumber\r
+ IN UINTN TokenNumber\r
)\r
{\r
return ReadUnaligned64 (GetWorker (TokenNumber, sizeof (UINT64)));\r
VOID *\r
EFIAPI\r
PeiPcdGetPtr (\r
- IN PCD_TOKEN_NUMBER TokenNumber\r
+ IN UINTN TokenNumber\r
)\r
{\r
return GetWorker (TokenNumber, 0);\r
BOOLEAN\r
EFIAPI\r
PeiPcdGetBool (\r
- IN PCD_TOKEN_NUMBER TokenNumber\r
+ IN UINTN TokenNumber\r
)\r
{\r
return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));\r
UINTN\r
EFIAPI\r
PeiPcdGetSize (\r
- IN PCD_TOKEN_NUMBER TokenNumber\r
+ IN UINTN TokenNumber\r
)\r
{\r
- ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
+ PEI_PCD_DATABASE *PeiPcdDb;\r
+ UINTN Size;\r
+ UINTN MaxSize;\r
+\r
+ //\r
+ // If DebugAssertEnabled is TRUE, we still need to provide the GET size\r
+ // function as GetWorker and SetWoker need this function to do ASSERT.\r
+ //\r
+ if ((!FeaturePcdGet(PcdPeiPcdDatabaseGetSizeEnabled)) &&\r
+ (!DebugAssertEnabled ())) {\r
+ return 0;\r
+ }\r
+\r
+ PeiPcdDb = GetPcdDatabase ();\r
+ //\r
+ // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
+ // We have to decrement TokenNumber by 1 to make it usable\r
+ // as the array index.\r
+ //\r
+ TokenNumber--;\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 < PEI_LOCAL_TOKEN_NUMBER + 1);\r
+\r
+ Size = (PeiPcdDb->Init.LocalTokenNumberTable[TokenNumber] & PCD_DATUM_TYPE_ALL_SET) >> PCD_DATUM_TYPE_SHIFT;\r
+\r
+ if (Size == 0) {\r
+ //\r
+ // For pointer type, we need to scan the SIZE_TABLE to get the current size.\r
+ //\r
+ return GetPtrTypeSize (TokenNumber, &MaxSize, PeiPcdDb);\r
+ } else {\r
+ return Size;\r
+ }\r
\r
- return GetPcdDatabase()->Init.SizeTable[TokenNumber];\r
}\r
\r
\r
UINT8\r
EFIAPI\r
PeiPcdGet8Ex (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber\r
)\r
{\r
return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof (UINT8)));\r
UINT16\r
EFIAPI\r
PeiPcdGet16Ex (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber\r
)\r
{\r
return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT16)));\r
UINT32\r
EFIAPI\r
PeiPcdGet32Ex (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber\r
)\r
{\r
return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT32)));\r
UINT64\r
EFIAPI\r
PeiPcdGet64Ex (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber\r
)\r
{\r
return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT64)));\r
VOID *\r
EFIAPI\r
PeiPcdGetPtrEx (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber\r
)\r
{\r
return ExGetWorker (Guid, ExTokenNumber, 0);\r
BOOLEAN\r
EFIAPI\r
PeiPcdGetBoolEx (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber\r
)\r
{\r
return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof (BOOLEAN)));\r
UINTN\r
EFIAPI\r
PeiPcdGetSizeEx (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber\r
)\r
{\r
- EX_PCD_ENTRY_ATTRIBUTE Attr;\r
+ if ((!FeaturePcdGet (PcdPeiPcdDatabaseGetSizeEnabled)) || !FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) {\r
+ return 0;\r
+ }\r
\r
- GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
- \r
- return Attr.Size;\r
+ return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSet8 (\r
- IN PCD_TOKEN_NUMBER TokenNumber,\r
- IN UINT8 Value\r
+ IN UINTN TokenNumber,\r
+ IN UINT8 Value\r
)\r
{\r
- return SetWorker (TokenNumber, &Value, sizeof (Value), FALSE);\r
+ return SetValueWorker (TokenNumber, &Value, sizeof (Value));\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSet16 (\r
- IN PCD_TOKEN_NUMBER TokenNumber,\r
- IN UINT16 Value\r
+ IN UINTN TokenNumber,\r
+ IN UINT16 Value\r
)\r
{\r
- return SetWorker (TokenNumber, &Value, sizeof (Value), FALSE);\r
+ return SetValueWorker (TokenNumber, &Value, sizeof (Value));\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSet32 (\r
- IN PCD_TOKEN_NUMBER TokenNumber,\r
- IN UINT32 Value\r
+ IN UINTN TokenNumber,\r
+ IN UINT32 Value\r
)\r
{\r
- return SetWorker (TokenNumber, &Value, sizeof (Value), FALSE);\r
+ return SetValueWorker (TokenNumber, &Value, sizeof (Value));\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSet64 (\r
- IN PCD_TOKEN_NUMBER TokenNumber,\r
- IN UINT64 Value\r
+ IN UINTN TokenNumber,\r
+ IN UINT64 Value\r
)\r
{\r
- return SetWorker (TokenNumber, &Value, sizeof (Value), FALSE);\r
+ return SetValueWorker (TokenNumber, &Value, sizeof (Value));\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSetPtr (\r
- IN PCD_TOKEN_NUMBER TokenNumber,\r
- IN UINTN SizeOfBuffer,\r
- IN VOID *Buffer\r
+ IN UINTN TokenNumber,\r
+ IN OUT UINTN *SizeOfBuffer,\r
+ IN VOID *Buffer\r
)\r
{\r
return SetWorker (TokenNumber, Buffer, SizeOfBuffer, TRUE);\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSetBool (\r
- IN PCD_TOKEN_NUMBER TokenNumber,\r
- IN BOOLEAN Value\r
+ IN UINTN TokenNumber,\r
+ IN BOOLEAN Value\r
)\r
{\r
- return SetWorker (TokenNumber, &Value, sizeof (Value), FALSE);\r
+ return SetValueWorker (TokenNumber, &Value, sizeof (Value));\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSet8Ex (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber,\r
- IN UINT8 Value\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber,\r
+ IN UINT8 Value\r
)\r
{\r
- return ExSetWorker(\r
- ExTokenNumber, \r
- Guid,\r
- &Value, \r
- sizeof (Value), \r
- FALSE\r
- );\r
+ return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSet16Ex (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber,\r
- IN UINT16 Value\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber,\r
+ IN UINT16 Value\r
)\r
{\r
- return ExSetWorker(\r
- ExTokenNumber, \r
- Guid,\r
- &Value, \r
- sizeof (Value), \r
- FALSE\r
- );\r
+ return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSet32Ex (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber,\r
- IN UINT32 Value\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber,\r
+ IN UINT32 Value\r
)\r
{\r
- return ExSetWorker(\r
- ExTokenNumber, \r
- Guid,\r
- &Value, \r
- sizeof (Value), \r
- FALSE\r
- );\r
+ return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSet64Ex (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber,\r
- IN UINT64 Value\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber,\r
+ IN UINT64 Value\r
)\r
{\r
- return ExSetWorker(\r
- ExTokenNumber, \r
- Guid,\r
- &Value, \r
- sizeof (Value), \r
- FALSE\r
- );\r
+ return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSetPtrEx (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber,\r
- IN UINTN SizeOfBuffer,\r
- IN VOID *Value\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber,\r
+ IN UINTN *SizeOfBuffer,\r
+ IN VOID *Value\r
)\r
{\r
- return ExSetWorker(\r
- ExTokenNumber, \r
- Guid,\r
- Value, \r
- SizeOfBuffer, \r
- TRUE\r
- );\r
+ return ExSetWorker (ExTokenNumber, Guid, Value, SizeOfBuffer, TRUE);\r
}\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiPcdSetBoolEx (\r
- IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber,\r
- IN BOOLEAN Value\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN ExTokenNumber,\r
+ IN BOOLEAN Value\r
)\r
{\r
- return ExSetWorker(\r
- ExTokenNumber, \r
- Guid,\r
- &Value, \r
- sizeof (Value), \r
- FALSE\r
- );\r
+ return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));\r
}\r
\r
\r
\r
EFI_STATUS\r
EFIAPI\r
-PcdRegisterCallBackOnSet (\r
- IN PCD_TOKEN_NUMBER ExTokenNumber,\r
+PeiRegisterCallBackOnSet (\r
IN CONST EFI_GUID *Guid, OPTIONAL\r
+ IN UINTN ExTokenNumber,\r
IN PCD_PPI_CALLBACK CallBackFunction\r
)\r
{\r
+ if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+\r
+ ASSERT (CallBackFunction != NULL);\r
+ \r
return PeiRegisterCallBackWorker (ExTokenNumber, Guid, CallBackFunction, TRUE);\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
PcdUnRegisterCallBackOnSet (\r
- IN PCD_TOKEN_NUMBER ExTokenNumber,\r
IN CONST EFI_GUID *Guid, OPTIONAL\r
+ IN UINTN ExTokenNumber,\r
IN PCD_PPI_CALLBACK CallBackFunction\r
)\r
{\r
+ if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+\r
+ ASSERT (CallBackFunction != NULL);\r
+ \r
return PeiRegisterCallBackWorker (ExTokenNumber, Guid, CallBackFunction, FALSE);\r
}\r
\r
EFIAPI\r
PeiPcdGetNextToken (\r
IN CONST EFI_GUID *Guid, OPTIONAL\r
- IN OUT PCD_TOKEN_NUMBER *TokenNumber\r
+ IN OUT UINTN *TokenNumber\r
)\r
{\r
UINTN GuidTableIdx;\r
UINTN i;\r
BOOLEAN Found;\r
\r
+ if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) {\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+ \r
if (Guid == NULL) {\r
- *TokenNumber++;\r
-\r
- if (*TokenNumber >= PEI_NEX_TOKEN_NUMBER) {\r
- *TokenNumber = 0;\r
+ if (*TokenNumber > PEI_NEX_TOKEN_NUMBER) {\r
+ return EFI_NOT_FOUND;\r
}\r
- \r
+ (*TokenNumber)++;\r
+ if (*TokenNumber > PEI_NEX_TOKEN_NUMBER) {\r
+ *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
+ }\r
+ return EFI_SUCCESS;\r
} else {\r
-\r
if (PEI_EXMAP_TABLE_EMPTY) {\r
- *TokenNumber = (UINTN) PCD_INVALID_TOKEN_NUMBER;\r
- return EFI_NOT_FOUND;\r
+ *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
+ return EFI_SUCCESS;\r
}\r
\r
//\r
MatchGuid = ScanGuid (PeiPcdDb->Init.GuidTable, sizeof(PeiPcdDb->Init.GuidTable), Guid);\r
\r
if (MatchGuid == NULL) {\r
- *TokenNumber = (UINTN) PCD_INVALID_TOKEN_NUMBER;\r
+ *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
return EFI_NOT_FOUND;\r
}\r
\r
ExMapTable = PeiPcdDb->Init.ExMapTable;\r
\r
Found = FALSE;\r
+ //\r
+ // Locate the GUID in ExMapTable first.\r
+ //\r
for (i = 0; i < PEI_EXMAPPING_TABLE_SIZE; i++) {\r
if (ExMapTable[i].ExGuidIndex == GuidTableIdx) {\r
Found = TRUE;\r
*TokenNumber = ExMapTable[i].ExTokenNumber;\r
return EFI_SUCCESS;\r
}\r
- \r
- for ( ; ExMapTable[i].ExGuidIndex == GuidTableIdx; i++) {\r
+\r
+ for ( ; i < PEI_EXMAPPING_TABLE_SIZE; i++) {\r
if (ExMapTable[i].ExTokenNumber == *TokenNumber) {\r
i++;\r
+ if (i == PEI_EXMAPPING_TABLE_SIZE) {\r
+ //\r
+ // Exceed the length of ExMap Table\r
+ //\r
+ *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
+ return EFI_SUCCESS;\r
+ }\r
if (ExMapTable[i].ExGuidIndex == GuidTableIdx) {\r
*TokenNumber = ExMapTable[i].ExTokenNumber;\r
return EFI_SUCCESS;\r
} else {\r
- *TokenNumber = (UINTN) PCD_INVALID_TOKEN_NUMBER;\r
+ *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
return EFI_SUCCESS;\r
}\r
}\r
}\r
-\r
return EFI_NOT_FOUND;\r
}\r
- \r
}\r
\r
- return EFI_SUCCESS;\r
+ return EFI_NOT_FOUND;\r
}\r
\r
-EFI_GUID *\r
+\r
+\r
+EFI_STATUS\r
EFIAPI\r
-PeiPcdGetNextTokenSpaceGuid (\r
- IN CONST EFI_GUID *Guid\r
+PeiPcdGetNextTokenSpace (\r
+ IN OUT CONST EFI_GUID **Guid\r
)\r
{\r
UINTN GuidTableIdx;\r
UINTN i;\r
BOOLEAN Found;\r
\r
+ if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) {\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+\r
+ ASSERT (Guid != NULL);\r
+\r
if (PEI_EXMAP_TABLE_EMPTY) {\r
- return NULL;\r
+ if (*Guid != NULL) {\r
+ return EFI_NOT_FOUND;\r
+ } else {\r
+ return EFI_SUCCESS;\r
+ }\r
}\r
\r
//\r
//\r
PeiPcdDb = GetPcdDatabase ();\r
\r
- MatchGuid = ScanGuid (PeiPcdDb->Init.GuidTable, sizeof(PeiPcdDb->Init.GuidTable), Guid);\r
+ ExMapTable = PeiPcdDb->Init.ExMapTable;\r
+\r
+ if (*Guid == NULL) {\r
+ //\r
+ // return the first Token Space Guid.\r
+ //\r
+ *Guid = &PeiPcdDb->Init.GuidTable[ExMapTable[0].ExGuidIndex];\r
+ return EFI_SUCCESS;\r
+ }\r
+\r
+ MatchGuid = ScanGuid (PeiPcdDb->Init.GuidTable, sizeof(PeiPcdDb->Init.GuidTable), *Guid);\r
\r
if (MatchGuid == NULL) {\r
- return NULL;\r
+ return EFI_NOT_FOUND;\r
}\r
\r
GuidTableIdx = MatchGuid - PeiPcdDb->Init.GuidTable;\r
\r
- ExMapTable = PeiPcdDb->Init.ExMapTable;\r
-\r
Found = FALSE;\r
for (i = 0; i < PEI_EXMAPPING_TABLE_SIZE; i++) {\r
if (ExMapTable[i].ExGuidIndex == GuidTableIdx) {\r
}\r
\r
if (Found) {\r
+ i++;\r
for ( ; i < PEI_EXMAPPING_TABLE_SIZE; i++ ) {\r
if (ExMapTable[i].ExGuidIndex != GuidTableIdx ) {\r
- if (i < PEI_EXMAPPING_TABLE_SIZE) {\r
- return &PeiPcdDb->Init.GuidTable[ExMapTable[i].ExGuidIndex];\r
- } else {\r
- return NULL;\r
- }\r
+ *Guid = &PeiPcdDb->Init.GuidTable[ExMapTable[i].ExGuidIndex];\r
+ return EFI_SUCCESS;\r
}\r
}\r
+ *Guid = NULL;\r
+ return EFI_SUCCESS;\r
}\r
\r
- return NULL;\r
+ return EFI_NOT_FOUND;\r
\r
}\r
\r
projects / mirror_edk2.git / blobdiff