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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@285 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 43 insertions, 46 deletions

diff --git a/MdePkg/Library/BasePcdLibNull/PcdLib.c b/MdePkg/Library/BasePcdLibNull/PcdLib.c
index 6c01017024..7b8dc50d5c 100644
--- 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 

               set values associated with a PCD token.

 

-  @retval UINTN Return the SKU ID that just be set.

+  @retval SKU_ID Return the SKU ID that just be set.

 

 **/

-UINTN

+SKU_ID

 EFIAPI

 LibPcdSetSku (

-  IN UINTN  SkuId

+  IN SKU_ID  SkuId

   )

 {

   return SkuId;

@@ -47,7 +47,7 @@ LibPcdSetSku (
 UINT8

 EFIAPI

 LibPcdGet8 (

-  IN UINTN  TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   return 0;

@@ -66,7 +66,7 @@ LibPcdGet8 (
 UINT16

 EFIAPI

 LibPcdGet16 (

-  IN UINTN  TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   return 0;

@@ -85,7 +85,7 @@ LibPcdGet16 (
 UINT32

 EFIAPI

 LibPcdGet32 (

-  IN UINTN  TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   return 0;

@@ -104,7 +104,7 @@ LibPcdGet32 (
 UINT64

 EFIAPI

 LibPcdGet64 (

-  IN UINTN  TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   return 0;

@@ -123,7 +123,7 @@ LibPcdGet64 (
 VOID *

 EFIAPI

 LibPcdGetPtr (

-  IN UINTN  TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   return 0;

@@ -142,7 +142,7 @@ LibPcdGetPtr (
 BOOLEAN 

 EFIAPI

 LibPcdGetBool (

-  IN UINTN  TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   return 0;

@@ -161,7 +161,7 @@ LibPcdGetBool (
 UINTN

 EFIAPI

 LibPcdGetSize (

-  IN UINTN  TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   return 0;

@@ -184,7 +184,7 @@ UINT8
 EFIAPI

 LibPcdGetEx8 (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   ASSERT (Guid != NULL);

@@ -209,7 +209,7 @@ UINT16
 EFIAPI

 LibPcdGetEx16 (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   ASSERT (Guid != NULL);

@@ -234,7 +234,7 @@ UINT32
 EFIAPI

 LibPcdGetEx32 (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   ASSERT (Guid != NULL);

@@ -259,7 +259,7 @@ UINT64
 EFIAPI

 LibPcdGetEx64 (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   ASSERT (Guid != NULL);

@@ -284,7 +284,7 @@ VOID *
 EFIAPI

 LibPcdGetExPtr (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   ASSERT (Guid != NULL);

@@ -309,7 +309,7 @@ BOOLEAN
 EFIAPI

 LibPcdGetExBool (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   ASSERT (Guid != NULL);

@@ -334,7 +334,7 @@ UINTN
 EFIAPI

 LibPcdGetExSize (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber

+  IN PCD_TOKEN_NUMBER  TokenNumber

   )

 {

   ASSERT (Guid != NULL);

@@ -357,7 +357,7 @@ LibPcdGetExSize (
 UINT8

 EFIAPI

 LibPcdSet8 (

-  IN UINTN             TokenNumber,

+  IN PCD_TOKEN_NUMBER  TokenNumber,

   IN UINT8             Value

   )

 {

@@ -379,7 +379,7 @@ LibPcdSet8 (
 UINT16

 EFIAPI

 LibPcdSet16 (

-  IN UINTN             TokenNumber,

+  IN PCD_TOKEN_NUMBER  TokenNumber,

   IN UINT16            Value

   )

 {

@@ -401,7 +401,7 @@ LibPcdSet16 (
 UINT32

 EFIAPI

 LibPcdSet32 (

-  IN UINTN              TokenNumber,

+  IN PCD_TOKEN_NUMBER   TokenNumber,

   IN UINT32             Value

   )

 {

@@ -423,7 +423,7 @@ LibPcdSet32 (
 UINT64

 EFIAPI

 LibPcdSet64 (

-  IN UINTN              TokenNumber,

+  IN PCD_TOKEN_NUMBER   TokenNumber,

   IN UINT64             Value

   )

 {

@@ -446,15 +446,14 @@ LibPcdSet64 (
 VOID *

 EFIAPI

 LibPcdSetPtr (

-  IN UINTN             TokenNumber,

-  IN CONST VOID        *Value

+  IN PCD_TOKEN_NUMBER  TokenNumber,

+  IN UINTN             SizeOfBuffer,

+  IN VOID              *Buffer

   )

 {

-  ASSERT (Value != NULL);

-  //

-  // Remove the CONST

-  //

-  return (VOID *)Value;

+  ASSERT (Buffer != NULL);

+

+  return Buffer;

 }

 

 

@@ -472,7 +471,7 @@ LibPcdSetPtr (
 BOOLEAN

 EFIAPI

 LibPcdSetBool (

-  IN UINTN             TokenNumber,

+  IN PCD_TOKEN_NUMBER  TokenNumber,

   IN BOOLEAN           Value

   )

 {

@@ -498,7 +497,7 @@ UINT8
 EFIAPI

 LibPcdSetEx8 (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber,

+  IN PCD_TOKEN_NUMBER  TokenNumber,

   IN UINT8             Value

   )

 {

@@ -526,7 +525,7 @@ UINT16
 EFIAPI

 LibPcdSetEx16 (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber,

+  IN PCD_TOKEN_NUMBER  TokenNumber,

   IN UINT16            Value

   )

 {

@@ -554,7 +553,7 @@ UINT32
 EFIAPI

 LibPcdSetEx32 (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber,

+  IN PCD_TOKEN_NUMBER  TokenNumber,

   IN UINT32            Value

   )

 {

@@ -582,7 +581,7 @@ UINT64
 EFIAPI

 LibPcdSetEx64 (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber,

+  IN PCD_TOKEN_NUMBER  TokenNumber,

   IN UINT64            Value

   )

 {

@@ -611,17 +610,15 @@ VOID *
 EFIAPI

 LibPcdSetExPtr (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber,

-  IN CONST VOID        *Value

+  IN PCD_TOKEN_NUMBER  TokenNumber,

+  IN UINTN             SizeOfBuffer,

+  IN VOID              *Buffer

   )

 {

-  //

-  // Remove the CONST

-  //

   ASSERT (Guid != NULL);

-  ASSERT (Value != NULL);

+  ASSERT (Buffer != NULL);

 

-  return (VOID *)Value;

+  return Buffer;

 }

 

 

@@ -643,7 +640,7 @@ BOOLEAN
 EFIAPI

 LibPcdSetExBool (

   IN CONST GUID        *Guid,

-  IN UINTN             TokenNumber,

+  IN PCD_TOKEN_NUMBER  TokenNumber,

   IN BOOLEAN           Value

   )

 {

@@ -674,7 +671,7 @@ VOID
 EFIAPI

 LibPcdCallbackOnSet (

   IN CONST GUID               *Guid,       OPTIONAL

-  IN UINTN                    TokenNumber,

+  IN PCD_TOKEN_NUMBER         TokenNumber,

   IN PCD_CALLBACK             NotificationFunction

   )

 {

@@ -698,7 +695,7 @@ VOID
 EFIAPI

 LibPcdCancelCallback (

   IN CONST GUID               *Guid,       OPTIONAL

-  IN UINTN                    TokenNumber,

+  IN PCD_TOKEN_NUMBER         TokenNumber,

   IN PCD_CALLBACK             NotificationFunction

   )

 {

@@ -720,14 +717,14 @@ LibPcdCancelCallback (
   @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD 

               token number.

 

-  @retval UINTN The next valid token number.

+  @retval PCD_TOKEN_NUMBER The next valid token number.

 

 **/

-UINTN

+PCD_TOKEN_NUMBER

 EFIAPI

 LibPcdGetNextToken (

   IN CONST GUID             *Guid, OPTIONAL

-  IN OUT UINTN              *TokenNumber

+  IN OUT PCD_TOKEN_NUMBER   TokenNumber

   )

 {

   return 0;