Add in support for GetNextTokenNumber API.

[mirror_edk2.git] / EdkModulePkg / Universal / PCD / Dxe / Service.c

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index 280a45ea3188a88dc8c1d0b2a3f2a25c5c93a2e3..53d9621e8cd0809b5641f5d4d6579dd7ed72e19d 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -14,427 +14,613 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 Module Name: Service.c\r
 \r
 **/\r
 Module Name: Service.c\r
 \r
 **/\r

-#include "../Common/PcdCommon.h"\r

 #include "Service.h"\r
 \r
 #include "Service.h"\r
 \r

-static PCD_DATABASE *PrivatePcdDxeDatabase;\r
-static LIST_ENTRY   mPcdDatabaseListHead = INITIALIZE_LIST_HEAD_VARIABLE(mPcdDatabaseListHead);\r

 \r
 \r

-LIST_ENTRY *\r
-GetPcdDatabaseListHead (\r
-  VOID\r
-  )\r
-{\r
-  return &mPcdDatabaseListHead;\r
-}\r
-\r
-PCD_DATABASE *\r
-GetPcdDxeDataBaseInstance (\r
-  VOID\r
-)\r
-{\r
-  return PrivatePcdDxeDatabase;\r
-}\r
+//\r
+// Build Tool will generate DXE_PCD_DB_INIT_VALUE in Autogen.h\r
+// Compression Algorithm will take care of the size optimization.\r
+//\r

 \r
 \r

-PCD_DATABASE *\r
-SetPcdDxeDataBaseInstance (\r
-  PCD_DATABASE *PcdDatabase\r
-)\r
-{\r
-  return PrivatePcdDxeDatabase = PcdDatabase;\r
-}\r
+PCD_DATABASE * mPcdDatabase;\r

 \r
 \r

+LIST_ENTRY mCallbackFnTable[PCD_TOTAL_TOKEN_NUMBER];\r

 \r
 \r

-VOID\r
-DxeGetPcdEntryWorker (\r
-  IN UINTN            TokenNumber,\r
-  IN CONST GUID       *Guid,  OPTIONAL\r
-  IN PCD_DATA_TYPE    Type,\r
-  OUT VOID            *Data\r
-  )\r
+VOID *\r
+GetWorkerByLocalTokenNumber (\r
+  UINT32      LocalTokenNumber,\r
+  BOOLEAN     IsPeiDb,\r
+  UINTN       Size\r
+  ) \r

 {\r
 {\r

-  PCD_DATABASE *Database;\r
-  Database = GetPcdDxeDataBaseInstance ();\r
+  UINT32              Offset;\r
+  EFI_GUID            *GuidTable;\r
+  UINT16              *StringTable;\r
+  EFI_GUID            *Guid;\r
+  UINT16              *Name;\r
+  VARIABLE_HEAD       *VariableHead;\r
+  EFI_STATUS          Status;\r
+  UINTN               DataSize;\r
+  VOID                *Data;\r
+  VPD_HEAD            *VpdHead;\r
+  UINT8               *PcdDb;\r
+  UINT16              StringTableIdx;      \r
+\r
+  if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
+    LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size, IsPeiDb);\r
+  }\r
+\r
+  PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r
+  StringTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
+                          mPcdDatabase->DxeDb.Init.StringTable;\r
+  \r
+  Offset     = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
+  \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
+      \r
+    case PCD_TYPE_HII:\r
+      GuidTable   = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
+                              mPcdDatabase->DxeDb.Init.GuidTable;\r
+                              \r
+      VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
+      \r
+      Guid = &(GuidTable[VariableHead->GuidTableIndex]);\r
+      Name = &(StringTable[VariableHead->StringIndex]);\r

 \r
 \r

-  GetPcdEntryWorker ( &Database->Info,\r
-                      TokenNumber,\r
-                      Guid,\r
-                      Type,\r
-                      Data\r
-                      );\r
+      Status = GetHiiVariable (Guid, Name, &Data, &DataSize);\r
+      ASSERT_EFI_ERROR (Status);\r
+      ASSERT (DataSize >= (UINTN) (VariableHead->Offset + Size));\r

 \r
 \r

+      return (UINT8 *) Data + VariableHead->Offset;\r

 \r
 \r

-  return;\r
-}\r
+    case PCD_TYPE_STRING:\r
+      StringTableIdx = (UINT16) *((UINT8 *) PcdDb + Offset);\r
+      return (VOID *) &StringTable[StringTableIdx];\r

 \r
 \r

+    case PCD_TYPE_DATA:\r
+      return (VOID *) ((UINT8 *) PcdDb + Offset);\r
+      break;\r

 \r
 \r

+    default:\r
+      ASSERT (FALSE);\r
+      break;\r
+      \r
+  }\r

 \r
 \r

