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

diff --git a/MdePkg/Include/Ppi/PiPcd.h b/MdePkg/Include/Ppi/PiPcd.h
index 372bb117e9ffa9b31f00957f5a9c5dbbbfc456d7..e950787d5bec7f5d63082b3a9f0a818375b03455 100644 (file)
--- a/MdePkg/Include/Ppi/PiPcd.h
+++ b/MdePkg/Include/Ppi/PiPcd.h
@@ -67,7 +67,7 @@ VOID
 **/\r
 typedef\r
 UINT8\r
-(EFIAPI *EFI_PEI_PCD_PPI_GET_8)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_8)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -83,7 +83,7 @@ UINT8
 **/\r
 typedef\r
 UINT16\r
-(EFIAPI *EFI_PEI_PCD_PPI_GET_16)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_16)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -99,7 +99,7 @@ UINT16
 **/\r
 typedef\r
 UINT32\r
-(EFIAPI *EFI_PEI_PCD_PPI_GET_32)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_32)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -115,7 +115,7 @@ UINT32
 **/\r
 typedef\r
 UINT64\r
-(EFIAPI *EFI_PEI_PCD_PPI_GET_64)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_64)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -130,7 +130,7 @@ UINT64
 **/\r
 typedef\r
 VOID *\r
-(EFIAPI *EFI_PEI_PCD_PPI_GET_POINTER)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_POINTER)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -146,7 +146,7 @@ VOID *
 **/\r
 typedef\r
 BOOLEAN\r
-(EFIAPI *EFI_PEI_PCD_PPI_GET_BOOLEAN)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_BOOLEAN)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -162,7 +162,7 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
-(EFIAPI *EFI_PEI_PCD_PPI_GET_SIZE)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_GET_EX_SIZE)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -185,7 +185,7 @@ UINTN
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PEI_PCD_PPI_SET_8)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_8)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN        UINT8     Value\r
@@ -209,7 +209,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PEI_PCD_PPI_SET_16)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_16)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN        UINT16    Value\r
@@ -233,7 +233,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PEI_PCD_PPI_SET_32)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_32)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN        UINT32    Value\r
@@ -257,7 +257,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PEI_PCD_PPI_SET_64)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_64)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN        UINT64    Value\r
@@ -284,7 +284,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PEI_PCD_PPI_SET_POINTER)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_POINTER)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN OUT    UINTN     *SizeOfValue,\r
@@ -309,7 +309,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PEI_PCD_PPI_SET_BOOLEAN)(\r
+(EFIAPI *EFI_PEI_PCD_PPI_SET_EX_BOOLEAN)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN        BOOLEAN   Value\r
@@ -410,19 +410,19 @@ EFI_STATUS
 \r
 typedef struct {\r
   EFI_PEI_PCD_PPI_SET_SKU               SetSku;\r
-  EFI_PEI_PCD_PPI_GET_8                 GetEx8;\r
-  EFI_PEI_PCD_PPI_GET_16                GetEx16;\r
-  EFI_PEI_PCD_PPI_GET_32                GetEx32;\r
-  EFI_PEI_PCD_PPI_GET_64                GetEx64;\r
-  EFI_PEI_PCD_PPI_GET_POINTER           GetExPtr;\r
-  EFI_PEI_PCD_PPI_GET_BOOLEAN           GetExBool;\r
-  EFI_PEI_PCD_PPI_GET_SIZE              GetExSize;\r
-  EFI_PEI_PCD_PPI_SET_8                 SetEx8;\r
-  EFI_PEI_PCD_PPI_SET_16                SetEx16;\r
-  EFI_PEI_PCD_PPI_SET_32                SetEx32;\r
-  EFI_PEI_PCD_PPI_SET_64                SetEx64;\r
-  EFI_PEI_PCD_PPI_SET_POINTER           SetExPtr;\r
-  EFI_PEI_PCD_PPI_SET_BOOLEAN           SetExBool;\r
+  EFI_PEI_PCD_PPI_GET_EX_8              GetEx8;\r
+  EFI_PEI_PCD_PPI_GET_EX_16             GetEx16;\r
+  EFI_PEI_PCD_PPI_GET_EX_32             GetEx32;\r
+  EFI_PEI_PCD_PPI_GET_EX_64             GetEx64;\r
+  EFI_PEI_PCD_PPI_GET_EX_POINTER        GetExPtr;\r
+  EFI_PEI_PCD_PPI_GET_EX_BOOLEAN        GetExBool;\r
+  EFI_PEI_PCD_PPI_GET_EX_SIZE           GetExSize;\r
+  EFI_PEI_PCD_PPI_SET_EX_8              SetEx8;\r
+  EFI_PEI_PCD_PPI_SET_EX_16             SetEx16;\r
+  EFI_PEI_PCD_PPI_SET_EX_32             SetEx32;\r
+  EFI_PEI_PCD_PPI_SET_EX_64             SetEx64;\r
+  EFI_PEI_PCD_PPI_SET_EX_POINTER        SetExPtr;\r
+  EFI_PEI_PCD_PPI_SET_EX_BOOLEAN        SetExBool;\r
   EFI_PEI_PCD_PPI_CALLBACK_ON_SET       CallbackOnSet;\r
   EFI_PEI_PCD_PPI_CANCEL_CALLBACK       CancelCallback;\r
   EFI_PEI_PCD_PPI_GET_NEXT_TOKEN        GetNextToken;\r

diff --git a/MdePkg/Include/Protocol/PiPcd.h b/MdePkg/Include/Protocol/PiPcd.h
index bfb5588083fb8bcc98c774d842286de8acdf7e2b..b8b32ca5c72fd394e5e3962d53ea63f5c9fe971b 100644 (file)
--- a/MdePkg/Include/Protocol/PiPcd.h
+++ b/MdePkg/Include/Protocol/PiPcd.h
@@ -67,7 +67,7 @@ VOID
 **/\r
 typedef\r
 UINT8\r
-(EFIAPI *EFI_PCD_PROTOCOL_GET_8)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_8)(\r
   IN CONST EFI_GUID   *Guid,\r
   IN       UINTN      TokenNumber\r
 );\r
@@ -83,7 +83,7 @@ UINT8
 **/\r
 typedef\r
 UINT16\r
-(EFIAPI *EFI_PCD_PROTOCOL_GET_16)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_16)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -99,7 +99,7 @@ UINT16
 **/\r
 typedef\r
 UINT32\r
