UINT16 StringTableIdx; \r
UINT32 LocalTokenNumber;\r
\r
-\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
ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
\r
- Size = DxePcdGetSize (TokenNumber);\r
+ Size = DxePcdGetSize (TokenNumber + 1);\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
+ // Return the default value specified by Platform Integrator \r
+ //\r
+ return (VOID *) ((UINT8 *) PcdDb + VariableHead->DefaultValueOffset);\r
+ }\r
\r
case PCD_TYPE_STRING:\r
StringTableIdx = (UINT16) *((UINT8 *) PcdDb + Offset);\r
LIST_ENTRY *ListNode;\r
\r
if (Guid != NULL) {\r
- TokenNumber = GetExPcdTokenNumber (Guid, TokenNumber);\r
+ TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) TokenNumber);\r
}\r
\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
ListHead = &mCallbackFnTable[TokenNumber];\r
ListNode = GetFirstNode (ListHead);\r
\r
LIST_ENTRY *ListNode;\r
\r
if (Guid != NULL) {\r
- TokenNumber = GetExPcdTokenNumber (Guid, TokenNumber);\r
+ TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) TokenNumber);\r
}\r
\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
ListHead = &mCallbackFnTable[TokenNumber];\r
ListNode = GetFirstNode (ListHead);\r
\r
if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
return ExMapTable[Idx].ExTokenNumber;\r
}\r
- \r
+\r
for ( ; Idx < SizeOfExMapTable; Idx++) {\r
if (ExMapTable[Idx].ExTokenNumber == TokenNumber) {\r
Idx++;\r
EFI_STATUS Status;\r
VOID *Buffer;\r
\r
+ Size = 0;\r
+ Buffer = NULL;\r
+ \r
Status = EfiGetVariable (\r
(UINT16 *)VariableName,\r
VariableGuid,\r
NULL,\r
&Size,\r
- NULL\r
+ Buffer\r
);\r
- ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
+ \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
+ *VariableData = Buffer;\r
+ *VariableSize = Size;\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
LIST_ENTRY *ListHead;\r
LIST_ENTRY *ListNode;\r
\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
ListHead = &mCallbackFnTable[TokenNumber];\r
ListNode = GetFirstNode (ListHead);\r
\r
UINT16 *StringTable;\r
EFI_GUID *Guid;\r
UINT16 *Name;\r
+ UINTN VariableOffset;\r
VOID *InternalData;\r
VARIABLE_HEAD *VariableHead;\r
UINTN Offset;\r
UINT8 *PcdDb;\r
\r
-\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
ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
\r
if (PtrType) {\r
- ASSERT (Size <= DxePcdGetSize (TokenNumber));\r
+ ASSERT (Size <= DxePcdGetSize (TokenNumber + 1));\r
} else {\r
- ASSERT (Size == DxePcdGetSize (TokenNumber));\r
+ ASSERT (Size == DxePcdGetSize (TokenNumber + 1));\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
if ((TokenNumber < PEI_NEX_TOKEN_NUMBER) ||\r
(TokenNumber >= PEI_LOCAL_TOKEN_NUMBER || TokenNumber < (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER))) {\r
- InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);\r
+ InvokeCallbackOnSet (0, NULL, TokenNumber + 1, Data, Size);\r
}\r
\r
TokenNumber = IsPeiDb ? TokenNumber\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
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
UINTN \r
GetExPcdTokenNumber (\r
IN CONST EFI_GUID *Guid,\r
- IN UINTN ExTokenNumber\r
+ IN UINT32 ExTokenNumber\r
)\r
{\r
UINT32 i;\r
projects / mirror_edk2.git / blobdiff