-EFI_STATUS\r
-DxeSetPcdEntryWorker (\r
-  IN UINTN              TokenNumber,\r
-  IN CONST GUID         *Guid,  OPTIONAL\r
-  IN PCD_DATA_TYPE      Type,\r
-  IN CONST VOID         *Data\r
+  ASSERT (FALSE);\r
+      \r
+  return NULL;\r
+}\r
+  \r
+VOID *\r
+GetWorker (\r
+  UINTN  TokenNumber\r

   )\r
 {\r
   )\r
 {\r

-  PCD_DATABASE            *Database;\r
-  PCD_INDEX               *PcdIndex;\r
-  EFI_STATUS              Status;\r
+  UINT32        *LocalTokenNumberTable;\r
+  UINT16        *SizeTable;\r
+  BOOLEAN       IsPeiDb;\r

 \r
 \r

-  Database = GetPcdDxeDataBaseInstance ();\r
+  ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
+  \r
+  IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r

 \r
 \r

+  LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
+                                     mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r

 \r
 \r

-  ASSERT (Data != NULL);\r
+  SizeTable              = IsPeiDb ? mPcdDatabase->PeiDb.Init.SizeTable: \r
+                                     mPcdDatabase->DxeDb.Init.SizeTable;\r

 \r
 \r

-  PcdIndex = FindPcdIndex (TokenNumber, Guid, &Database->Info, NULL);\r
+  TokenNumber            = IsPeiDb ? TokenNumber :\r
+                                     TokenNumber - PEI_LOCAL_TOKEN_NUMBER;\r
+  return GetWorkerByLocalTokenNumber (LocalTokenNumberTable[TokenNumber], IsPeiDb, SizeTable[TokenNumber]);\r
+}\r

 \r
 \r

-  ASSERT (PcdIndex != NULL);\r

 \r
 \r

-  ASSERT (PcdIndex->StateByte.DataType == Type);\r

 \r
 \r

-  //\r
-  // Invoke the callback function.\r
-  //\r
+EFI_STATUS\r
+DxeRegisterCallBackWorker (\r
+  IN  UINTN                   TokenNumber,\r
+  IN  CONST GUID              *Guid, OPTIONAL\r
+  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
+)\r
+{\r
+  CALLBACK_FN_ENTRY       *FnTableEntry;\r
+  EX_PCD_ENTRY_ATTRIBUTE  ExAttr;\r
+  LIST_ENTRY              *ListHead;\r
+  LIST_ENTRY              *ListNode;\r
+\r
+  if (Guid != NULL) {\r
+    GetExPcdTokenAttributes (Guid, TokenNumber, &ExAttr);\r
+    TokenNumber = ExAttr.LocalTokenNumberAlias;\r
+  }\r

 \r
 \r

-  Status = SetPcdData (PcdIndex, &Database->Info, Data);\r
+  ListHead = &mCallbackFnTable[TokenNumber];\r
+  ListNode = GetFirstNode (ListHead);\r

 \r
 \r

-  return Status;\r
+  while (ListNode != ListHead) {\r
+    FnTableEntry = CR_FNENTRY_FROM_LISTNODE(ListNode, CALLBACK_FN_ENTRY, Node);\r
+\r
+    if (FnTableEntry->CallbackFn == CallBackFunction) {\r
+      //\r
+      // We only allow a Callback function to be register once\r
+      // for a TokenNumber. So just return EFI_SUCCESS\r
+      //\r
+      return EFI_SUCCESS;\r
+    }\r
+    ListNode = GetNextNode (ListHead, ListNode);\r
+  }\r

 \r
 \r

+  FnTableEntry = AllocatePool (sizeof(CALLBACK_FN_ENTRY));\r
+  ASSERT (FnTableEntry != NULL);\r

 \r
 \r

+  FnTableEntry->CallbackFn = CallBackFunction;\r
+  InsertTailList (ListHead, &FnTableEntry->Node);\r
+  \r
+  return EFI_SUCCESS;\r

 }\r
 \r
 \r
 \r
 }\r
 \r
 \r
 \r

-UINTN\r
-DxeGetPcdEntrySizeWorker (\r
-  IN UINTN            TokenNumber,\r
-  IN CONST GUID       *Guid  OPTIONAL\r
-  )\r
+\r
+EFI_STATUS\r
+DxeUnRegisterCallBackWorker (\r
+  IN  UINTN                   TokenNumber,\r
+  IN  CONST GUID              *Guid, OPTIONAL\r
+  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
+)\r

 {\r
 {\r

-  PCD_DATABASE *Database;\r
-  Database = GetPcdDxeDataBaseInstance ();\r
+  CALLBACK_FN_ENTRY       *FnTableEntry;\r
+  EX_PCD_ENTRY_ATTRIBUTE  ExAttr;\r
+  LIST_ENTRY              *ListHead;\r
+  LIST_ENTRY              *ListNode;\r
+\r
+  if (Guid != NULL) {\r
+    GetExPcdTokenAttributes (Guid, TokenNumber, &ExAttr);\r
+    TokenNumber = ExAttr.LocalTokenNumberAlias;\r
+  }\r
+\r
+  ListHead = &mCallbackFnTable[TokenNumber];\r
+  ListNode = GetFirstNode (ListHead);\r

 \r
 \r

-  return GetPcdEntrySizeWorker (&Database->Info,\r
-                                TokenNumber,\r
-                                Guid\r
-                                );\r
+  while (ListNode != ListHead) {\r
+    FnTableEntry = CR_FNENTRY_FROM_LISTNODE(ListNode, CALLBACK_FN_ENTRY, Node);\r
+\r
+    if (FnTableEntry->CallbackFn == CallBackFunction) {\r
+      //\r
+      // We only allow a Callback function to be register once\r
+      // for a TokenNumber. So we can safely remove the Node from\r
+      // the Link List and return EFI_SUCCESS.\r
+      //\r
+      RemoveEntryList (ListNode);\r
+      FreePool (FnTableEntry);\r
+      \r
+      return EFI_SUCCESS;\r
+    }\r
+    ListNode = GetNextNode (ListHead, ListNode);\r
+  }\r
+\r
+  return EFI_INVALID_PARAMETER;\r

 }\r
 \r
 \r
 \r
 }\r
 \r
 \r
 \r