-(EFIAPI *EFI_PCD_PROTOCOL_GET_32)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_32)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -116,7 +116,7 @@ UINT32
 **/\r
 typedef\r
 UINT64\r
-(EFIAPI *EFI_PCD_PROTOCOL_GET_64)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_64)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -133,7 +133,7 @@ UINT64
 **/\r
 typedef\r
 VOID *\r
-(EFIAPI *EFI_PCD_PROTOCOL_GET_POINTER)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_POINTER)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -149,7 +149,7 @@ VOID *
 **/\r
 typedef\r
 BOOLEAN\r
-(EFIAPI *EFI_PCD_PROTOCOL_GET_BOOLEAN)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_BOOLEAN)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -165,7 +165,7 @@ BOOLEAN
 **/\r
 typedef\r
 UINTN\r
-(EFIAPI *EFI_PCD_PROTOCOL_GET_SIZE)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_GET_EX_SIZE)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber\r
 );\r
@@ -188,7 +188,7 @@ UINTN
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PCD_PROTOCOL_SET_8)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_8)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN        UINT8     Value\r
@@ -212,7 +212,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PCD_PROTOCOL_SET_16)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_16)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN        UINT16    Value\r
@@ -236,7 +236,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PCD_PROTOCOL_SET_32)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_32)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN        UINT32    Value\r
@@ -260,7 +260,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PCD_PROTOCOL_SET_64)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_64)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN        UINT64    Value\r
@@ -287,7 +287,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PCD_PROTOCOL_SET_POINTER)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_POINTER)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN OUT    UINTN     *SizeOfValue,\r
@@ -312,7 +312,7 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PCD_PROTOCOL_SET_BOOLEAN)(\r
+(EFIAPI *EFI_PCD_PROTOCOL_SET_EX_BOOLEAN)(\r
   IN CONST  EFI_GUID  *Guid,\r
   IN        UINTN     TokenNumber,\r
   IN        BOOLEAN   Value\r
@@ -402,19 +402,19 @@ EFI_STATUS
 \r
 typedef struct _EFI_PCD_PROTOCOL {\r
   EFI_PCD_PROTOCOL_SET_SKU              SetSku;\r
-  EFI_PCD_PROTOCOL_GET_8                Get8Ex;\r
-  EFI_PCD_PROTOCOL_GET_16               Get16Ex;\r
-  EFI_PCD_PROTOCOL_GET_32               Get32Ex;\r
-  EFI_PCD_PROTOCOL_GET_64               Get64Ex;\r
-  EFI_PCD_PROTOCOL_GET_POINTER          GetPtrEx;\r
-  EFI_PCD_PROTOCOL_GET_BOOLEAN          GetBoolEx;\r
-  EFI_PCD_PROTOCOL_GET_SIZE             GetSizeEx;\r
-  EFI_PCD_PROTOCOL_SET_8                Set8Ex;\r
-  EFI_PCD_PROTOCOL_SET_16               Set16Ex;\r
-  EFI_PCD_PROTOCOL_SET_32               Set32Ex;\r
-  EFI_PCD_PROTOCOL_SET_64               Set64Ex;\r
-  EFI_PCD_PROTOCOL_SET_POINTER          SetPtrEx;\r
-  EFI_PCD_PROTOCOL_SET_BOOLEAN          SetBoolEx;\r
+  EFI_PCD_PROTOCOL_GET_EX_8             Get8Ex;\r
+  EFI_PCD_PROTOCOL_GET_EX_16            Get16Ex;\r
+  EFI_PCD_PROTOCOL_GET_EX_32            Get32Ex;\r
+  EFI_PCD_PROTOCOL_GET_EX_64            Get64Ex;\r
+  EFI_PCD_PROTOCOL_GET_EX_POINTER       GetPtrEx;\r
+  EFI_PCD_PROTOCOL_GET_EX_BOOLEAN       GetBoolEx;\r
+  EFI_PCD_PROTOCOL_GET_EX_SIZE          GetSizeEx;\r
+  EFI_PCD_PROTOCOL_SET_EX_8             Set8Ex;\r
+  EFI_PCD_PROTOCOL_SET_EX_16            Set16Ex;\r
+  EFI_PCD_PROTOCOL_SET_EX_32            Set32Ex;\r
+  EFI_PCD_PROTOCOL_SET_EX_64            Set64Ex;\r
+  EFI_PCD_PROTOCOL_SET_EX_POINTER       SetPtrEx;\r
+  EFI_PCD_PROTOCOL_SET_EX_BOOLEAN       SetBoolEx;\r
   EFI_PCD_PROTOCOL_CALLBACK_ON_SET      CallbackOnSet;\r
   EFI_PCD_PROTOCOL_CANCEL_CALLBACK      CancelCallback;\r
   EFI_PCD_PROTOCOL_GET_NEXT_TOKEN       GetNextToken;\r