X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FUniversal%2FPCD%2FDxe%2FPcd.c;h=1bde2d8bd4e8fbf9a09311b9238e1ddcd4dc4c29;hp=55633148bba1ad58cda1c91f085a61b74ce599b3;hb=9d6d8b24f36f782690a918ebabf8da88d54a050e;hpb=0653eb895dfb8d059c114120a0779b561c5578ef

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index 55633148bb..1bde2d8bd4 100644
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -116,9 +116,7 @@ DxePcdGet8 (
   IN PCD_TOKEN_NUMBER         TokenNumber
   )
 {
-  ASSERT (sizeof (UINT8) == DxePcdGetSize (TokenNumber));
-  
-  return *((UINT8 *) GetWorker (TokenNumber));
+  return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));
 }
 
 
@@ -129,9 +127,7 @@ DxePcdGet16 (
   IN PCD_TOKEN_NUMBER         TokenNumber
   )
 {
-  ASSERT (sizeof (UINT16) == DxePcdGetSize (TokenNumber));
-  
-  return ReadUnaligned16 (GetWorker (TokenNumber));
+  return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));
 }
 
 
@@ -142,9 +138,7 @@ DxePcdGet32 (
   IN PCD_TOKEN_NUMBER         TokenNumber
   )
 {
-  ASSERT (sizeof (UINT32) == DxePcdGetSize (TokenNumber));
-  
-  return ReadUnaligned32 (GetWorker (TokenNumber));
+  return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));
 }
 
 
@@ -155,9 +149,7 @@ DxePcdGet64 (
   IN PCD_TOKEN_NUMBER          TokenNumber
   )
 {
-  ASSERT (sizeof (UINT64) == DxePcdGetSize (TokenNumber));
-  
-  return ReadUnaligned64(GetWorker (TokenNumber));
+  return ReadUnaligned64(GetWorker (TokenNumber, sizeof (UINT64)));
 }
 
 
@@ -168,7 +160,7 @@ DxePcdGetPtr (
   IN PCD_TOKEN_NUMBER          TokenNumber
   )
 {
-  return GetWorker (TokenNumber);
+  return GetWorker (TokenNumber, 0);
 }
 
 
@@ -179,9 +171,7 @@ DxePcdGetBool (
   IN PCD_TOKEN_NUMBER          TokenNumber
   )
 {
-  ASSERT (sizeof (BOOLEAN) == DxePcdGetSize (TokenNumber));
-  
-  return *((BOOLEAN *) GetWorker (TokenNumber));
+  return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));
 }
 
 
@@ -224,7 +214,7 @@ DxePcdGet16Ex (
   IN PCD_TOKEN_NUMBER     ExTokenNumber
   )
 {
-  return *((UINT16 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));
+  return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));
 }
 
 
@@ -236,7 +226,7 @@ DxePcdGet32Ex (
   IN PCD_TOKEN_NUMBER      ExTokenNumber
   )
 {
-  return *((UINT32 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));
+  return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));
 }
 
 
@@ -248,10 +238,7 @@ DxePcdGet64Ex (
   IN PCD_TOKEN_NUMBER      ExTokenNumber
   )
 {
-  //
-  // BugBug: Must be changed to ReadUnaligned64
-  //
-  return *((UINT64 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT64)));
+  return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT64)));
 }
 
 
@@ -287,11 +274,7 @@ DxePcdGetSizeEx (
   IN PCD_TOKEN_NUMBER      ExTokenNumber
   )
 {
-  EX_PCD_ENTRY_ATTRIBUTE    Attr;
-  
-  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);
-
-  return Attr.Size;
+  return DxePcdGetSize(GetExPcdTokenNumber (Guid, ExTokenNumber));
 }