-LIST_ENTRY *\r
-InsertToGuidSpaceListI (\r
-  IN LIST_ENTRY       *GuidSpaceListHead,\r
-  IN CONST EFI_GUID   *Guid\r
+PCD_TOKEN_NUMBER\r
+ExGetNextTokeNumber (\r
+  IN CONST EFI_GUID         *Guid,\r
+  IN PCD_TOKEN_NUMBER       TokenNumber,\r
+  IN EFI_GUID               *GuidTable,\r
+  IN UINTN                  SizeOfGuidTable,\r
+  IN DYNAMICEX_MAPPING      *ExMapTable,\r
+  IN UINTN                  SizeOfExMapTable\r

   )\r
 {\r
   )\r
 {\r

-  PCD_GUID_SPACE    *GuidSpaceEntry;\r
+  EFI_GUID         *MatchGuid;\r
+  UINTN            Idx;\r
+  UINTN            GuidTableIdx;\r
+  BOOLEAN          Found;\r
+\r
+  MatchGuid = ScanGuid (GuidTable, SizeOfGuidTable, Guid);\r
+  if (MatchGuid == NULL) {\r
+    return PCD_INVALID_TOKEN_NUMBER;\r
+  }\r

 \r
 \r

-  GuidSpaceEntry = AllocatePool (sizeof (PCD_GUID_SPACE));\r
-  ASSERT (GuidSpaceEntry != NULL);\r
+  Found = FALSE;\r
+  GuidTableIdx = MatchGuid - GuidTable;\r
+  for (Idx = 0; Idx < SizeOfExMapTable; Idx++) {\r
+    if (ExMapTable[Idx].ExGuidIndex == GuidTableIdx) {\r
+      Found = TRUE;\r
+      break;\r
+    }\r
+  }\r

 \r
 \r

-  GuidSpaceEntry->GuidSpace= Guid;\r
-  InitializeListHead (&GuidSpaceEntry->TokenSpaceHead);\r
+  if (Found) {\r
+    if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
+      return ExMapTable[Idx].ExTokenNumber;\r
+    }\r
+    \r
+    for ( ; Idx < SizeOfExMapTable; Idx++) {\r
+      if (ExMapTable[Idx].ExTokenNumber == TokenNumber) {\r
+        Idx++;\r
+        if (Idx == SizeOfExMapTable) {\r
+          //\r
+          // Exceed the length of ExMap Table\r
+          //\r
+          return PCD_INVALID_TOKEN_NUMBER;\r
+        } else if (ExMapTable[Idx].ExGuidIndex == GuidTableIdx) {\r
+          //\r
+          // Found the next match\r
+          //\r
+          return ExMapTable[Idx].ExTokenNumber;\r
+        } else {\r
+          //\r
+          // Guid has been changed. It is the next Token Space Guid.\r
+          // We should flag no more TokenNumber.\r
+          //\r
+          return PCD_INVALID_TOKEN_NUMBER;\r
+        }\r
+      }\r
+    }\r
+  }\r

   \r
   \r

-  InsertTailList (GuidSpaceListHead, &GuidSpaceEntry->ListNode);\r
-\r
-  return &GuidSpaceEntry->TokenSpaceHead;\r
+  return PCD_INVALID_TOKEN_NUMBER;\r

 }\r
 }\r

+  \r

 \r
 \r
 \r
 \r
 \r
 \r

