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

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

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.c b/EdkModulePkg/Universal/PCD/Pei/Service.c
index 62e2f9c1140b5ae039fe3ceb8a014aff177edd62..011e3aa36ef4d9133988355ec18771184b2f4001 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.c
@@ -30,7 +30,7 @@ Module Name: Service.c
 --*/\r
 EFI_STATUS\r
 PeiRegisterCallBackWorker (\r
-  IN  PCD_TOKEN_NUMBER            ExTokenNumber,\r
+  IN  UINTN                       ExTokenNumber,\r
   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction,\r
   IN  BOOLEAN                     Register\r
@@ -41,17 +41,32 @@ PeiRegisterCallBackWorker (
   PCD_PPI_CALLBACK        Compare;\r
   PCD_PPI_CALLBACK        Assign;\r
   UINT32                  LocalTokenNumber;\r
-  PCD_TOKEN_NUMBER        TokenNumber;\r
+  UINTN                   TokenNumber;\r
   UINTN                   Idx;\r
 \r
   if (Guid == NULL) {\r
     TokenNumber = ExTokenNumber;\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
     ASSERT (TokenNumber < PEI_NEX_TOKEN_NUMBER);\r
   } else {\r
     TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\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
     ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
   }\r
 \r
+\r
   LocalTokenNumber = GetPcdDatabase()->Init.LocalTokenNumberTable[TokenNumber];\r
 \r
   ASSERT ((LocalTokenNumber & PCD_TYPE_HII) == 0);\r
@@ -144,11 +159,10 @@ GetHiiVariable (
   VOID       *Buffer;\r
   EFI_PEI_READ_ONLY_VARIABLE_PPI *VariablePpi;\r
 \r
-  Status = PeiCoreLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi);\r
+  Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Size = 0;\r
-\r
   Status = VariablePpi->PeiGetVariable (\r
                           GetPeiServicesTablePointer (),\r
                           VariableName,\r
@@ -157,25 +171,30 @@ GetHiiVariable (
                           &Size,\r
                           NULL\r
                             );\r
-  ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
+  if (Status == EFI_BUFFER_TOO_SMALL) {\r
 \r
-  Status = PeiCoreAllocatePool (Size, &Buffer);\r
-  ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = VariablePpi->PeiGetVariable (\r
-                            GetPeiServicesTablePointer (),\r
-                            (UINT16 *) VariableName,\r
-                            (EFI_GUID *) VariableGuid,\r
-                            NULL,\r
-                            &Size,\r
-                            Buffer\r
-                            );\r
-  ASSERT_EFI_ERROR (Status);\r
+    Status = PeiServicesAllocatePool (Size, &Buffer);\r
+    ASSERT_EFI_ERROR (Status);\r
 \r
-  *VariableSize = Size;\r
-  *VariableData = Buffer;\r
+    Status = VariablePpi->PeiGetVariable (\r
+                              GetPeiServicesTablePointer (),\r
+                              (UINT16 *) VariableName,\r
+                              (EFI_GUID *) VariableGuid,\r
+                              NULL,\r
+                              &Size,\r
+                              Buffer\r
+                              );\r
+    ASSERT_EFI_ERROR (Status);\r
+\r
+    *VariableSize = Size;\r
+    *VariableData = Buffer;\r
+\r
+    return EFI_SUCCESS;\r
+  } else {\r
+    return EFI_NOT_FOUND;\r
+  }\r
 \r
-  return EFI_SUCCESS;\r
 }\r
 \r
 \r
@@ -244,6 +263,13 @@ InvokeCallbackOnSet (
   PCD_PPI_CALLBACK    *CallbackTable;\r
   UINTN               Idx;\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
   if (Guid == NULL)\r
     ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
 \r
@@ -271,7 +297,7 @@ InvokeCallbackOnSet (
 \r
 EFI_STATUS\r
 SetWorker (\r
-  PCD_TOKEN_NUMBER    TokenNumber,\r
+  UINTN               TokenNumber,\r
   VOID                *Data,\r
   UINTN               Size,\r
   BOOLEAN             PtrType\r
@@ -283,6 +309,13 @@ SetWorker (
   UINTN               Offset;\r
   VOID                *InternalData;\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 < PEI_LOCAL_TOKEN_NUMBER);\r
     \r
   PeiPcdDb = GetPcdDatabase ();\r
@@ -301,7 +334,7 @@ SetWorker (
   // type PCD entry in ExSetWorker.\r
   //\r
   if (TokenNumber < PEI_NEX_TOKEN_NUMBER) {\r
-    InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);\r
+    InvokeCallbackOnSet (0, NULL, TokenNumber + 1, Data, Size);\r
   }\r
 \r
   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
@@ -322,7 +355,7 @@ SetWorker (
     case PCD_TYPE_STRING:\r
       StringTableIdx = *((UINT16 *)InternalData);\r
       CopyMem (&PeiPcdDb->Init.StringTable[StringTableIdx], Data, Size);\r
-      break;\r
+      return EFI_SUCCESS;\r
 \r
     case PCD_TYPE_DATA:\r
     {\r
@@ -367,14 +400,14 @@ SetWorker (
 \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                   Size,\r
   BOOLEAN                 PtrType\r
   )\r
 {\r
-  PCD_TOKEN_NUMBER          TokenNumber;\r
+  UINTN                     TokenNumber;\r
 \r
   TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
 \r
@@ -392,7 +425,7 @@ ExSetWorker (
 VOID *\r
 ExGetWorker (\r
   IN CONST  EFI_GUID  *Guid,\r
-  IN PCD_TOKEN_NUMBER ExTokenNumber,\r
+  IN UINTN            ExTokenNumber,\r
   IN UINTN            GetSize\r
   )\r
 {\r
@@ -404,7 +437,7 @@ ExGetWorker (
 \r
 VOID *\r
 GetWorker (\r
-  PCD_TOKEN_NUMBER    TokenNumber,\r
+  UINTN               TokenNumber,\r
   UINTN               GetSize\r
   )\r
 {\r
@@ -421,9 +454,16 @@ GetWorker (
   UINT32              LocalTokenNumber;\r
   UINTN               Size;\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 < PEI_LOCAL_TOKEN_NUMBER);\r
 \r
-  Size = PeiPcdGetSize(TokenNumber);\r
+  Size = PeiPcdGetSize(TokenNumber + 1);\r
   \r
   ASSERT (GetSize == Size || GetSize == 0);\r
 \r
@@ -454,15 +494,20 @@ GetWorker (
       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 (VOID *) ((UINT8 *) Data + VariableHead->Offset);\r
+      if (Status == EFI_SUCCESS) {\r
+        ASSERT (DataSize >= (UINTN) (VariableHead->Offset + Size));\r
+        return (VOID *) ((UINT8 *) Data + VariableHead->Offset);\r
+      } else {\r
+        //\r
+        // Return the default value specified by Platform Integrator \r
+        //\r
+        return (VOID *) ((UINT8 *) PeiPcdDb + VariableHead->DefaultValueOffset);\r
+      }\r
     }\r
 \r
     case PCD_TYPE_DATA:\r
       return (VOID *) ((UINT8 *)PeiPcdDb + Offset);\r
-      break;\r
 \r
     case PCD_TYPE_STRING:\r
       StringTableIdx = (UINT16) *((UINT8 *) PeiPcdDb + Offset);\r
@@ -481,7 +526,7 @@ GetWorker (
 }\r
 \r
 \r
-PCD_TOKEN_NUMBER\r
+UINTN           \r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINT32                     ExTokenNumber\r
@@ -500,6 +545,10 @@ GetExPcdTokenNumber (
   GuidTable   = PeiPcdDb->Init.GuidTable;\r
 \r
   MatchGuid = ScanGuid (GuidTable, sizeof(PeiPcdDb->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