Sync Pcd Service Driver, PEIM and library with MDE Spec 0.55a.

[mirror_edk2.git] / EdkModulePkg / Universal / PCD / Dxe / Pcd.c

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index 55633148bba1ad58cda1c91f085a61b74ce599b3..ffb62256c3b5b781eab35949b8aa74e130e22185 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -100,10 +100,10 @@ PcdDxeInit (
 VOID\r
 EFIAPI\r
 DxePcdSetSku (\r
-  IN  SKU_ID         SkuId\r
+  IN  UINTN         SkuId\r
   )\r
 {\r
-  mPcdDatabase->PeiDb.Init.SystemSkuId = SkuId;\r
+  mPcdDatabase->PeiDb.Init.SystemSkuId = (SKU_ID) SkuId;\r
   \r
   return;\r
 }\r
@@ -113,12 +113,10 @@ DxePcdSetSku (
 UINT8\r
 EFIAPI\r
 DxePcdGet8 (\r
-  IN PCD_TOKEN_NUMBER         TokenNumber\r
+  IN UINTN                    TokenNumber\r
   )\r
 {\r
-  ASSERT (sizeof (UINT8) == DxePcdGetSize (TokenNumber));\r
-  \r
-  return *((UINT8 *) GetWorker (TokenNumber));\r
+  return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));\r
 }\r
 \r
 \r
@@ -126,12 +124,10 @@ DxePcdGet8 (
 UINT16\r
 EFIAPI\r
 DxePcdGet16 (\r
-  IN PCD_TOKEN_NUMBER         TokenNumber\r
+  IN UINTN                    TokenNumber\r
   )\r
 {\r
-  ASSERT (sizeof (UINT16) == DxePcdGetSize (TokenNumber));\r
-  \r
-  return ReadUnaligned16 (GetWorker (TokenNumber));\r
+  return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));\r
 }\r
 \r
 \r
@@ -139,12 +135,10 @@ DxePcdGet16 (
 UINT32\r
 EFIAPI\r
 DxePcdGet32 (\r
-  IN PCD_TOKEN_NUMBER         TokenNumber\r
+  IN UINTN                    TokenNumber\r
   )\r
 {\r
-  ASSERT (sizeof (UINT32) == DxePcdGetSize (TokenNumber));\r
-  \r
-  return ReadUnaligned32 (GetWorker (TokenNumber));\r
+  return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));\r
 }\r
 \r
 \r
@@ -152,12 +146,10 @@ DxePcdGet32 (
 UINT64\r
 EFIAPI\r
 DxePcdGet64 (\r
-  IN PCD_TOKEN_NUMBER          TokenNumber\r
+  IN UINTN                     TokenNumber\r
   )\r
 {\r
-  ASSERT (sizeof (UINT64) == DxePcdGetSize (TokenNumber));\r
-  \r
-  return ReadUnaligned64(GetWorker (TokenNumber));\r
+  return ReadUnaligned64(GetWorker (TokenNumber, sizeof (UINT64)));\r
 }\r
 \r
 \r
@@ -165,10 +157,10 @@ DxePcdGet64 (
 VOID *\r
 EFIAPI\r
 DxePcdGetPtr (\r
-  IN PCD_TOKEN_NUMBER          TokenNumber\r
+  IN UINTN                     TokenNumber\r
   )\r
 {\r
-  return GetWorker (TokenNumber);\r
+  return GetWorker (TokenNumber, 0);\r
 }\r
 \r
 \r
@@ -176,12 +168,10 @@ DxePcdGetPtr (
 BOOLEAN\r
 EFIAPI\r
 DxePcdGetBool (\r
-  IN PCD_TOKEN_NUMBER          TokenNumber\r
+  IN UINTN                     TokenNumber\r
   )\r
 {\r
-  ASSERT (sizeof (BOOLEAN) == DxePcdGetSize (TokenNumber));\r
-  \r
-  return *((BOOLEAN *) GetWorker (TokenNumber));\r
+  return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));\r
 }\r
 \r
 \r
@@ -189,7 +179,7 @@ DxePcdGetBool (
 UINTN\r
 EFIAPI\r
 DxePcdGetSize (\r
-  IN PCD_TOKEN_NUMBER          TokenNumber\r
+  IN UINTN                     TokenNumber\r
   )\r
 {\r
   UINT16 * SizeTable;\r
@@ -209,7 +199,7 @@ UINT8
 EFIAPI\r
 DxePcdGet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r
-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r
   )\r
 {\r
   return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT8)));\r
@@ -221,10 +211,10 @@ UINT16
 EFIAPI\r
 DxePcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER     ExTokenNumber\r
+  IN UINTN                ExTokenNumber\r
   )\r
 {\r
-  return *((UINT16 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));\r
+  return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));\r
 }\r
 \r
 \r