-LIST_ENTRY *\r
-InsertToTokenSpaceListI (\r
-  IN LIST_ENTRY *TokenSpaceListHead,\r
-  IN UINTN      TokenNumber\r
-  )\r
+VOID\r
+BuildPcdDxeDataBase (\r
+  VOID\r
+)\r

 {\r
 {\r

-  PCD_TOKEN_SPACE   *TokenSpaceEntry;\r
+  PEI_PCD_DATABASE    *PeiDatabase;\r
+  EFI_HOB_GUID_TYPE   *GuidHob;\r
+  UINTN               Idx;\r

 \r
 \r

-  TokenSpaceEntry = AllocatePool (sizeof (PCD_TOKEN_SPACE));\r
-  ASSERT (TokenSpaceEntry != NULL);\r
+  mPcdDatabase = AllocateZeroPool (sizeof(PCD_DATABASE));\r
+  ASSERT (mPcdDatabase != NULL);\r

 \r
 \r

-  TokenSpaceEntry->TokeNumber = TokenNumber;\r
-  InitializeListHead (&TokenSpaceEntry->CallbackListHead);\r
-  \r
-  InsertTailList (TokenSpaceListHead, &TokenSpaceEntry->ListNode);\r
+  GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
+  ASSERT (GuidHob != NULL);\r

 \r
 \r

-  return &TokenSpaceEntry->CallbackListHead;\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
+  CopyMem (&mPcdDatabase->DxeDb.Init, &gDXEPcdDbInit, sizeof(DXE_PCD_DATABASE_INIT));\r

 \r
 \r
 \r
 \r

-VOID\r
-InsertToCallbackListI (\r
-  IN  LIST_ENTRY *CallbackListHead,\r
-  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
-  )\r
-{\r
-  PCD_CALLBACK_ENTRY *CallbackEntry;\r
-  \r
-  CallbackEntry = AllocatePool (sizeof (PCD_CALLBACK_ENTRY));\r
-  ASSERT (CallbackEntry != NULL);\r
-  CallbackEntry->CallbackFunction = CallBackFunction;\r
-  InsertTailList (CallbackListHead, &CallbackEntry->ListNode);\r
-  \r
+  //\r
+  // Initialized the Callback Function Table\r
+  //\r
+  for (Idx = 0; Idx < PCD_TOTAL_TOKEN_NUMBER; Idx++) {\r
+    InitializeListHead (&mCallbackFnTable[Idx]);\r
+  }\r
+    \r

   return;\r
 }\r
 \r
 \r
 \r
   return;\r
 }\r
 \r
 \r
 \r

-\r
-VOID\r
-InsertToCallbackList (\r
-  IN  UINTN                   TokenNumber,\r
-  IN  CONST EFI_GUID          *Guid,\r
-  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
+EFI_STATUS\r
+GetHiiVariable (\r
+  IN  EFI_GUID      *VariableGuid,\r
+  IN  UINT16        *VariableName,\r
+  OUT VOID          ** VariableData,\r
+  OUT UINTN         *VariableSize\r

   )\r
 {\r
   )\r
 {\r

-  LIST_ENTRY        *GuidListNode;\r
-  LIST_ENTRY        *GuidListHead;\r
-  LIST_ENTRY        *TokenListNode;\r
-  LIST_ENTRY        *TokenListHead;\r
-  LIST_ENTRY        *CallbackListHead;\r
-  PCD_GUID_SPACE    *GuidSpaceEntry;\r
-  PCD_TOKEN_SPACE   *TokenSpaceEntry;\r
+  UINTN      Size;\r
+  EFI_STATUS Status;\r
+  VOID       *Buffer;\r

 \r
 \r

-  \r
-  GuidListHead = GetPcdDatabaseListHead ();\r
-\r
-  GuidListNode = GetFirstNode (GuidListHead);\r
-  while (!IsNull (GuidListNode, GuidListHead)) {\r
-    GuidSpaceEntry = PCD_GUID_SPACE_FROM_LISTNODE(GuidListNode);\r
-\r
-    if (CompareGuid (GuidSpaceEntry->GuidSpace, Guid)) {\r
-      TokenListHead = &GuidSpaceEntry->TokenSpaceHead;\r
-      TokenListNode = GetFirstNode (TokenListHead);\r
-      while (!IsNull (TokenListNode, TokenListHead)) {\r
-        TokenSpaceEntry = PCD_TOKEN_SPACE_FROM_LISTNODE(TokenListNode);\r
-        if (TokenSpaceEntry->TokeNumber == TokenNumber) {\r
-          InsertToCallbackListI (&TokenSpaceEntry->CallbackListHead , CallBackFunction);\r
-        }\r
-      }\r
+  Status = EfiGetVariable (\r
+    (UINT16 *)VariableName,\r
+    VariableGuid,\r
+    NULL,\r
+    &Size,\r
+    NULL\r
+    );\r
+  ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r

 \r
 \r

-      //\r
-      // No TokenNumber match input found in this GuidSpace\r
-      //\r
-      CallbackListHead = InsertToTokenSpaceListI (TokenListHead, TokenNumber);\r
-      InsertToCallbackListI (CallbackListHead , CallBackFunction);\r
-    }\r
-    \r
-    GuidListNode = GetNextNode (GuidListHead, GuidListNode);\r
-  }\r
+  Buffer = AllocatePool (Size);\r

 \r
 \r

-  //\r
-  // No GuidSpace match the input Guid, so build the GuidSpace, TokenNumberSpace and Callback\r
-  //\r
-  TokenListHead = InsertToGuidSpaceListI (GuidListHead, Guid);\r
-  CallbackListHead = InsertToTokenSpaceListI (TokenListHead, TokenNumber);\r
-  InsertToCallbackListI (CallbackListHead , CallBackFunction);\r
+  ASSERT (Buffer != NULL);\r
+\r
+  Status = EfiGetVariable (\r
+    VariableName,\r
+    VariableGuid,\r
+    NULL,\r
+    &Size,\r
+    Buffer\r
+    );\r
+\r
+  return Status;\r

 \r
 \r

-  return;\r
-  \r

 }\r
 \r
 }\r
 \r

-EFI_STATUS\r
-RemoveFromCallbackListI (\r
-  IN  LIST_ENTRY              *CallbackListHead,\r
-  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
-  )\r
+\r
+UINT32\r
+GetSkuEnabledTokenNumber (\r
+  UINT32    LocalTokenNumber,\r
+  UINTN     Size,\r
+  BOOLEAN   IsPeiDb\r
+  ) \r

 {\r
 {\r

-  LIST_ENTRY          *ListNode;\r
-  PCD_CALLBACK_ENTRY  *CallbackEntry;\r
+  SKU_HEAD              *SkuHead;\r
+  SKU_ID                *SkuIdTable;\r
+  INTN                  i;\r
+  UINT8                 *Value;\r
+  SKU_ID                *PhaseSkuIdTable;\r
+  UINT8                 *PcdDb;\r

 \r
 \r

-  ListNode = GetFirstNode (CallbackListHead);\r
+  ASSERT ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == 0);\r

 \r
 \r

-  while (!IsNull(CallbackListHead, ListNode)) {\r
-    CallbackEntry = PCD_CALLBACK_ENTRY_FROM_LISTNODE(ListNode);\r
+  PcdDb = IsPeiDb ? (UINT8 *) &mPcdDatabase->PeiDb : (UINT8 *) &mPcdDatabase->DxeDb;\r

 \r
 \r

-    if (CallbackEntry->CallbackFunction == CallBackFunction) {\r
-      RemoveEntryList (ListNode);\r
-      FreePool (CallbackEntry);\r
-      return EFI_SUCCESS;\r
+  SkuHead     = (SKU_HEAD *) (PcdDb + (LocalTokenNumber & PCD_DATABASE_OFFSET_MASK));\r
+  Value       = (UINT8 *) (PcdDb + SkuHead->SkuDataStartOffset); \r
+\r
+  PhaseSkuIdTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.SkuIdTable :\r
+                              mPcdDatabase->DxeDb.Init.SkuIdTable;\r
+                              \r
+  SkuIdTable  = &PhaseSkuIdTable[SkuHead->SkuIdTableOffset];\r
+        \r
+  for (i = 0; i < SkuIdTable[0]; i++) {\r
+    if (mPcdDatabase->PeiDb.Init.SystemSkuId == SkuIdTable[i + 1]) {\r
+      break;\r

     }\r
     }\r

-    ListNode = GetNextNode (CallbackListHead, ListNode);\r

   }\r
   }\r

+  ASSERT (i < SkuIdTable[0]);\r

 \r
 \r

-  return EFI_NOT_FOUND;\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
+\r
+    case PCD_TYPE_HII:\r
+      Value = (UINT8 *) &(((VARIABLE_HEAD *) Value)[i]);\r
+      return ((Value - PcdDb) | PCD_TYPE_HII);\r
+      \r
+    case PCD_TYPE_DATA:\r
+      Value += Size * i;\r
+      return (Value - PcdDb);\r
+      \r
+    default:\r
+      ASSERT (FALSE);\r
+  }\r
+\r
+  ASSERT (FALSE);\r
+\r
+  return 0;\r
+  \r

 }\r
 \r
 \r
 \r
 }\r
 \r
 \r
 \r

