/** @file\r
Help functions used by PCD DXE driver.\r
\r
-Copyright (c) 2006 - 2007, Intel Corporation\r
+Copyright (c) 2006 - 2010, Intel Corporation\r
All rights reserved. This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
\r
#include "Service.h"\r
\r
-PCD_DATABASE * mPcdDatabase;\r
+PCD_DATABASE *mPcdDatabase;\r
\r
-LIST_ENTRY *mCallbackFnTable;\r
+LIST_ENTRY *mCallbackFnTable;\r
\r
/**\r
Get the PCD entry pointer in PCD database.\r
switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
case PCD_TYPE_VPD:\r
VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);\r
- RetPtr = (VOID *) (UINTN) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
+ RetPtr = (VOID *) (UINTN) (PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);\r
break;\r
\r
+ case PCD_TYPE_HII|PCD_TYPE_STRING:\r
case PCD_TYPE_HII:\r
if (IsPeiDb) {\r
GuidTable = (EFI_GUID *) (&mPcdDatabase->PeiDb.Init.GuidTable[0]);\r
}\r
\r
VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
- \r
Guid = GuidTable + VariableHead->GuidTableIndex;\r
Name = (UINT16*)(StringTable + VariableHead->StringIndex);\r
- VaraiableDefaultBuffer = (UINT8 *) PcdDb + VariableHead->DefaultValueOffset;\r
-\r
- Status = GetHiiVariable (Guid, Name, &Data, &DataSize);\r
- if (Status == EFI_SUCCESS) {\r
- if (GetSize == 0) {\r
- //\r
- // It is a pointer type. So get the MaxSize reserved for\r
- // this PCD entry.\r
- //\r
- GetPtrTypeSize (TmpTokenNumber, &GetSize);\r
+ \r
+ if ((LocalTokenNumber & PCD_TYPE_ALL_SET) == (PCD_TYPE_HII|PCD_TYPE_STRING)) {\r
+ //\r
+ // If a HII type PCD's datum type is VOID*, the DefaultValueOffset is the index of \r
+ // string array in string table.\r
+ //\r
+ StringTableIdx = *(UINT16*)((UINT8 *) PcdDb + VariableHead->DefaultValueOffset); \r
+ VaraiableDefaultBuffer = (VOID *) (StringTable + StringTableIdx); \r
+ Status = GetHiiVariable (Guid, Name, &Data, &DataSize);\r
+ if (Status == EFI_SUCCESS) {\r
+ if (GetSize == 0) {\r
+ //\r
+ // It is a pointer type. So get the MaxSize reserved for\r
+ // this PCD entry.\r
+ //\r
+ GetPtrTypeSize (TmpTokenNumber, &GetSize);\r
+ }\r
+ CopyMem (VaraiableDefaultBuffer, Data + VariableHead->Offset, GetSize);\r
+ FreePool (Data);\r
+ }\r
+ RetPtr = (VOID *) VaraiableDefaultBuffer; \r
+ } else {\r
+ VaraiableDefaultBuffer = (UINT8 *) PcdDb + VariableHead->DefaultValueOffset;\r
+ \r
+ Status = GetHiiVariable (Guid, Name, &Data, &DataSize);\r
+ if (Status == EFI_SUCCESS) {\r
+ if (GetSize == 0) {\r
+ //\r
+ // It is a pointer type. So get the MaxSize reserved for\r
+ // this PCD entry.\r
+ //\r
+ GetPtrTypeSize (TmpTokenNumber, &GetSize);\r
+ }\r
+ CopyMem (VaraiableDefaultBuffer, Data + VariableHead->Offset, GetSize);\r
+ FreePool (Data);\r
}\r
- CopyMem (VaraiableDefaultBuffer, Data + VariableHead->Offset, GetSize);\r
- FreePool (Data);\r
+ //\r
+ // If the operation is successful, we copy the data\r
+ // to the default value buffer in the PCD Database.\r
+ // So that we can free the Data allocated in GetHiiVariable.\r
+ //\r
+ //\r
+ // If the operation is not successful, \r
+ // Return 1) either the default value specified by Platform Integrator \r
+ // 2) Or the value Set by a PCD set operation.\r
+ //\r
+ RetPtr = (VOID *) VaraiableDefaultBuffer;\r
}\r
- //\r
- // If the operation is successful, we copy the data\r
- // to the default value buffer in the PCD Database.\r
- // So that we can free the Data allocated in GetHiiVariable.\r
- //\r
- //\r
- // If the operation is not successful, \r
- // Return 1) either the default value specified by Platform Integrator \r
- // 2) Or the value Set by a PCD set operation.\r
- //\r
- RetPtr = (VOID *) VaraiableDefaultBuffer;\r
break;\r
\r
case PCD_TYPE_STRING:\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
+ // as the array index of mCallbackFnTable[].\r
//\r
- TokenNumber--;\r
-\r
- ListHead = &mCallbackFnTable[TokenNumber];\r
+ ListHead = &mCallbackFnTable[TokenNumber - 1];\r
ListNode = GetFirstNode (ListHead);\r
\r
while (ListNode != ListHead) {\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
+ // as the array index of mCallbackFnTable[].\r
//\r
- TokenNumber--;\r
-\r
- ListHead = &mCallbackFnTable[TokenNumber];\r
+ ListHead = &mCallbackFnTable[TokenNumber - 1];\r
ListNode = GetFirstNode (ListHead);\r
\r
while (ListNode != ListHead) {\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
+ // as the array index of mCallbackFnTable[].\r
//\r
- TokenNumber--;\r
- \r
- ListHead = &mCallbackFnTable[TokenNumber];\r
+ ListHead = &mCallbackFnTable[TokenNumber - 1];\r
ListNode = GetFirstNode (ListHead);\r
\r
while (ListNode != ListHead) {\r
- FnTableEntry = CR_FNENTRY_FROM_LISTNODE(ListNode, CALLBACK_FN_ENTRY, Node);\r
+ FnTableEntry = CR_FNENTRY_FROM_LISTNODE (ListNode, CALLBACK_FN_ENTRY, Node);\r
\r
FnTableEntry->CallbackFn(Guid, \r
(Guid == NULL) ? TokenNumber : ExTokenNumber,\r
\r
@retval EFI_INVALID_PARAMETER If this PCD type is VPD, VPD PCD can not be set.\r
@retval EFI_INVALID_PARAMETER If Size can not be set to size table.\r
+ @retval EFI_INVALID_PARAMETER If Size of non-Ptr type PCD does not match the size information in PCD database. \r
@retval EFI_NOT_FOUND If value type of PCD entry is intergrate, but not in\r
range of UINT8, UINT16, UINT32, UINT64\r
@retval EFI_NOT_FOUND Can not find the PCD type according to token number. \r
UINTN MaxSize;\r
UINTN TmpTokenNumber;\r
\r
- //\r
- // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
- //\r
- EfiAcquireLock (&mPcdDatabaseLock);\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
//\r
ASSERT (TokenNumber + 1 < PCD_TOTAL_TOKEN_NUMBER + 1);\r
\r
- if (!PtrType) {\r
- ASSERT (*Size == DxePcdGetSize (TokenNumber + 1));\r
+ if ((!PtrType) && (*Size != DxePcdGetSize (TokenNumber + 1))) {\r
+ return EFI_INVALID_PARAMETER;\r
}\r
- \r
+\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
//\r
- IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE);\r
+ if ((TokenNumber + 1 < PEI_NEX_TOKEN_NUMBER + 1) ||\r
+ (TokenNumber + 1 >= PEI_LOCAL_TOKEN_NUMBER + 1 || TokenNumber + 1 < (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER + 1))) {\r
+ InvokeCallbackOnSet (0, NULL, TokenNumber + 1, Data, *Size);\r
+ }\r
\r
- LocalTokenNumberTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
- mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
+ //\r
+ // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
+ //\r
+ EfiAcquireLock (&mPcdDatabaseLock);\r
\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
//\r
- if ((TokenNumber + 1 < PEI_NEX_TOKEN_NUMBER + 1) ||\r
- (TokenNumber + 1 >= PEI_LOCAL_TOKEN_NUMBER + 1 || TokenNumber + 1 < (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER + 1))) {\r
- InvokeCallbackOnSet (0, NULL, TokenNumber + 1, Data, *Size);\r
- }\r
+ IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE);\r
+\r
+ LocalTokenNumberTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
+ mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
\r
TokenNumber = IsPeiDb ? TokenNumber\r
: TokenNumber - PEI_LOCAL_TOKEN_NUMBER;\r
\r
case PCD_TYPE_STRING:\r
if (SetPtrTypeSize (TmpTokenNumber, Size)) {\r
- CopyMem (StringTable + *((UINT8 *)InternalData), Data, *Size);\r
+ CopyMem (StringTable + *((UINT16 *)InternalData), Data, *Size);\r
Status = EFI_SUCCESS;\r
} else {\r
Status = EFI_INVALID_PARAMETER;\r
}\r
break;\r
\r
+ case PCD_TYPE_HII|PCD_TYPE_STRING:\r
case PCD_TYPE_HII:\r
if (PtrType) {\r
if (!SetPtrTypeSize (TmpTokenNumber, Size)) {\r
Guid = GuidTable + VariableHead->GuidTableIndex;\r
Name = (UINT16*) (StringTable + VariableHead->StringIndex);\r
VariableOffset = VariableHead->Offset;\r
-\r
Status = SetHiiVariable (Guid, Name, Data, *Size, VariableOffset);\r
-\r
+ \r
if (EFI_NOT_FOUND == Status) {\r
- CopyMem (PcdDb + VariableHead->DefaultValueOffset, Data, *Size);\r
+ if ((LocalTokenNumber & PCD_TYPE_ALL_SET) == (PCD_TYPE_HII|PCD_TYPE_STRING)) {\r
+ CopyMem (\r
+ StringTable + *(UINT16 *)(PcdDb + VariableHead->DefaultValueOffset),\r
+ Data,\r
+ *Size\r
+ );\r
+ } else {\r
+ CopyMem (PcdDb + VariableHead->DefaultValueOffset, Data, *Size);\r
+ } \r
Status = EFI_SUCCESS;\r
- } \r
+ }\r
break;\r
\r
case PCD_TYPE_DATA:\r
VOID *Buffer;\r
EFI_STATUS Status;\r
UINT32 Attribute;\r
+ UINTN SetSize;\r
\r
Size = 0;\r
+ SetSize = 0;\r
\r
//\r
// Try to get original variable size information.\r
&Size,\r
NULL\r
);\r
-\r
+ \r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
//\r
// Patch new PCD's value to offset in given HII variable.\r
//\r
- \r
- Buffer = AllocatePool (Size);\r
-\r
+ if (Size >= (DataSize + Offset)) {\r
+ SetSize = Size;\r
+ } else {\r
+ SetSize = DataSize + Offset;\r
+ }\r
+ Buffer = AllocatePool (SetSize);\r
ASSERT (Buffer != NULL);\r
\r
Status = gRT->GetVariable (\r
VariableName,\r
VariableGuid,\r
Attribute,\r
- Size,\r
+ SetSize,\r
Buffer\r
);\r
\r
FreePool (Buffer);\r
return Status;\r
-\r
} else if (Status == EFI_NOT_FOUND) {\r
//\r
// If variable does not exist, a new variable need to be created.\r
projects / mirror_edk2.git / blobdiff