Add PcdDxe and PcdPEIM to all-arch for EdkModulePkg-All-Archs.fpd

[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 36e859c779d15e114ca1303ae507971615230b47..717a4345ea11df329815b0a25ce96f28163e7a92 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -50,10 +50,16 @@ GetWorker (
   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
@@ -100,11 +106,10 @@ GetWorker (
         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
+        // 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
@@ -143,6 +148,13 @@ DxeRegisterCallBackWorker (
     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
@@ -186,6 +198,13 @@ DxeUnRegisterCallBackWorker (
     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
@@ -244,7 +263,7 @@ ExGetNextTokeNumber (
     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
@@ -342,13 +361,17 @@ GetHiiVariable (
   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
+  \r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
 \r
     Buffer = AllocatePool (Size);\r
@@ -366,6 +389,9 @@ GetHiiVariable (
     ASSERT (Status == EFI_SUCCESS);\r
   }\r
 \r
+  *VariableData = Buffer;\r
+  *VariableSize = Size;\r
+\r
   return Status;\r
 \r
 }\r
@@ -444,6 +470,13 @@ InvokeCallbackOnSet (
   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
@@ -485,13 +518,19 @@ SetWorker (
   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
@@ -501,7 +540,7 @@ SetWorker (
 \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
@@ -703,19 +742,23 @@ GetExPcdTokenNumber (
   EFI_GUID            *MatchGuid;\r
   UINTN               MatchGuidIdx;\r
 \r
-  ExMap       = mPcdDatabase->PeiDb.Init.ExMapTable;\r
-  GuidTable   = mPcdDatabase->PeiDb.Init.GuidTable;\r
-  \r
-  MatchGuid   = ScanGuid (GuidTable, sizeof(mPcdDatabase->PeiDb.Init.GuidTable), Guid);\r
-  ASSERT (MatchGuid != NULL);\r
+  if (!PEI_DATABASE_EMPTY) {\r
+    ExMap       = mPcdDatabase->PeiDb.Init.ExMapTable;\r
+    GuidTable   = mPcdDatabase->PeiDb.Init.GuidTable;\r
+    \r
+    MatchGuid   = ScanGuid (GuidTable, sizeof(mPcdDatabase->PeiDb.Init.GuidTable), Guid);\r
+    \r
+    if (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
-        (MatchGuidIdx == ExMap[i].ExGuidIndex)) {\r
-        return ExMap[i].LocalTokenNumber;\r
+      MatchGuidIdx = MatchGuid - GuidTable;\r
+      \r
+      for (i = 0; i < PEI_EXMAPPING_TABLE_SIZE; i++) {\r
+        if ((ExTokenNumber == ExMap[i].ExTokenNumber) &&\r
+            (MatchGuidIdx == ExMap[i].ExGuidIndex)) {\r
+            return ExMap[i].LocalTokenNumber;\r
 \r
+        }\r
+      }\r
     }\r
   }\r
   \r
@@ -723,6 +766,10 @@ GetExPcdTokenNumber (
   GuidTable   = mPcdDatabase->DxeDb.Init.GuidTable;\r
 \r
   MatchGuid   = ScanGuid (GuidTable, sizeof(mPcdDatabase->DxeDb.Init.GuidTable), Guid);\r
+  //\r
+  // We need to ASSERT here. If GUID can't be found in GuidTable, this is a\r
+  // error in the BUILD system.\r
+  //\r
   ASSERT (MatchGuid != NULL);\r
 \r
   MatchGuidIdx = MatchGuid - GuidTable;\r
@@ -730,7 +777,7 @@ GetExPcdTokenNumber (
   for (i = 0; i < DXE_EXMAPPING_TABLE_SIZE; i++) {\r
     if ((ExTokenNumber == ExMap[i].ExTokenNumber) &&\r
          (MatchGuidIdx == ExMap[i].ExGuidIndex)) {\r
-        return ExMap[i].LocalTokenNumber + PEI_LOCAL_TOKEN_NUMBER;\r
+        return ExMap[i].LocalTokenNumber;\r
     }\r
   }\r
 \r