-EFI_STATUS\r
-RemoveFromCallbackList (\r
-  IN  UINTN                   TokenNumber,\r
-  IN  CONST GUID              *Guid,\r
-  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
+\r
+\r
+VOID\r
+InvokeCallbackOnSet (\r
+  UINT32            ExTokenNumber,\r
+  CONST EFI_GUID    *Guid, OPTIONAL\r
+  UINTN             TokenNumber,\r
+  VOID              *Data,\r
+  UINTN             Size\r

   )\r
 {\r
   )\r
 {\r

-  LIST_ENTRY        *GuidListNode;\r
-  LIST_ENTRY        *GuidListHead;\r
-  LIST_ENTRY        *TokenListNode;\r
-  LIST_ENTRY        *TokenListHead;\r
-  PCD_GUID_SPACE    *GuidSpaceEntry;\r
-  PCD_TOKEN_SPACE   *TokenSpaceEntry;\r
+  CALLBACK_FN_ENTRY       *FnTableEntry;\r
+  LIST_ENTRY              *ListHead;\r
+  LIST_ENTRY              *ListNode;\r

 \r
 \r

-  \r
-  GuidListHead = GetPcdDatabaseListHead ();\r
+  ListHead = &mCallbackFnTable[TokenNumber];\r
+  ListNode = GetFirstNode (ListHead);\r

 \r
 \r

-  GuidListNode = GetFirstNode (GuidListHead);\r
-  while (!IsNull (GuidListNode, GuidListHead)) {\r
-    \r
-    GuidSpaceEntry = PCD_GUID_SPACE_FROM_LISTNODE(GuidListNode);\r
-    if (CompareGuid (GuidSpaceEntry->GuidSpace, Guid)) {\r
-      \r
-      TokenListHead = &GuidSpaceEntry->TokenSpaceHead;\r
-      TokenListNode = GetFirstNode (TokenListHead);\r
-      while (!IsNull (TokenListNode, TokenListHead)) {\r
-        \r
-        TokenSpaceEntry = PCD_TOKEN_SPACE_FROM_LISTNODE(TokenListNode);\r
-        if (TokenSpaceEntry->TokeNumber == TokenNumber) {\r
-          return RemoveFromCallbackListI (&TokenSpaceEntry->CallbackListHead , CallBackFunction);\r
-        }\r
-      }\r
+  while (ListNode != ListHead) {\r
+    FnTableEntry = CR_FNENTRY_FROM_LISTNODE(ListNode, CALLBACK_FN_ENTRY, Node);\r

 \r
 \r

-      //\r
-      // No TokenNumber match input found in this GuidSpace\r
-      //\r
-      return EFI_NOT_FOUND;\r
-    }\r
+    FnTableEntry->CallbackFn(Guid, \r
+                    (Guid == NULL) ? TokenNumber : ExTokenNumber,\r
+                    Data,\r
+                    Size);\r

     \r
     \r

-    GuidListNode = GetNextNode (GuidListHead, GuidListNode);\r
+    ListNode = GetNextNode (ListHead, ListNode);\r

   }\r
   }\r

-\r
-\r
-  return EFI_NOT_FOUND;\r

   \r
   \r

+  return;\r

 }\r
 \r
 \r
 \r
 }\r
 \r
 \r
 \r

