roll back some changing since it was not complete.

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

2 files changed, 52 insertions, 52 deletions

diff --git a/MdePkg/Include/Ppi/PiPcd.h b/MdePkg/Include/Ppi/PiPcd.h
index 372bb117e9..e950787d5b 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_8)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_8)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 UINT16

-(EFIAPI *EFI_PEI_PCD_PPI_GET_16)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_16)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 UINT32

-(EFIAPI *EFI_PEI_PCD_PPI_GET_32)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_32)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 UINT64

-(EFIAPI *EFI_PEI_PCD_PPI_GET_64)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_64)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 VOID *

-(EFIAPI *EFI_PEI_PCD_PPI_GET_POINTER)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_POINTER)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 BOOLEAN

-(EFIAPI *EFI_PEI_PCD_PPI_GET_BOOLEAN)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_BOOLEAN)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 UINTN

-(EFIAPI *EFI_PEI_PCD_PPI_GET_SIZE)(

+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_SIZE)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PEI_PCD_PPI_SET_8)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_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_16)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_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_32)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_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_64)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_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_POINTER)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_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_BOOLEAN)(

+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_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_8                 GetEx8;

-  EFI_PEI_PCD_PPI_GET_16                GetEx16;

-  EFI_PEI_PCD_PPI_GET_32                GetEx32;

-  EFI_PEI_PCD_PPI_GET_64                GetEx64;

-  EFI_PEI_PCD_PPI_GET_POINTER           GetExPtr;

-  EFI_PEI_PCD_PPI_GET_BOOLEAN           GetExBool;

-  EFI_PEI_PCD_PPI_GET_SIZE              GetExSize;

-  EFI_PEI_PCD_PPI_SET_8                 SetEx8;

-  EFI_PEI_PCD_PPI_SET_16                SetEx16;

-  EFI_PEI_PCD_PPI_SET_32                SetEx32;

-  EFI_PEI_PCD_PPI_SET_64                SetEx64;

-  EFI_PEI_PCD_PPI_SET_POINTER           SetExPtr;

-  EFI_PEI_PCD_PPI_SET_BOOLEAN           SetExBool;

+  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_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/PiPcd.h b/MdePkg/Include/Protocol/PiPcd.h
index bfb5588083..b8b32ca5c7 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_8)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_8)(

   IN CONST EFI_GUID   *Guid,

   IN       UINTN      TokenNumber

 );

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

 typedef

 UINT16

-(EFIAPI *EFI_PCD_PROTOCOL_GET_16)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_16)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 UINT32

-(EFIAPI *EFI_PCD_PROTOCOL_GET_32)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_32)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 UINT64

-(EFIAPI *EFI_PCD_PROTOCOL_GET_64)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_64)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 VOID *

-(EFIAPI *EFI_PCD_PROTOCOL_GET_POINTER)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_POINTER)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 BOOLEAN

-(EFIAPI *EFI_PCD_PROTOCOL_GET_BOOLEAN)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_BOOLEAN)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 UINTN

-(EFIAPI *EFI_PCD_PROTOCOL_GET_SIZE)(

+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_SIZE)(

   IN CONST  EFI_GUID  *Guid,

   IN        UINTN     TokenNumber

 );

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

 typedef

 EFI_STATUS

-(EFIAPI *EFI_PCD_PROTOCOL_SET_8)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_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_16)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_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_32)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_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_64)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_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_POINTER)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_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_BOOLEAN)(

+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_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_8                Get8Ex;

-  EFI_PCD_PROTOCOL_GET_16               Get16Ex;

-  EFI_PCD_PROTOCOL_GET_32               Get32Ex;

-  EFI_PCD_PROTOCOL_GET_64               Get64Ex;

-  EFI_PCD_PROTOCOL_GET_POINTER          GetPtrEx;

-  EFI_PCD_PROTOCOL_GET_BOOLEAN          GetBoolEx;

-  EFI_PCD_PROTOCOL_GET_SIZE             GetSizeEx;

-  EFI_PCD_PROTOCOL_SET_8                Set8Ex;

-  EFI_PCD_PROTOCOL_SET_16               Set16Ex;

-  EFI_PCD_PROTOCOL_SET_32               Set32Ex;

-  EFI_PCD_PROTOCOL_SET_64               Set64Ex;

-  EFI_PCD_PROTOCOL_SET_POINTER          SetPtrEx;

-  EFI_PCD_PROTOCOL_SET_BOOLEAN          SetBoolEx;

+  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_CALLBACK_ON_SET      CallbackOnSet;

   EFI_PCD_PROTOCOL_CANCEL_CALLBACK      CancelCallback;

   EFI_PCD_PROTOCOL_GET_NEXT_TOKEN       GetNextToken;