Fix GCC build issue

[mirror_edk2.git] / MdePkg / Library / PeiPcdLib / PeiPcdLib.c

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index 57fa8211562240f0d2c63a8bd2bb60be1ca1173c..f241227fb32eb8fbb8b2bce0b6e5850aa68a5f69 100644 (file)
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -258,6 +258,8 @@ LibPcdGetEx8 (
 {\r
   PCD_PPI * PcdPpi;\r
 \r
+  ASSERT (Guid != NULL);\r
+\r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
   return PcdPpi->Get8Ex (Guid, TokenNumber);\r
@@ -285,6 +287,8 @@ LibPcdGetEx16 (
 {\r
   PCD_PPI * PcdPpi;\r
 \r
+  ASSERT (Guid != NULL);\r
+\r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
   return PcdPpi->Get16Ex (Guid, TokenNumber);\r
@@ -312,6 +316,8 @@ LibPcdGetEx32 (
 {\r
   PCD_PPI * PcdPpi;\r
 \r
+  ASSERT (Guid != NULL);\r
+\r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
   return PcdPpi->Get32Ex (Guid, TokenNumber);\r
@@ -340,6 +346,8 @@ LibPcdGetEx64 (
 {\r
   PCD_PPI * PcdPpi;\r
 \r
+  ASSERT (Guid != NULL);\r
+\r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
   return PcdPpi->Get64Ex (Guid, TokenNumber);\r
@@ -367,6 +375,8 @@ LibPcdGetExPtr (
 {\r
   PCD_PPI * PcdPpi;\r
 \r
+  ASSERT (Guid != NULL);\r
+\r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
   return PcdPpi->GetPtrEx (Guid, TokenNumber);\r
@@ -394,6 +404,8 @@ LibPcdGetExBool (
 {\r
   PCD_PPI * PcdPpi;\r
 \r
+  ASSERT (Guid != NULL);\r
+\r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
   return PcdPpi->GetBoolEx (Guid, TokenNumber);\r
@@ -421,6 +433,8 @@ LibPcdGetExSize (
 {\r
   PCD_PPI * PcdPpi;\r
 \r
+  ASSERT (Guid != NULL);\r
+\r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
   return PcdPpi->GetSizeEx (Guid, TokenNumber);\r
@@ -450,7 +464,6 @@ LibPcdSet8 (
 \r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
-\r
   Status = PcdPpi->Set8 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
@@ -482,7 +495,6 @@ LibPcdSet16 (
 \r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
-\r
   Status = PcdPpi->Set16 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
@@ -545,7 +557,6 @@ LibPcdSet64 (
 \r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
-\r
   Status = PcdPpi->Set64 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
@@ -586,7 +597,6 @@ LibPcdSetPtr (
 {\r
   EFI_STATUS Status;\r
   PCD_PPI    *PcdPpi;\r
-  UINTN      Size;\r
 \r
   ASSERT (SizeOfBuffer != NULL);\r
 \r
@@ -596,17 +606,12 @@ LibPcdSetPtr (
 \r
   PcdPpi = GetPcdPpiPtr ();\r
   \r
-  Size = LibPcdGetSize (TokenNumber);\r
-  \r
-  if (*SizeOfBuffer > Size) {\r
-    *SizeOfBuffer = Size;\r
+  Status = PcdPpi->SetPtr (TokenNumber, SizeOfBuffer, Buffer);\r
+\r
+  if (EFI_ERROR (Status)) {\r
     return NULL;\r
   }\r
 \r
-  Status = PcdPpi->SetPtr (TokenNumber, *SizeOfBuffer, Buffer);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
   return Buffer;\r
 }\r
 \r
@@ -634,7 +639,6 @@ LibPcdSetBool (
 \r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
-\r
   Status = PcdPpi->SetBool (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
@@ -670,6 +674,7 @@ LibPcdSetEx8 (
 \r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
+  ASSERT (Guid != NULL);\r
 \r
   Status = PcdPpi->Set8Ex (Guid, TokenNumber, Value);\r
 \r
@@ -706,7 +711,7 @@ LibPcdSetEx16 (
 \r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
-\r
+  ASSERT (Guid != NULL);\r
   Status = PcdPpi->Set16Ex (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
@@ -739,7 +744,7 @@ LibPcdSetEx32 (
 {\r
   EFI_STATUS Status;\r
   PCD_PPI * PcdPpi;\r
-\r
+  ASSERT (Guid != NULL);\r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
 \r
@@ -775,7 +780,7 @@ LibPcdSetEx64 (
 {\r
   EFI_STATUS Status;\r
   PCD_PPI * PcdPpi;\r
-\r
+  ASSERT (Guid != NULL);\r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
 \r
@@ -817,24 +822,19 @@ LibPcdSetExPtr (
 {\r
   EFI_STATUS      Status;\r
   PCD_PPI         *PcdPpi;\r
-  UINTN           Size;\r
-\r
+ ASSERT (SizeOfBuffer != NULL);\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
-\r
+  ASSERT (Guid != NULL);\r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
-  Size = LibPcdGetExSize (Guid, TokenNumber);\r
-  if (*SizeOfBuffer > Size) {\r
-    *SizeOfBuffer = Size;\r
+  Status = PcdPpi->SetPtrEx (Guid, TokenNumber, SizeOfBuffer, Buffer);\r
+\r
+  if (EFI_ERROR (Status)) {\r
     return NULL;\r
   }\r
 \r
-  Status = PcdPpi->SetPtrEx (Guid, TokenNumber, *SizeOfBuffer, Buffer);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
   return Buffer;\r
 }\r
 \r
@@ -866,7 +866,7 @@ LibPcdSetExBool (
 \r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
-\r
+  ASSERT (Guid != NULL);\r
   Status = PcdPpi->SetBoolEx (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
@@ -906,7 +906,7 @@ LibPcdCallbackOnSet (
   PcdPpi = GetPcdPpiPtr ();\r
 \r
 \r
-  Status = PcdPpi->CallbackOnSet (TokenNumber, Guid, NotificationFunction);\r
+  Status = PcdPpi->CallbackOnSet (Guid, TokenNumber, NotificationFunction);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -940,7 +940,7 @@ LibPcdCancelCallback (
   PcdPpi = GetPcdPpiPtr ();\r
 \r
 \r
-  Status = PcdPpi->CancelCallback (TokenNumber, Guid, NotificationFunction);\r
+  Status = PcdPpi->CancelCallback (Guid, TokenNumber, NotificationFunction);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -1022,3 +1022,52 @@ LibPcdGetNextTokenSpace (
   return (GUID *)Guid;\r
 }\r
 \r
+\r
+\r
+/**\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
+  and SizeOfValue.  Buffer is returned.  If SizeOfValue is greater than \r
+  MaximumDatumSize, then set SizeOfValue to MaximumDatumSize and return \r
+  NULL to indicate that the set operation was not actually performed.  \r
+  If SizeOfValue is set to MAX_ADDRESS, then SizeOfValue must be set to \r
+  MaximumDatumSize and NULL must be returned.\r
+  \r
+  If PatchVariable is NULL, then ASSERT().\r
+  If SizeOfValue is NULL, then ASSERT().\r
+  If SizeOfValue > 0 and Buffer is NULL, then ASSERT().\r
+\r
+  @param[in] PatchVariable      A pointer to the global variable in a module that is \r
+                                the target of the set operation.\r
+  @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
+  @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
+  @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
+\r
+**/\r
+VOID *\r
+EFIAPI\r
+LibPatchPcdSetPtr (\r
+  IN        VOID        *PatchVariable,\r
+  IN        UINTN       MaximumDatumSize,\r
+  IN OUT    UINTN       *SizeOfBuffer,\r
+  IN CONST  VOID        *Buffer\r
+  )\r
+{\r
+  ASSERT (PatchVariable != NULL);\r
+  ASSERT (SizeOfBuffer  != NULL);\r
+  \r
+  if (*SizeOfBuffer > 0) {\r
+    ASSERT (Buffer != NULL);\r
+  }\r
+\r
+  if ((*SizeOfBuffer > MaximumDatumSize) ||\r
+      (*SizeOfBuffer == MAX_ADDRESS)) {\r
+    *SizeOfBuffer = MaximumDatumSize;\r
+    return NULL;\r
+  }\r
+    \r
+  CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
+  \r
+  return (VOID *) Buffer;\r
+}\r
+\r
+\r