+\r

 EFI_STATUS\r
 EFI_STATUS\r

-DxeRegisterCallBackWorker (\r
-  IN  UINTN                   TokenNumber,\r
-  IN  CONST GUID              *Guid, OPTIONAL\r
-  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction,\r
-  IN  BOOLEAN                 Register\r
-)\r
+SetWorker (\r
+  PCD_TOKEN_NUMBER        TokenNumber,\r
+  VOID                    *Data,\r
+  UINTN                   Size,\r
+  BOOLEAN                 PtrType\r
+  )\r

 {\r
 {\r

-  PCD_DATABASE *Database;\r
-  PCD_INDEX    *PcdIndex;\r
-  \r
-  Database = GetPcdDxeDataBaseInstance ();\r
+  UINT32              *LocalTokenNumberTable;\r
+  BOOLEAN             IsPeiDb;\r

 \r
 \r

-  PcdIndex = FindPcdIndex (TokenNumber, Guid, &Database->Info, NULL);\r

 \r
 \r

-  if (PcdIndex == NULL) {\r
-    return EFI_NOT_FOUND;\r
-  }\r
+  ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r

 \r
 \r

-  if (Register) {\r
-    InsertToCallbackList (TokenNumber, Guid, CallBackFunction);\r
-    return EFI_SUCCESS;\r
+  if (PtrType) {\r
+    ASSERT (Size <= DxePcdGetSize (TokenNumber));\r

   } else {\r
   } else {\r

-    return RemoveFromCallbackList (TokenNumber, Guid, CallBackFunction); \r
+    ASSERT (Size == DxePcdGetSize (TokenNumber));\r

   }\r
   }\r

+  \r
+  IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r

 \r
 \r

- }\r
-\r
+  LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
+                                     mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r

 \r
 \r

+  InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);\r

 \r
 \r

-EFI_STATUS\r
-DxeSetSku (\r
-  UINTN Id\r
-)\r
-{\r
-  PCD_DATABASE * Database;\r
+  TokenNumber = IsPeiDb ? TokenNumber\r
+                        : TokenNumber - PEI_LOCAL_TOKEN_NUMBER;\r
+  \r
+  return SetWorkerByLocalTokenNumber (LocalTokenNumberTable[TokenNumber], Data, Size, PtrType, IsPeiDb);\r

 \r
 \r

-  Database = GetPcdDxeDataBaseInstance ();\r
+}\r

 \r
 \r

-  return Database->Info.SkuId = Id;\r

 \r
 \r

-}\r

 \r
 \r
 \r
 \r
 \r
 \r

-EFI_STATUS\r
-DxeGetNextTokenWorker (\r
-  IN OUT UINTN            *TokenNumber,\r
-  IN CONST GUID           *Guid     OPTIONAL\r
-  )\r
+VOID *\r
+ExGetWorker (\r
+  IN CONST EFI_GUID         *Guid,\r
+  IN UINTN                  ExTokenNumber,\r
+  IN UINTN                  GetSize\r
+  ) \r

 {\r
 {\r

-  PCD_DATABASE * Database;\r
+  EX_PCD_ENTRY_ATTRIBUTE Attr;\r
+\r
+  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r

 \r
 \r

-  Database = GetPcdDxeDataBaseInstance ();\r
+  ASSERT ((GetSize == Attr.Size) || (GetSize == 0));\r

 \r
 \r

-  return GetNextTokenWorker (&Database->Info,\r
-                             TokenNumber,\r
-                             Guid\r
-                             );\r
+  return GetWorkerByLocalTokenNumber (Attr.LocalTokenNumberAlias,\r
+                                                Attr.IsPeiDb,\r
+                                                Attr.Size\r
+                                                );\r

 }\r
 \r
 \r
 \r
 }\r
 \r
 \r
 \r