@@ -233,10 +223,10 @@ UINT32
 EFIAPI\r
 DxePcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r
   )\r
 {\r
-  return *((UINT32 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));\r
+  return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));\r
 }\r
 \r
 \r
@@ -245,13 +235,10 @@ UINT64
 EFIAPI\r
 DxePcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r
   )\r
 {\r
-  //\r
-  // BugBug: Must be changed to ReadUnaligned64\r
-  //\r
-  return *((UINT64 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT64)));\r
+  return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT64)));\r
 }\r
 \r
 \r
@@ -260,7 +247,7 @@ VOID *
 EFIAPI\r
 DxePcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r
   )\r
 {\r
   return ExGetWorker (Guid, ExTokenNumber, 0);\r
@@ -272,7 +259,7 @@ BOOLEAN
 EFIAPI\r
 DxePcdGetBoolEx (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r
   )\r
 {\r
   return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof(BOOLEAN)));\r
@@ -284,14 +271,10 @@ UINTN
 EFIAPI\r
 DxePcdGetSizeEx (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r
   )\r
 {\r
-  EX_PCD_ENTRY_ATTRIBUTE    Attr;\r
-  \r
-  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
-\r
-  return Attr.Size;\r
+  return DxePcdGetSize(GetExPcdTokenNumber (Guid, ExTokenNumber));\r
 }\r
 \r
 \r
@@ -299,7 +282,7 @@ DxePcdGetSizeEx (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet8 (\r
-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r
   IN UINT8              Value\r
   )\r
 {\r
@@ -311,7 +294,7 @@ DxePcdSet8 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet16 (\r
-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r
   IN UINT16             Value\r
   )\r
 {\r
@@ -323,7 +306,7 @@ DxePcdSet16 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet32 (\r
-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r
   IN UINT32             Value\r
   )\r
 {\r
@@ -335,7 +318,7 @@ DxePcdSet32 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet64 (\r
-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r
   IN UINT64             Value\r
   )\r
 {\r
@@ -347,7 +330,7 @@ DxePcdSet64 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetPtr (\r
-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r
   IN UINTN              SizeOfBuffer,\r
   IN VOID               *Buffer\r
   )\r
@@ -360,7 +343,7 @@ DxePcdSetPtr (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBool (\r
-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r
   IN BOOLEAN            Value\r
   )\r
 {\r
@@ -373,7 +356,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r
-  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r
+  IN UINTN                  ExTokenNumber,\r
   IN UINT8                  Value\r
   )\r
 {\r
@@ -392,7 +375,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet16Ex (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN PCD_TOKEN_NUMBER  ExTokenNumber,\r
+  IN UINTN             ExTokenNumber,\r
   IN UINT16            Value\r
   )\r
 {\r
@@ -411,7 +394,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet32Ex (\r
   IN CONST EFI_GUID     *Guid,\r
-  IN PCD_TOKEN_NUMBER   ExTokenNumber,\r
+  IN UINTN              ExTokenNumber,\r
   IN UINT32             Value\r
   )\r
 {\r
@@ -430,7 +413,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet64Ex (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN PCD_TOKEN_NUMBER  ExTokenNumber,\r
+  IN UINTN             ExTokenNumber,\r
   IN UINT64            Value\r
   )\r
 {\r
@@ -449,7 +432,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSetPtrEx (\r
   IN CONST EFI_GUID         *Guid,\r
-  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r
+  IN UINTN                  ExTokenNumber,\r
   IN UINTN                  SizeOfBuffer,\r
   IN VOID                   *Buffer\r
   )\r
@@ -469,7 +452,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN PCD_TOKEN_NUMBER  ExTokenNumber,\r
+  IN UINTN             ExTokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
 {\r
@@ -488,7 +471,7 @@ DxePcdSetBoolEx (
 EFI_STATUS\r
 EFIAPI\r
 DxeRegisterCallBackOnSet (\r
-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
@@ -503,7 +486,7 @@ DxeRegisterCallBackOnSet (
 EFI_STATUS\r
 EFIAPI\r
 DxeUnRegisterCallBackOnSet (\r
-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
@@ -519,16 +502,16 @@ EFI_STATUS
 EFIAPI\r
 DxePcdGetNextToken (\r
   IN CONST EFI_GUID         *Guid, OPTIONAL\r
-  IN OUT   PCD_TOKEN_NUMBER *TokenNumber\r
+  IN OUT   UINTN            *TokenNumber\r
   )\r
 {\r
-  PCD_TOKEN_NUMBER    ExTokenNumber;\r
+  UINTN               ExTokenNumber;\r
   \r
   //\r
   // Scan the local token space\r
   //\r
   if (Guid == NULL) {\r
-    *TokenNumber++;\r
+    (*TokenNumber)++;\r
     if (*TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
       return EFI_SUCCESS;\r
     } else {\r