Removing "Ex" in PI PCD_PPI/PROTOCOL's interface according to PI 1.2 latest update.

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

6 files changed, 94 insertions, 84 deletions

diff --git a/MdePkg/Include/Ppi/Pcd.h b/MdePkg/Include/Ppi/Pcd.h
index c8c8fbd6e8..a2e8d9b04a 100644
--- a/MdePkg/Include/Ppi/Pcd.h
+++ b/MdePkg/Include/Ppi/Pcd.h
@@ -1,7 +1,12 @@
 /** @file

-  Platform Configuration Database (PCD) PPI

+  Native Platform Configuration Database (PCD) PPI

+  

+  Different with the EFI_PCD_PPI defined in PI 1.2 specification, the native

+  PCD PPI provide interfaces for dynamic and dynamic-ex type PCD. 

+  The interfaces for dynamic type PCD do not require the token space guid as parameter,

+  but interfaces for dynamic-ex type PCD require token space guid as parameter.

 

-  Copyright (c) 2006 - 2008, Intel Corporation                                                         

+  Copyright (c) 2006 - 2010, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

diff --git a/MdePkg/Include/Ppi/PiPcd.h b/MdePkg/Include/Ppi/PiPcd.h
index e950787d5b..3ba4052894 100644
--- a/MdePkg/Include/Ppi/PiPcd.h
+++ b/MdePkg/Include/Ppi/PiPcd.h
@@ -67,7 +67,7 @@ VOID
 **/

 typedef

 UINT8

-(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_8)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_8)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -83,7 +83,7 @@ UINT8
 **/

 typedef

 UINT16

-(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_16)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_16)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -99,7 +99,7 @@ UINT16
 **/

 typedef

 UINT32

-(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_32)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_32)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -115,7 +115,7 @@ UINT32
 **/

 typedef

 UINT64

-(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_64)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_64)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -130,7 +130,7 @@ UINT64
 **/

 typedef

 VOID *

-(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_POINTER)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_POINTER)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -146,7 +146,7 @@ VOID *
 **/

 typedef

 BOOLEAN

-(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_BOOLEAN)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_BOOLEAN)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -162,7 +162,7 @@ BOOLEAN
 **/

 typedef

 UINTN

-(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_SIZE)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_SIZE)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -185,7 +185,7 @@ UINTN
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_8)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_8)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN        UINT8     Value

@@ -209,7 +209,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_16)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_16)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN        UINT16    Value

@@ -233,7 +233,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_32)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_32)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN        UINT32    Value

@@ -257,7 +257,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_64)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_64)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN        UINT64    Value

@@ -284,7 +284,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_POINTER)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_POINTER)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN OUT    UINTN     *SizeOfValue,

@@ -309,7 +309,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_BOOLEAN)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_BOOLEAN)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN        BOOLEAN   Value