-VOID\r
-InitPcdDxeDataBase (\r
-  VOID\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                   SetSize,\r
+  BOOLEAN                 PtrType\r
+  )\r

 {\r
 {\r

-  PCD_DATABASE        *PeiDatabase;\r
-  PCD_DATABASE        *DxeDatabase;\r
-  EFI_HOB_GUID_TYPE   *GuidHob;\r
+  EX_PCD_ENTRY_ATTRIBUTE Attr;\r

 \r
 \r

-  GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
-  ASSERT (GuidHob != NULL);\r
+  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r

 \r
 \r

-  PeiDatabase = (PCD_DATABASE *) GET_GUID_HOB_DATA (GuidHob);\r
+  ASSERT (!PtrType && (SetSize == Attr.Size));\r

 \r
 \r

-  DxeDatabase = AllocateCopyPool (PeiDatabase->Info.DatabaseLen, PeiDatabase);\r
+  ASSERT (PtrType && (SetSize <= Attr.Size));\r

 \r
 \r

-  ASSERT (DxeDatabase != NULL);\r
+  InvokeCallbackOnSet (ExTokenNumber, Guid, Attr.TokenNumber, Data, Attr.Size);\r

 \r
 \r

-  SetPcdDxeDataBaseInstance (DxeDatabase);\r
+  SetWorkerByLocalTokenNumber (Attr.LocalTokenNumberAlias, Data, Attr.Size, PtrType, Attr.IsPeiDb);\r

 \r
 \r

-  return;\r
+  return EFI_SUCCESS;\r
+  \r

 }\r
 \r
 \r
 \r
 }\r
 \r
 \r
 \r

+\r

 EFI_STATUS\r
 EFI_STATUS\r

-GetHiiVariable (\r
-  IN  EFI_GUID      *VariableGuid,\r
-  IN  UINT16        *VariableName,\r
-  OUT VOID          ** VariableData,\r
-  OUT UINTN         *VariableSize\r
+SetWorkerByLocalTokenNumber (\r
+  UINT32        LocalTokenNumber,\r
+  VOID          *Data,\r
+  UINTN         Size,\r
+  BOOLEAN       PtrType,\r
+  BOOLEAN       IsPeiDb\r

   )\r
 {\r
   )\r
 {\r

-  UINTN      Size;\r
-  EFI_STATUS Status;\r
-  VOID       *Buffer;\r
+  EFI_GUID            *GuidTable;\r
+  UINT16              *StringTable;\r
+  EFI_GUID            *Guid;\r
+  UINT16              *Name;\r
+  VOID                *InternalData;\r
+  VARIABLE_HEAD       *VariableHead;\r
+  UINTN               Offset;\r
+  UINT8               *PcdDb;\r
+\r
+\r
+  if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
+    LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size, IsPeiDb);\r
+  }\r

 \r
 \r

-  Status = EfiGetVariable (\r
-    (UINT16 *)VariableName,\r
-    VariableGuid,\r
-    NULL,\r
-    &Size,\r
-    NULL\r
-    );\r
-  ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
+  Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r

 \r
 \r

-  Buffer = AllocatePool (Size);\r
+  PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r

 \r
 \r

-  ASSERT (Buffer != NULL);\r
+  StringTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
+                          mPcdDatabase->DxeDb.Init.StringTable;\r
+  \r
+  InternalData = PcdDb + Offset;\r

 \r
 \r

