Explain how to build for other architectures.

[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..01fe0151bf302591e9f5135c643a5ae7adbc261b 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,7 +41,7 @@ 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
@@ -144,11 +144,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 +156,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
@@ -271,7 +275,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
@@ -322,7 +326,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 +371,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 +396,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 +408,7 @@ ExGetWorker (
 \r
 VOID *\r
 GetWorker (\r
-  PCD_TOKEN_NUMBER    TokenNumber,\r
+  UINTN               TokenNumber,\r
   UINTN               GetSize\r
   )\r
 {\r
@@ -454,10 +458,17 @@ 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
+        // 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
     }\r
 \r
     case PCD_TYPE_DATA:\r
@@ -481,7 +492,7 @@ GetWorker (
 }\r
 \r
 \r
-PCD_TOKEN_NUMBER\r
+UINTN           \r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINT32                     ExTokenNumber\r