Sync up Pcd Library Instances and PCD Driver/PEIM with Pcd spec 0.51 and Mde 0.51

[mirror_edk2.git] / MdePkg / Library / BasePcdLibNull / PcdLib.c

diff --git a/MdePkg/Library/BasePcdLibNull/PcdLib.c b/MdePkg/Library/BasePcdLibNull/PcdLib.c
index 6c01017024b84103760450c084f1e8b21ef5c252..7b8dc50d5c58e04d5cd08b50ac87394bf943c9b7 100644 (file)
--- a/MdePkg/Library/BasePcdLibNull/PcdLib.c
+++ b/MdePkg/Library/BasePcdLibNull/PcdLib.c
@@ -22,13 +22,13 @@
   @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and \r
               set values associated with a PCD token.\r
 \r
-  @retval UINTN Return the SKU ID that just be set.\r
+  @retval SKU_ID Return the SKU ID that just be set.\r
 \r
 **/\r
-UINTN\r
+SKU_ID\r
 EFIAPI\r
 LibPcdSetSku (\r
-  IN UINTN  SkuId\r
+  IN SKU_ID  SkuId\r
   )\r
 {\r
   return SkuId;\r
@@ -47,7 +47,7 @@ LibPcdSetSku (
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -66,7 +66,7 @@ LibPcdGet8 (
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -85,7 +85,7 @@ LibPcdGet16 (
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -104,7 +104,7 @@ LibPcdGet32 (
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -123,7 +123,7 @@ LibPcdGet64 (
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -142,7 +142,7 @@ LibPcdGetPtr (
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -161,7 +161,7 @@ LibPcdGetBool (
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -184,7 +184,7 @@ UINT8
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -209,7 +209,7 @@ UINT16
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -234,7 +234,7 @@ UINT32
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -259,7 +259,7 @@ UINT64
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -284,7 +284,7 @@ VOID *
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -309,7 +309,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -334,7 +334,7 @@ UINTN
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -357,7 +357,7 @@ LibPcdGetExSize (
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   )\r
 {\r
@@ -379,7 +379,7 @@ LibPcdSet8 (
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT16            Value\r
   )\r
 {\r
@@ -401,7 +401,7 @@ LibPcdSet16 (
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT32             Value\r
   )\r
 {\r
@@ -423,7 +423,7 @@ LibPcdSet32 (
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT64             Value\r
   )\r
 {\r
@@ -446,15 +446,14 @@ LibPcdSet64 (
 VOID *\r
 EFIAPI\r
 LibPcdSetPtr (\r
-  IN UINTN             TokenNumber,\r
-  IN CONST VOID        *Value\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             SizeOfBuffer,\r
+  IN VOID              *Buffer\r
   )\r
 {\r
-  ASSERT (Value != NULL);\r
-  //\r
-  // Remove the CONST\r
-  //\r
-  return (VOID *)Value;\r
+  ASSERT (Buffer != NULL);\r
+\r
+  return Buffer;\r
 }\r
 \r
 \r
@@ -472,7 +471,7 @@ LibPcdSetPtr (
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
 {\r
@@ -498,7 +497,7 @@ UINT8
 EFIAPI\r
 LibPcdSetEx8 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   )\r
 {\r
@@ -526,7 +525,7 @@ UINT16
 EFIAPI\r
 LibPcdSetEx16 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT16            Value\r
   )\r
 {\r
@@ -554,7 +553,7 @@ UINT32
 EFIAPI\r
 LibPcdSetEx32 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT32            Value\r
   )\r
 {\r
@@ -582,7 +581,7 @@ UINT64
 EFIAPI\r
 LibPcdSetEx64 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64            Value\r
   )\r
 {\r
@@ -611,17 +610,15 @@ VOID *
 EFIAPI\r
 LibPcdSetExPtr (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
-  IN CONST VOID        *Value\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             SizeOfBuffer,\r
+  IN VOID              *Buffer\r
   )\r
 {\r
-  //\r
-  // Remove the CONST\r
-  //\r
   ASSERT (Guid != NULL);\r
-  ASSERT (Value != NULL);\r
+  ASSERT (Buffer != NULL);\r
 \r
-  return (VOID *)Value;\r
+  return Buffer;\r
 }\r
 \r
 \r
@@ -643,7 +640,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdSetExBool (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
 {\r
@@ -674,7 +671,7 @@ VOID
 EFIAPI\r
 LibPcdCallbackOnSet (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
-  IN UINTN                    TokenNumber,\r
+  IN PCD_TOKEN_NUMBER         TokenNumber,\r
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r
@@ -698,7 +695,7 @@ VOID
 EFIAPI\r
 LibPcdCancelCallback (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
-  IN UINTN                    TokenNumber,\r
+  IN PCD_TOKEN_NUMBER         TokenNumber,\r
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r
@@ -720,14 +717,14 @@ LibPcdCancelCallback (
   @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD \r
               token number.\r
 \r
-  @retval UINTN The next valid token number.\r
+  @retval PCD_TOKEN_NUMBER The next valid token number.\r
 \r
 **/\r
-UINTN\r
+PCD_TOKEN_NUMBER\r
 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID             *Guid, OPTIONAL\r
-  IN OUT UINTN              *TokenNumber\r
+  IN OUT PCD_TOKEN_NUMBER   TokenNumber\r
   )\r
 {\r
   return 0;\r