-  Status = EfiGetVariable (\r
-    VariableName,\r
-    VariableGuid,\r
-    NULL,\r
-    &Size,\r
-    Buffer\r
-    );\r
+  switch (LocalTokenNumber & ~PCD_DATABASE_OFFSET_MASK) {\r
+    case PCD_TYPE_VPD:\r
+      ASSERT (FALSE);\r
+      return EFI_INVALID_PARAMETER;\r
+    \r
+    case PCD_TYPE_STRING:\r
+      CopyMem (&StringTable[*((UINT16 *)InternalData)], Data, Size);\r
+      break;\r

 \r
 \r

-  return Status;\r
+    case PCD_TYPE_HII:\r
+      //\r
+      // Bug Bug: Please implement this\r
+      //\r
+      GuidTable   = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
+                              mPcdDatabase->DxeDb.Init.GuidTable;\r
+                              \r
+      VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
+      \r
+      Guid = &(GuidTable[VariableHead->GuidTableIndex]);\r
+      Name = &(StringTable[VariableHead->StringIndex]);\r
+\r
+      return EFI_SUCCESS;\r
+\r
+    case PCD_TYPE_DATA:\r
+      if (PtrType) {\r
+        CopyMem (InternalData, Data, Size);\r
+        return EFI_SUCCESS;\r
+      }\r

 \r
 \r

+      switch (Size) {\r
+        case sizeof(UINT8):\r
+          *((UINT8 *) InternalData) = *((UINT8 *) Data);\r
+          return EFI_SUCCESS;\r
+\r
+        case sizeof(UINT16):\r
+          *((UINT16 *) InternalData) = *((UINT16 *) Data);\r
+          return EFI_SUCCESS;\r
+\r
+        case sizeof(UINT32):\r
+          *((UINT32 *) InternalData) = *((UINT32 *) Data);\r
+          return EFI_SUCCESS;\r
+\r
+        case sizeof(UINT64):\r
+          *((UINT64 *) InternalData) = *((UINT64 *) Data);\r
+          return EFI_SUCCESS;\r
+\r
+        default:\r
+          ASSERT (FALSE);\r
+          return EFI_NOT_FOUND;\r
+      }\r
+\r
+    default:\r
+      ASSERT (FALSE);\r
+      break;\r
+    }\r
+      \r
+  ASSERT (FALSE);\r
+  return EFI_NOT_FOUND;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -448,16 +634,17 @@ SetHiiVariable (
   IN  UINTN        Offset\r
   )\r
 {\r
   IN  UINTN        Offset\r
   )\r
 {\r

-  UINTN Size;\r
-  VOID  *Buffer;\r
-  EFI_STATUS Status;\r
+  UINTN       Size;\r
+  VOID        *Buffer;\r
+  EFI_STATUS  Status;\r
+  UINT32      Attribute;\r

 \r
   Size = 0;\r
 \r
   Status = EfiGetVariable (\r
     (UINT16 *)VariableName,\r
     VariableGuid,\r
 \r
   Size = 0;\r
 \r
   Status = EfiGetVariable (\r
     (UINT16 *)VariableName,\r
     VariableGuid,\r

-    NULL,\r
+    &Attribute,\r

     &Size,\r
     NULL\r
     );\r
     &Size,\r
     NULL\r
     );\r


@@ -471,7 +658,7 @@ SetHiiVariable (
   Status = EfiGetVariable (\r
     VariableName,\r
     VariableGuid,\r
   Status = EfiGetVariable (\r
     VariableName,\r
     VariableGuid,\r

-    NULL,\r
+    &Attribute,\r

     &Size,\r
     Buffer\r
     );\r
     &Size,\r
     Buffer\r
     );\r


@@ -482,10 +669,67 @@ SetHiiVariable (
   return EfiSetVariable (\r
     VariableName,\r
     VariableGuid,\r
   return EfiSetVariable (\r
     VariableName,\r
     VariableGuid,\r

-    0,\r
+    Attribute,\r

     Size,\r
     Buffer\r
     );\r
 \r
 }\r
 \r
     Size,\r
     Buffer\r
     );\r
 \r
 }\r
 \r

+\r
+\r
+\r
+\r
+VOID\r
+GetExPcdTokenAttributes (\r
+  IN CONST EFI_GUID             *Guid,\r
+  IN PCD_TOKEN_NUMBER           ExTokenNumber,\r
+  OUT EX_PCD_ENTRY_ATTRIBUTE    *ExAttr\r
+  )\r
+{\r
+  UINT32              i;\r
+  DYNAMICEX_MAPPING   *ExMap;\r
+  EFI_GUID            *GuidTable;\r
+  UINT16              *SizeTable;\r
+\r
+  ExMap       = mPcdDatabase->PeiDb.Init.ExMapTable;\r
+  GuidTable   = mPcdDatabase->PeiDb.Init.GuidTable;\r
+  SizeTable   = mPcdDatabase->PeiDb.Init.SizeTable;\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
+      ) {\r
+\r
+        ExAttr->IsPeiDb               = TRUE;\r
+        ExAttr->Size                  = SizeTable[i + PEI_NEX_TOKEN_NUMBER];\r
+        ExAttr->TokenNumber           = i + PEI_NEX_TOKEN_NUMBER;\r
+        ExAttr->LocalTokenNumberAlias = ExMap[i].LocalTokenNumber;\r
+        return;\r
+\r
+    }\r
+  }\r
+  \r
+  ExMap       = mPcdDatabase->DxeDb.Init.ExMapTable;\r
+  GuidTable   = mPcdDatabase->DxeDb.Init.GuidTable;\r
+  SizeTable   = mPcdDatabase->DxeDb.Init.SizeTable;\r
+  \r
+  for (i = 0; i < DXE_EXMAPPING_TABLE_SIZE; i++) {\r
+    if ((ExTokenNumber == ExMap[i].ExTokenNumber) &&\r
+         CompareGuid (Guid, (CONST EFI_GUID *) &GuidTable[ExMap[i].ExGuidIndex])\r
+      ) {\r
+\r
+        ExAttr->IsPeiDb               = FALSE;\r
+        ExAttr->Size                  = SizeTable[i + DXE_NEX_TOKEN_NUMBER];\r
+        ExAttr->TokenNumber           = i + PEI_LOCAL_TOKEN_NUMBER;\r
+        ExAttr->LocalTokenNumberAlias = ExMap[i].LocalTokenNumber;\r
+        return;\r
+\r
+    }\r
+  }\r
+\r
+  ASSERT (FALSE);\r
+\r
+  return;\r
+}\r
+\r