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

[mirror_edk2.git] / MdePkg / Include / Protocol / Pcd.h

diff --git a/MdePkg/Include/Protocol/Pcd.h b/MdePkg/Include/Protocol/Pcd.h
index ccdfd13647ca42be977995a43532bdbaa4403640..3adac6d4ab939b2903488aaf09b9fdd8440dd3cc 100644 (file)
--- a/MdePkg/Include/Protocol/Pcd.h
+++ b/MdePkg/Include/Protocol/Pcd.h
@@ -17,149 +17,150 @@
 #ifndef __PCD_H__\r
 #define __PCD_H__\r
 \r
+#include <Common/Pcd.h>\r
+\r
 extern EFI_GUID gPcdProtocolGuid;\r
 \r
 #define PCD_PROTOCOL_GUID \\r
   { 0x11b34006, 0xd85b, 0x4d0a, { 0xa2, 0x90, 0xd5, 0xa5, 0x71, 0x31, 0xe, 0xf7 } }\r
 \r
-typedef UINT8   SKU_ID;\r
-\r
 typedef \r
-EFI_STATUS\r
+VOID\r
 (EFIAPI *PCD_PROTOCOL_SET_SKU) (\r
-  IN  UINTN                  SkuId\r
+  IN  SKU_ID                  SkuId\r
   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PROTOCOL_GET8) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PROTOCOL_GET16) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PROTOCOL_GET32) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PROTOCOL_GET64) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PROTOCOL_GET_POINTER) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PROTOCOL_GET_BOOLEAN) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PROTOCOL_GET_SIZE) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_32) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_SIZE) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET8) (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET16) (\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT16             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET32) (\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT32             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET64) (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64            Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_POINTER) (\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
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_BOOLEAN) (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   );\r
 \r
@@ -167,7 +168,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   );\r
 \r
@@ -175,7 +176,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT16            Value\r
   );\r
 \r
@@ -183,7 +184,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_32) (\r
   IN CONST EFI_GUID     *Guid,\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT32             Value\r
   );\r
 \r
@@ -191,7 +192,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64            Value\r
   );\r
 \r
@@ -199,15 +200,16 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_POINTER) (\r
   IN CONST EFI_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
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   );\r
   \r
@@ -225,16 +227,16 @@ EFI_STATUS
 typedef\r
 VOID\r
 (EFIAPI *PCD_PROTOCOL_CALLBACK) (\r
-  IN  CONST EFI_GUID   *CallBackGuid, OPTIONAL\r
-  IN  UINTN            CallBackToken,\r
-  IN  VOID             *TokenData,\r
-  IN  UINTN            TokenDataSize\r
+  IN      CONST EFI_GUID   *CallBackGuid, OPTIONAL\r
+  IN      PCD_TOKEN_NUMBER            CallBackToken,\r
+  IN  OUT VOID             *TokenData,\r
+  IN      UINTN            TokenDataSize\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_CALLBACK_ONSET) (\r
-  IN  UINTN                   TokenNumber,\r
+  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   );\r
@@ -242,7 +244,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_CANCEL_CALLBACK) (\r
-  IN  UINTN                   TokenNumber,\r
+  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   );\r
@@ -251,7 +253,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_GET_NEXT_TOKEN) (\r
   IN      CONST EFI_GUID      *Guid, OPTIONAL\r
-  IN OUT  UINTN               *TokenNumber\r
+  IN OUT  PCD_TOKEN_NUMBER    *TokenNumber\r
   );\r
 \r
 typedef struct {\r