--*/\r
EFI_STATUS\r
PeiRegisterCallBackWorker (\r
- IN UINTN ExTokenNumber,\r
+ IN PCD_TOKEN_NUMBER ExTokenNumber,\r
IN CONST EFI_GUID *Guid, OPTIONAL\r
IN PCD_PPI_CALLBACK CallBackFunction,\r
IN BOOLEAN Register\r
PCD_PPI_CALLBACK Compare;\r
PCD_PPI_CALLBACK Assign;\r
UINT32 LocalTokenNumber;\r
- UINTN TokenNumber;\r
+ PCD_TOKEN_NUMBER TokenNumber;\r
UINTN Idx;\r
- EX_PCD_ENTRY_ATTRIBUTE Attr;\r
\r
if (Guid == NULL) {\r
TokenNumber = ExTokenNumber;\r
ASSERT (TokenNumber < PEI_NEX_TOKEN_NUMBER);\r
- LocalTokenNumber = GetPcdDatabase()->Init.LocalTokenNumberTable[TokenNumber];\r
} else {\r
- GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
- TokenNumber = Attr.TokenNumber;\r
- LocalTokenNumber = Attr.LocalTokenNumberAlias;\r
+ TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
+ ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
}\r
\r
+ LocalTokenNumber = GetPcdDatabase()->Init.LocalTokenNumberTable[TokenNumber];\r
+\r
ASSERT ((LocalTokenNumber & PCD_TYPE_HII) == 0);\r
ASSERT ((LocalTokenNumber & PCD_TYPE_VPD) == 0);\r
\r
\r
}\r
\r
+\r
+\r
+\r
EFI_STATUS\r
SetWorker (\r
- UINTN TokenNumber,\r
- VOID *Data,\r
- UINTN Size,\r
- BOOLEAN PtrType\r
+ PCD_TOKEN_NUMBER TokenNumber,\r
+ VOID *Data,\r
+ UINTN Size,\r
+ BOOLEAN PtrType\r
)\r
{\r
UINT32 LocalTokenNumber;\r
PEI_PCD_DATABASE *PeiPcdDb;\r
+ UINT16 StringTableIdx;\r
+ UINTN Offset;\r
+ VOID *InternalData;\r
\r
ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
\r
ASSERT (PeiPcdDb->Init.SizeTable[TokenNumber] == Size);\r
}\r
\r
- InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);\r
-\r
- return SetWorkerByLocalTokenNumber (LocalTokenNumber, Data, Size, PtrType);\r
-\r
-}\r
-\r
-\r
-\r
-\r
-EFI_STATUS\r
-ExSetWorker (\r
- IN UINT32 ExTokenNumber,\r
- IN CONST EFI_GUID *Guid,\r
- VOID *Data,\r
- UINTN Size,\r
- BOOLEAN PtrType\r
- )\r
-{\r
- PEI_PCD_DATABASE *PeiPcdDb;\r
- EX_PCD_ENTRY_ATTRIBUTE Attr;\r
-\r
-\r
- PeiPcdDb = GetPcdDatabase ();\r
-\r
- GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
-\r
- ASSERT (!PtrType && Attr.Size);\r
-\r
- ASSERT (PtrType && Attr.Size >= Size);\r
-\r
- InvokeCallbackOnSet (ExTokenNumber, Guid, Attr.TokenNumber, Data, Size);\r
-\r
- SetWorkerByLocalTokenNumber (Attr.LocalTokenNumberAlias, Data, Size, PtrType);\r
-\r
- return EFI_SUCCESS;\r
- \r
-}\r
-\r
-\r
-\r
+ //\r
+ // We only invoke the callback function for Dynamic Type PCD Entry.\r
+ // For Dynamic EX PCD entry, we have invoked the callback function for Dynamic EX\r
+ // type PCD entry in ExSetWorker.\r
+ //\r
+ if (TokenNumber < PEI_NEX_TOKEN_NUMBER) {\r
+ InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);\r
+ }\r
\r
-EFI_STATUS\r
-SetWorkerByLocalTokenNumber (\r
- UINT32 LocalTokenNumber,\r
- VOID *Data,\r
- UINTN Size,\r
- BOOLEAN PtrType\r
- )\r
-{\r
- PEI_PCD_DATABASE *PeiPcdDb;\r
- UINT8 *PeiPcdDbRaw;\r
- UINT16 StringTableIdx;\r
- UINTN Offset;\r
- VOID *InternalData;\r
- \r
-\r
- PeiPcdDb = GetPcdDatabase ();\r
- PeiPcdDbRaw = (UINT8 *) PeiPcdDb;\r
- \r
if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size);\r
}\r
\r
Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
- InternalData = (VOID *) (PeiPcdDbRaw + Offset);\r
+ InternalData = (VOID *) ((UINT8 *) PeiPcdDb + Offset);\r
\r
switch (LocalTokenNumber & ~PCD_DATABASE_OFFSET_MASK) {\r
case PCD_TYPE_VPD:\r
\r
ASSERT (FALSE);\r
return EFI_NOT_FOUND;\r
+\r
+}\r
+\r
+\r
+\r
+\r
+EFI_STATUS\r
+ExSetWorker (\r
+ IN PCD_TOKEN_NUMBER ExTokenNumber,\r
+ IN CONST EFI_GUID *Guid,\r
+ VOID *Data,\r
+ UINTN Size,\r
+ BOOLEAN PtrType\r
+ )\r
+{\r
+ PCD_TOKEN_NUMBER TokenNumber;\r
+\r
+ TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
+\r
+ InvokeCallbackOnSet (ExTokenNumber, Guid, TokenNumber, Data, Size);\r
+\r
+ SetWorker (TokenNumber, Data, Size, PtrType);\r
+\r
+ return EFI_SUCCESS;\r
+ \r
+}\r
+\r
+\r
+\r
+\r
+VOID *\r
+ExGetWorker (\r
+ IN CONST EFI_GUID *Guid,\r
+ IN PCD_TOKEN_NUMBER ExTokenNumber,\r
+ IN UINTN GetSize\r
+ )\r
+{\r
+ return GetWorker (GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);\r
}\r
\r
\r
+\r
+\r
VOID *\r
-GetWorkerByLocalTokenNumber (\r
- PEI_PCD_DATABASE *PeiPcdDb,\r
- UINT32 LocalTokenNumber,\r
- UINTN Size\r
+GetWorker (\r
+ PCD_TOKEN_NUMBER TokenNumber,\r
+ UINTN GetSize\r
)\r
{\r
UINT32 Offset;\r
VOID *Data;\r
UINT16 *StringTable;\r
UINT16 StringTableIdx;\r
- \r
+ PEI_PCD_DATABASE *PeiPcdDb;\r
+ UINT32 LocalTokenNumber;\r
+ UINTN Size;\r
+\r
+ ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
+\r
+ Size = PeiPcdGetSize(TokenNumber);\r
+ \r
+ ASSERT (GetSize == Size || GetSize == 0);\r
+\r
PeiPcdDb = GetPcdDatabase ();\r
\r
+ LocalTokenNumber = PeiPcdDb->Init.LocalTokenNumberTable[TokenNumber];\r
+\r
if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size);\r
}\r
}\r
\r
\r
-VOID *\r
-ExGetWorker (\r
- IN CONST EFI_GUID *Guid,\r
- IN UINT32 ExTokenNumber,\r
- IN UINTN GetSize\r
- )\r
-{\r
- EX_PCD_ENTRY_ATTRIBUTE Attr;\r
-\r
- GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
- \r
- ASSERT ((GetSize == Attr.Size) || (GetSize == 0));\r
-\r
- return GetWorkerByLocalTokenNumber (GetPcdDatabase(),\r
- Attr.LocalTokenNumberAlias,\r
- Attr.Size\r
- );\r
-}\r
-\r
-VOID *\r
-GetWorker (\r
- UINTN TokenNumber,\r
- UINTN GetSize\r
- )\r
-{\r
- PEI_PCD_DATABASE *PeiPcdDb;\r
-\r
- ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
-\r
- ASSERT (GetSize == PeiPcdGetSize (TokenNumber) || GetSize == 0);\r
-\r
- PeiPcdDb = GetPcdDatabase ();\r
- \r
- return GetWorkerByLocalTokenNumber (PeiPcdDb, PeiPcdDb->Init.LocalTokenNumberTable[TokenNumber], GetSize);\r
-}\r
-\r
-\r
-VOID\r
-GetExPcdTokenAttributes (\r
+PCD_TOKEN_NUMBER\r
+GetExPcdTokenNumber (\r
IN CONST EFI_GUID *Guid,\r
- IN UINT32 ExTokenNumber,\r
- OUT EX_PCD_ENTRY_ATTRIBUTE *ExAttr\r
+ IN UINT32 ExTokenNumber\r
)\r
{\r
UINT32 i;\r
DYNAMICEX_MAPPING *ExMap;\r
EFI_GUID *GuidTable;\r
+ EFI_GUID *MatchGuid;\r
+ UINTN MatchGuidIdx;\r
PEI_PCD_DATABASE *PeiPcdDb;\r
\r
PeiPcdDb = GetPcdDatabase();\r
\r
ExMap = PeiPcdDb->Init.ExMapTable;\r
GuidTable = PeiPcdDb->Init.GuidTable;\r
+\r
+ MatchGuid = ScanGuid (GuidTable, sizeof(PeiPcdDb->Init.GuidTable), Guid);\r
+ ASSERT (MatchGuid != NULL);\r
+ \r
+ MatchGuidIdx = MatchGuid - GuidTable;\r
\r
for (i = 0; i < PEI_EXMAPPING_TABLE_SIZE; i++) {\r
if ((ExTokenNumber == ExMap[i].ExTokenNumber) && \r
- CompareGuid (Guid, (CONST EFI_GUID *) &GuidTable[ExMap[i].ExGuidIndex])) {\r
- ExAttr->TokenNumber = i + PEI_NEX_TOKEN_NUMBER;\r
- ExAttr->Size = PeiPcdDb->Init.SizeTable[i + PEI_NEX_TOKEN_NUMBER];\r
- ExAttr->LocalTokenNumberAlias = ExMap[i].LocalTokenNumber;\r
+ (MatchGuidIdx == ExMap[i].ExGuidIndex)) {\r
+ return ExMap[i].LocalTokenNumber;\r
}\r
}\r
\r
ASSERT (FALSE);\r
\r
- return;\r
+ return 0;\r
}\r
\r
\r
projects / mirror_edk2.git / blobdiff