@@ -410,19 +410,19 @@ EFI_STATUS
 

 typedef struct {

   EFI_PEI_PCD_PPI_SET_SKU               SetSku;

-  EFI_PEI_PCD_PPI_GET_EX_8              GetEx8;

-  EFI_PEI_PCD_PPI_GET_EX_16             GetEx16;

-  EFI_PEI_PCD_PPI_GET_EX_32             GetEx32;

-  EFI_PEI_PCD_PPI_GET_EX_64             GetEx64;

-  EFI_PEI_PCD_PPI_GET_EX_POINTER        GetExPtr;

-  EFI_PEI_PCD_PPI_GET_EX_BOOLEAN        GetExBool;

-  EFI_PEI_PCD_PPI_GET_EX_SIZE           GetExSize;

-  EFI_PEI_PCD_PPI_SET_EX_8              SetEx8;

-  EFI_PEI_PCD_PPI_SET_EX_16             SetEx16;

-  EFI_PEI_PCD_PPI_SET_EX_32             SetEx32;

-  EFI_PEI_PCD_PPI_SET_EX_64             SetEx64;

-  EFI_PEI_PCD_PPI_SET_EX_POINTER        SetExPtr;

-  EFI_PEI_PCD_PPI_SET_EX_BOOLEAN        SetExBool;

+  EFI_PEI_PCD_PPI_GET_8                 Get8;

+  EFI_PEI_PCD_PPI_GET_16                Get16;

+  EFI_PEI_PCD_PPI_GET_32                Get32;

+  EFI_PEI_PCD_PPI_GET_64                Get64;

+  EFI_PEI_PCD_PPI_GET_POINTER           GetPtr;

+  EFI_PEI_PCD_PPI_GET_BOOLEAN           GetBool;

+  EFI_PEI_PCD_PPI_GET_SIZE              GetSize;

+  EFI_PEI_PCD_PPI_SET_8                 Set8;

+  EFI_PEI_PCD_PPI_SET_16                Set16;

+  EFI_PEI_PCD_PPI_SET_32                Set32;

+  EFI_PEI_PCD_PPI_SET_64                Set64;

+  EFI_PEI_PCD_PPI_SET_POINTER           SetPtr;

+  EFI_PEI_PCD_PPI_SET_BOOLEAN           SetBool;

   EFI_PEI_PCD_PPI_CALLBACK_ON_SET       CallbackOnSet;

   EFI_PEI_PCD_PPI_CANCEL_CALLBACK       CancelCallback;

   EFI_PEI_PCD_PPI_GET_NEXT_TOKEN        GetNextToken;

diff --git a/MdePkg/Include/Protocol/Pcd.h b/MdePkg/Include/Protocol/Pcd.h
index db3b2b1f0d..ba0ae06676 100644
--- a/MdePkg/Include/Protocol/Pcd.h
+++ b/MdePkg/Include/Protocol/Pcd.h
@@ -1,7 +1,12 @@
 /** @file

-  Platform Configuration Database (PCD) Protocol

+  Native Platform Configuration Database (PCD) Protocol

 

-  Copyright (c) 2006 - 2009, Intel Corporation                                                         

+  Different with the EFI_PCD_PROTOCOL defined in PI 1.2 specification, the native

+  PCD protocol provide interfaces for dynamic and dynamic-ex type PCD. 

+  The interfaces in dynamic type PCD do not require the token space guid as parameter,

+  but interfaces in dynamic-ex type PCD require token space guid as parameter.

+  

+  Copyright (c) 2006 - 2010, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

   are licensed and made available under the terms and conditions of the BSD License         

   which accompanies this distribution.  The full text of the license may be found at        

diff --git a/MdePkg/Include/Protocol/PiPcd.h b/MdePkg/Include/Protocol/PiPcd.h
index b8b32ca5c7..2c71b25178 100644
--- a/MdePkg/Include/Protocol/PiPcd.h
+++ b/MdePkg/Include/Protocol/PiPcd.h
@@ -67,7 +67,7 @@ VOID
 **/

 typedef

 UINT8

-(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_8)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_8)(

   IN CONST EFI_GUID   *Guid,

   IN       UINTN      TokenNumber

 );

@@ -83,7 +83,7 @@ UINT8
 **/

 typedef

 UINT16

-(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_16)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_16)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -99,7 +99,7 @@ UINT16
 **/

 typedef

 UINT32

-(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_32)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_32)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -116,7 +116,7 @@ UINT32
 **/

 typedef

 UINT64

-(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_64)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_64)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -133,7 +133,7 @@ UINT64
 **/

 typedef

 VOID *

-(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_POINTER)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_POINTER)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -149,7 +149,7 @@ VOID *
 **/

 typedef

 BOOLEAN

-(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_BOOLEAN)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_BOOLEAN)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -165,7 +165,7 @@ BOOLEAN
 **/

 typedef

 UINTN

-(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_SIZE)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_SIZE)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

@@ -188,7 +188,7 @@ UINTN
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_8)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_8)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN        UINT8     Value

@@ -212,7 +212,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_16)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_16)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN        UINT16    Value

@@ -236,7 +236,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_32)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_32)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN        UINT32    Value

@@ -260,7 +260,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_64)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_64)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN        UINT64    Value

@@ -287,7 +287,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_POINTER)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_POINTER)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN OUT    UINTN     *SizeOfValue,

@@ -312,7 +312,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_BOOLEAN)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_BOOLEAN)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber,

   IN        BOOLEAN   Value

