\r
PCD_DATABASE * mPcdDatabase;\r
\r
-LIST_ENTRY mCallbackFnTable[PCD_TOTAL_TOKEN_NUMBER];\r
+LIST_ENTRY *mCallbackFnTable;\r
\r
VOID *\r
GetWorker (\r
- PCD_TOKEN_NUMBER TokenNumber,\r
+ UINTN TokenNumber,\r
UINTN GetSize\r
)\r
{\r
ASSERT (GetSize == Size || GetSize == 0);\r
\r
\r
- IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
+ IsPeiDb = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
\r
LocalTokenNumberTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
switch (LocalTokenNumber & ~PCD_DATABASE_OFFSET_MASK) {\r
case PCD_TYPE_VPD:\r
VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);\r
- return (VOID *) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
+ return (VOID *) (UINTN) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
\r
case PCD_TYPE_HII:\r
GuidTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
Name = &(StringTable[VariableHead->StringIndex]);\r
\r
Status = GetHiiVariable (Guid, Name, &Data, &DataSize);\r
- ASSERT_EFI_ERROR (Status);\r
- ASSERT (DataSize >= (UINTN) (VariableHead->Offset + Size));\r
-\r
- return (UINT8 *) Data + VariableHead->Offset;\r
+ if (Status == EFI_SUCCESS) {\r
+ ASSERT (DataSize >= (UINTN) (VariableHead->Offset + Size));\r
+ return (UINT8 *) Data + VariableHead->Offset;\r
+ } else {\r
+ //\r
+ // BugBug: Need to support default value. The current implementation\r
+ // will return a memory buffer with ALL ZERO.\r
+ // \r
+ return AllocateZeroPool (Size);\r
+ }\r
\r
case PCD_TYPE_STRING:\r
StringTableIdx = (UINT16) *((UINT8 *) PcdDb + Offset);\r
\r
EFI_STATUS\r
DxeRegisterCallBackWorker (\r
- IN PCD_TOKEN_NUMBER TokenNumber,\r
+ IN UINTN TokenNumber,\r
IN CONST GUID *Guid, OPTIONAL\r
IN PCD_PROTOCOL_CALLBACK CallBackFunction\r
)\r
LIST_ENTRY *ListNode;\r
\r
if (Guid != NULL) {\r
- TokenNumber = GetExPcdTokenNumber (Guid, TokenNumber);\r
+ TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) TokenNumber);\r
}\r
\r
ListHead = &mCallbackFnTable[TokenNumber];\r
\r
EFI_STATUS\r
DxeUnRegisterCallBackWorker (\r
- IN PCD_TOKEN_NUMBER TokenNumber,\r
+ IN UINTN TokenNumber,\r
IN CONST GUID *Guid, OPTIONAL\r
IN PCD_PROTOCOL_CALLBACK CallBackFunction\r
)\r
LIST_ENTRY *ListNode;\r
\r
if (Guid != NULL) {\r
- TokenNumber = GetExPcdTokenNumber (Guid, TokenNumber);\r
+ TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) TokenNumber);\r
}\r
\r
ListHead = &mCallbackFnTable[TokenNumber];\r
\r
\r
\r
-PCD_TOKEN_NUMBER\r
+UINTN \r
ExGetNextTokeNumber (\r
IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER TokenNumber,\r
+ IN UINTN TokenNumber,\r
IN EFI_GUID *GuidTable,\r
IN UINTN SizeOfGuidTable,\r
IN DYNAMICEX_MAPPING *ExMapTable,\r
VOID\r
BuildPcdDxeDataBase (\r
VOID\r
-)\r
+ )\r
{\r
PEI_PCD_DATABASE *PeiDatabase;\r
EFI_HOB_GUID_TYPE *GuidHob;\r
ASSERT (mPcdDatabase != NULL);\r
\r
GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
- ASSERT (GuidHob != NULL);\r
\r
- PeiDatabase = (PEI_PCD_DATABASE *) GET_GUID_HOB_DATA (GuidHob);\r
- //\r
- // Copy PCD Entries refereneced in PEI phase to PCD DATABASE\r
- //\r
- CopyMem (&mPcdDatabase->PeiDb, PeiDatabase, sizeof (PEI_PCD_DATABASE));\r
+ if (GuidHob != NULL) {\r
+\r
+ //\r
+ // We will copy over the PEI phase's PCD Database.\r
+ // \r
+ // If no PEIMs use dynamic Pcd Entry, the Pcd Service PEIM\r
+ // should not be included at all. So the GuidHob could\r
+ // be NULL. If it is NULL, we just copy over the DXE Default\r
+ // Value to PCD Database.\r
+ //\r
+ \r
+ PeiDatabase = (PEI_PCD_DATABASE *) GET_GUID_HOB_DATA (GuidHob);\r
+ //\r
+ // Copy PCD Entries refereneced in PEI phase to PCD DATABASE\r
+ //\r
+ CopyMem (&mPcdDatabase->PeiDb, PeiDatabase, sizeof (PEI_PCD_DATABASE));\r
+ }\r
\r
//\r
// Copy PCD Entries with default value to PCD DATABASE\r
//\r
// Initialized the Callback Function Table\r
//\r
+\r
+ if (PCD_TOTAL_TOKEN_NUMBER != 0) {\r
+ mCallbackFnTable = AllocateZeroPool (PCD_TOTAL_TOKEN_NUMBER * sizeof (LIST_ENTRY));\r
+ }\r
+ \r
for (Idx = 0; Idx < PCD_TOTAL_TOKEN_NUMBER; Idx++) {\r
InitializeListHead (&mCallbackFnTable[Idx]);\r
}\r
&Size,\r
NULL\r
);\r
- ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
+ if (Status == EFI_BUFFER_TOO_SMALL) {\r
\r
- Buffer = AllocatePool (Size);\r
+ Buffer = AllocatePool (Size);\r
\r
- ASSERT (Buffer != NULL);\r
+ ASSERT (Buffer != NULL);\r
\r
- Status = EfiGetVariable (\r
- VariableName,\r
- VariableGuid,\r
- NULL,\r
- &Size,\r
- Buffer\r
- );\r
+ Status = EfiGetVariable (\r
+ VariableName,\r
+ VariableGuid,\r
+ NULL,\r
+ &Size,\r
+ Buffer\r
+ );\r
+\r
+ ASSERT (Status == EFI_SUCCESS);\r
+ }\r
\r
return Status;\r
\r
switch (LocalTokenNumber & ~PCD_DATABASE_OFFSET_MASK) {\r
case PCD_TYPE_VPD:\r
Value = (UINT8 *) &(((VPD_HEAD *) Value)[i]);\r
- return ((Value - PcdDb) | PCD_TYPE_VPD);\r
+ return (UINT32) ((Value - PcdDb) | PCD_TYPE_VPD);\r
\r
case PCD_TYPE_HII:\r
Value = (UINT8 *) &(((VARIABLE_HEAD *) Value)[i]);\r
- return ((Value - PcdDb) | PCD_TYPE_HII);\r
+ return (UINT32) ((Value - PcdDb) | PCD_TYPE_HII);\r
\r
case PCD_TYPE_DATA:\r
Value += Size * i;\r
- return (Value - PcdDb);\r
+ return (UINT32) (Value - PcdDb);\r
\r
default:\r
ASSERT (FALSE);\r
\r
EFI_STATUS\r
SetWorker (\r
- PCD_TOKEN_NUMBER TokenNumber,\r
+ UINTN TokenNumber,\r
VOID *Data,\r
UINTN Size,\r
BOOLEAN PtrType\r
UINT16 *StringTable;\r
EFI_GUID *Guid;\r
UINT16 *Name;\r
+ UINTN VariableOffset;\r
VOID *InternalData;\r
VARIABLE_HEAD *VariableHead;\r
UINTN Offset;\r
ASSERT (Size == DxePcdGetSize (TokenNumber));\r
}\r
\r
- IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
+ IsPeiDb = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
\r
LocalTokenNumberTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
\r
case PCD_TYPE_STRING:\r
CopyMem (&StringTable[*((UINT16 *)InternalData)], Data, Size);\r
- break;\r
+ return EFI_SUCCESS;\r
\r
case PCD_TYPE_HII:\r
//\r
\r
Guid = &(GuidTable[VariableHead->GuidTableIndex]);\r
Name = &(StringTable[VariableHead->StringIndex]);\r
+ VariableOffset = VariableHead->Offset;\r
\r
- return EFI_SUCCESS;\r
+ return SetHiiVariable (Guid, Name, Data, Size, VariableOffset);\r
\r
case PCD_TYPE_DATA:\r
if (PtrType) {\r
IN UINTN GetSize\r
) \r
{\r
- return GetWorker(GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);\r
+ return GetWorker(GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber), GetSize);\r
}\r
\r
\r
\r
EFI_STATUS\r
ExSetWorker (\r
- IN PCD_TOKEN_NUMBER ExTokenNumber,\r
+ IN UINTN ExTokenNumber,\r
IN CONST EFI_GUID *Guid,\r
VOID *Data,\r
UINTN SetSize,\r
BOOLEAN PtrType\r
)\r
{\r
- PCD_TOKEN_NUMBER TokenNumber;\r
+ UINTN TokenNumber;\r
\r
- TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
+ TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber);\r
\r
- InvokeCallbackOnSet (ExTokenNumber, Guid, TokenNumber, Data, SetSize);\r
+ InvokeCallbackOnSet ((UINT32) ExTokenNumber, Guid, TokenNumber, Data, SetSize);\r
\r
SetWorker (TokenNumber, Data, SetSize, PtrType);\r
\r
NULL\r
);\r
\r
- ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
+ if (Status == EFI_BUFFER_TOO_SMALL) {\r
\r
- Buffer = AllocatePool (Size);\r
+ Buffer = AllocatePool (Size);\r
\r
- ASSERT (Buffer != NULL);\r
+ ASSERT (Buffer != NULL);\r
\r
- Status = EfiGetVariable (\r
- VariableName,\r
- VariableGuid,\r
- &Attribute,\r
- &Size,\r
- Buffer\r
- );\r
+ Status = EfiGetVariable (\r
+ VariableName,\r
+ VariableGuid,\r
+ &Attribute,\r
+ &Size,\r
+ Buffer\r
+ );\r
+ \r
+ ASSERT_EFI_ERROR (Status);\r
\r
+ CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
+\r
+ } else {\r
\r
- CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
+ Attribute = EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS;\r
+ Size = DataSize + Offset;\r
+ Buffer = AllocateZeroPool (Size);\r
+ ASSERT (Buffer != NULL);\r
+ CopyMem ((UINT8 *)Buffer + Offset, Data, DataSize);\r
+ \r
+ }\r
\r
return EfiSetVariable (\r
- VariableName,\r
- VariableGuid,\r
- Attribute,\r
- Size,\r
- Buffer\r
- );\r
+ VariableName,\r
+ VariableGuid,\r
+ Attribute,\r
+ Size,\r
+ Buffer\r
+ );\r
\r
}\r
\r
\r
\r
\r
-PCD_TOKEN_NUMBER\r
+UINTN \r
GetExPcdTokenNumber (\r
IN CONST EFI_GUID *Guid,\r
- IN PCD_TOKEN_NUMBER ExTokenNumber\r
+ IN UINT32 ExTokenNumber\r
)\r
{\r
UINT32 i;\r
projects / mirror_edk2.git / blobdiff