@@ -402,19 +402,19 @@ EFI_STATUS
 

 typedef struct _EFI_PCD_PROTOCOL {

   EFI_PCD_PROTOCOL_SET_SKU              SetSku;

-  EFI_PCD_PROTOCOL_GET_EX_8             Get8Ex;

-  EFI_PCD_PROTOCOL_GET_EX_16            Get16Ex;

-  EFI_PCD_PROTOCOL_GET_EX_32            Get32Ex;

-  EFI_PCD_PROTOCOL_GET_EX_64            Get64Ex;

-  EFI_PCD_PROTOCOL_GET_EX_POINTER       GetPtrEx;

-  EFI_PCD_PROTOCOL_GET_EX_BOOLEAN       GetBoolEx;

-  EFI_PCD_PROTOCOL_GET_EX_SIZE          GetSizeEx;

-  EFI_PCD_PROTOCOL_SET_EX_8             Set8Ex;

-  EFI_PCD_PROTOCOL_SET_EX_16            Set16Ex;

-  EFI_PCD_PROTOCOL_SET_EX_32            Set32Ex;

-  EFI_PCD_PROTOCOL_SET_EX_64            Set64Ex;

-  EFI_PCD_PROTOCOL_SET_EX_POINTER       SetPtrEx;

-  EFI_PCD_PROTOCOL_SET_EX_BOOLEAN       SetBoolEx;

+  EFI_PCD_PROTOCOL_GET_8                Get8;

+  EFI_PCD_PROTOCOL_GET_16               Get16;

+  EFI_PCD_PROTOCOL_GET_32               Get32;

+  EFI_PCD_PROTOCOL_GET_64               Get64;

+  EFI_PCD_PROTOCOL_GET_POINTER          GetPtr;

+  EFI_PCD_PROTOCOL_GET_BOOLEAN          GetBool;

+  EFI_PCD_PROTOCOL_GET_SIZE             GetSize;

+  EFI_PCD_PROTOCOL_SET_8                Set8;

+  EFI_PCD_PROTOCOL_SET_16               Set16;

+  EFI_PCD_PROTOCOL_SET_32               Set32;

+  EFI_PCD_PROTOCOL_SET_64               Set64;

+  EFI_PCD_PROTOCOL_SET_POINTER          SetPtr;

+  EFI_PCD_PROTOCOL_SET_BOOLEAN          SetBool;

   EFI_PCD_PROTOCOL_CALLBACK_ON_SET      CallbackOnSet;

   EFI_PCD_PROTOCOL_CANCEL_CALLBACK      CancelCallback;

   EFI_PCD_PROTOCOL_GET_NEXT_TOKEN       GetNextToken;

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index 483d3e6a3c..7d2f28d82d 100644
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -1,7 +1,7 @@
 /** @file

 Implementation of PcdLib class library for DXE phase.

 

-Copyright (c) 2006 - 2009, Intel Corporation<BR>

+Copyright (c) 2006 - 2010, Intel Corporation<BR>

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -267,7 +267,7 @@ LibPcdGetEx8 (
 {

   ASSERT (Guid != NULL);

   

-  return mPiPcd->Get8Ex (Guid, TokenNumber);

+  return mPiPcd->Get8 (Guid, TokenNumber);

 }

 

 

@@ -294,7 +294,7 @@ LibPcdGetEx16 (
 {

   ASSERT (Guid != NULL);

 

-  return mPiPcd->Get16Ex (Guid, TokenNumber);

+  return mPiPcd->Get16 (Guid, TokenNumber);

 }

 

 

@@ -318,7 +318,7 @@ LibPcdGetEx32 (
 {

   ASSERT (Guid != NULL);

 

-  return mPiPcd->Get32Ex (Guid, TokenNumber);

+  return mPiPcd->Get32 (Guid, TokenNumber);

 }

 

 

@@ -346,7 +346,7 @@ LibPcdGetEx64 (
 {

   ASSERT (Guid != NULL);

   

-  return mPiPcd->Get64Ex (Guid, TokenNumber);

+  return mPiPcd->Get64 (Guid, TokenNumber);

 }

 

 

@@ -374,7 +374,7 @@ LibPcdGetExPtr (
 {

   ASSERT (Guid != NULL);

 

-  return mPiPcd->GetPtrEx (Guid, TokenNumber);

+  return mPiPcd->GetPtr (Guid, TokenNumber);

 }

 

 

@@ -402,7 +402,7 @@ LibPcdGetExBool (
 {

   ASSERT (Guid != NULL);

 

-  return mPiPcd->GetBoolEx (Guid, TokenNumber);

+  return mPiPcd->GetBool (Guid, TokenNumber);

 }

 

 

@@ -430,7 +430,7 @@ LibPcdGetExSize (
 {

   ASSERT (Guid != NULL);

 

-  return mPiPcd->GetSizeEx (Guid, TokenNumber);

+  return mPiPcd->GetSize (Guid, TokenNumber);

 }

 

 

@@ -668,7 +668,7 @@ LibPcdSetEx8 (
 

   ASSERT (Guid != NULL);

 

-  Status = mPiPcd->Set8Ex (Guid, TokenNumber, Value);

+  Status = mPiPcd->Set8 (Guid, TokenNumber, Value);

 

   ASSERT_EFI_ERROR (Status);

 

@@ -705,7 +705,7 @@ LibPcdSetEx16 (
 

   ASSERT (Guid != NULL);

 

-  Status = mPiPcd->Set16Ex (Guid, TokenNumber, Value);

+  Status = mPiPcd->Set16 (Guid, TokenNumber, Value);

 

   ASSERT_EFI_ERROR (Status);

 

@@ -742,7 +742,7 @@ LibPcdSetEx32 (
 

   ASSERT (Guid != NULL);

 

-  Status = mPiPcd->Set32Ex (Guid, TokenNumber, Value);

+  Status = mPiPcd->Set32 (Guid, TokenNumber, Value);

 

   ASSERT_EFI_ERROR (Status);

 

@@ -778,7 +778,7 @@ LibPcdSetEx64 (
 

   ASSERT (Guid != NULL);

 

-  Status = mPiPcd->Set64Ex (Guid, TokenNumber, Value);

+  Status = mPiPcd->Set64 (Guid, TokenNumber, Value);

 

   ASSERT_EFI_ERROR (Status);

 

@@ -828,7 +828,7 @@ LibPcdSetExPtr (
     ASSERT (Buffer != NULL);

   }

 

-  Status = mPiPcd->SetPtrEx (Guid, TokenNumber, SizeOfBuffer, Buffer);

+  Status = mPiPcd->SetPtr (Guid, TokenNumber, SizeOfBuffer, Buffer);

 

   if (EFI_ERROR (Status)) {

     return NULL;

@@ -867,7 +867,7 @@ LibPcdSetExBool (
 

   ASSERT (Guid != NULL);

 

-  Status = mPiPcd->SetBoolEx (Guid, TokenNumber, Value);

+  Status = mPiPcd->SetBool (Guid, TokenNumber, Value);

 

   ASSERT_EFI_ERROR (Status);

 

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index 057a957165..16d68533e7 100644
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -1,7 +1,7 @@
 /** @file

 Implementation of PcdLib class library for PEI phase.

 

-Copyright (c) 2006 - 2009, Intel Corporation<BR>

+Copyright (c) 2006 - 2010, Intel Corporation<BR>

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -268,7 +268,7 @@ LibPcdGetEx8 (
 {

   ASSERT (Guid != NULL);

 

-  return (GetPiPcdPpiPointer ())->GetEx8 (Guid, TokenNumber);

+  return (GetPiPcdPpiPointer ())->Get8 (Guid, TokenNumber);

 }

 

 

@@ -297,7 +297,7 @@ LibPcdGetEx16 (
 

   ASSERT (Guid != NULL);

 

-  return (GetPiPcdPpiPointer ())->GetEx16 (Guid, TokenNumber);

+  return (GetPiPcdPpiPointer ())->Get16 (Guid, TokenNumber);

 }

 

 

@@ -322,7 +322,7 @@ LibPcdGetEx32 (
 {

   ASSERT (Guid != NULL);

 

-  return (GetPiPcdPpiPointer ())->GetEx32 (Guid, TokenNumber);

+  return (GetPiPcdPpiPointer ())->Get32 (Guid, TokenNumber);

 }

 

 

@@ -350,7 +350,7 @@ LibPcdGetEx64 (
   )

 {

   ASSERT (Guid != NULL);

-  return (GetPiPcdPpiPointer ())->GetEx64 (Guid, TokenNumber);

+  return (GetPiPcdPpiPointer ())->Get64 (Guid, TokenNumber);

 }

 

 

@@ -378,7 +378,7 @@ LibPcdGetExPtr (
 {

   ASSERT (Guid != NULL);

 

-  return (GetPiPcdPpiPointer ())->GetExPtr (Guid, TokenNumber);

+  return (GetPiPcdPpiPointer ())->GetPtr (Guid, TokenNumber);

 }

 

 

@@ -405,7 +405,7 @@ LibPcdGetExBool (
   )

 {

   ASSERT (Guid != NULL);

-  return (GetPiPcdPpiPointer ())->GetExBool (Guid, TokenNumber);

+  return (GetPiPcdPpiPointer ())->GetBool (Guid, TokenNumber);

 }

 

 

@@ -432,7 +432,7 @@ LibPcdGetExSize (
   )

 {

   ASSERT (Guid != NULL);

-  return (GetPiPcdPpiPointer ())->GetExSize (Guid, TokenNumber);

+  return (GetPiPcdPpiPointer ())->GetSize (Guid, TokenNumber);

 }

 

 

@@ -664,7 +664,7 @@ LibPcdSetEx8 (
 

   ASSERT (Guid != NULL);

 

-  Status = (GetPiPcdPpiPointer ())->SetEx8 (Guid, TokenNumber, Value);

+  Status = (GetPiPcdPpiPointer ())->Set8 (Guid, TokenNumber, Value);

 

   ASSERT_EFI_ERROR (Status);

 

@@ -699,7 +699,7 @@ LibPcdSetEx16 (
 {

   EFI_STATUS Status;

   ASSERT (Guid != NULL);

-  Status = (GetPiPcdPpiPointer ())->SetEx16 (Guid, TokenNumber, Value);

+  Status = (GetPiPcdPpiPointer ())->Set16 (Guid, TokenNumber, Value);

 

   ASSERT_EFI_ERROR (Status);

 

@@ -736,7 +736,7 @@ LibPcdSetEx32 (
 

   ASSERT (Guid != NULL);

 

-  Status = (GetPiPcdPpiPointer ())->SetEx32 (Guid, TokenNumber, Value);

+  Status = (GetPiPcdPpiPointer ())->Set32 (Guid, TokenNumber, Value);

 

   ASSERT_EFI_ERROR (Status);

 

@@ -771,7 +771,7 @@ LibPcdSetEx64 (
   EFI_STATUS Status;

   ASSERT (Guid != NULL);

 

-  Status = (GetPiPcdPpiPointer ())->SetEx64 (Guid, TokenNumber, Value);

+  Status = (GetPiPcdPpiPointer ())->Set64 (Guid, TokenNumber, Value);

 

   ASSERT_EFI_ERROR (Status);

 

@@ -818,7 +818,7 @@ LibPcdSetExPtr (
   }

   ASSERT (Guid != NULL);

 

-  Status = (GetPiPcdPpiPointer ())->SetExPtr (Guid, TokenNumber, SizeOfBuffer, Buffer);

+  Status = (GetPiPcdPpiPointer ())->SetPtr (Guid, TokenNumber, SizeOfBuffer, Buffer);

 

   if (EFI_ERROR (Status)) {

     return NULL;

@@ -856,7 +856,7 @@ LibPcdSetExBool (
   EFI_STATUS Status;

 

   ASSERT (Guid != NULL);

-  Status = (GetPiPcdPpiPointer ())->SetExBool (Guid, TokenNumber, Value);

+  Status = (GetPiPcdPpiPointer ())->SetBool (Guid, TokenNumber, Value);

 

   ASSERT_EFI_ERROR (Status);