Make sure Pcd service driver can work on 64-bit architecture.

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

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index ffb62256c3b5b781eab35949b8aa74e130e22185..d0f85d242e70e1f9e6213925043c26095c5399b4 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -74,7 +74,7 @@ PcdDxeInit (
   //\r
   // Make sure the Pcd Protocol is not already installed in the system\r
   //\r
-  \r
+\r
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gPcdProtocolGuid);\r
   \r
   BuildPcdDxeDataBase ();\r
@@ -274,7 +274,7 @@ DxePcdGetSizeEx (
   IN UINTN                 ExTokenNumber\r
   )\r
 {\r
-  return DxePcdGetSize(GetExPcdTokenNumber (Guid, ExTokenNumber));\r
+  return DxePcdGetSize(GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber));\r
 }\r
 \r
 \r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index 8cb08dcd7c4e5a9860ddd4a70dcb6472e3712f05..4b86cd7795ca38eab1f7871d58e2955bc4a97916 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -83,7 +83,7 @@ GetWorker (
   switch (LocalTokenNumber & ~PCD_DATABASE_OFFSET_MASK) {\r
     case PCD_TYPE_VPD:\r
       VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);\r
-      return (VOID *) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
+      return (VOID *) (UINTN) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
       \r
     case PCD_TYPE_HII:\r
       GuidTable   = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
@@ -134,7 +134,7 @@ DxeRegisterCallBackWorker (
   LIST_ENTRY              *ListNode;\r
 \r
   if (Guid != NULL) {\r
-    TokenNumber = GetExPcdTokenNumber (Guid, TokenNumber);\r
+    TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) TokenNumber);\r
   }\r
 \r
   ListHead = &mCallbackFnTable[TokenNumber];\r
@@ -177,7 +177,7 @@ DxeUnRegisterCallBackWorker (
   LIST_ENTRY              *ListNode;\r
 \r
   if (Guid != NULL) {\r
-    TokenNumber = GetExPcdTokenNumber (Guid, TokenNumber);\r
+    TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) TokenNumber);\r
   }\r
 \r
   ListHead = &mCallbackFnTable[TokenNumber];\r
@@ -398,15 +398,15 @@ GetSkuEnabledTokenNumber (
   switch (LocalTokenNumber & ~PCD_DATABASE_OFFSET_MASK) {\r
     case PCD_TYPE_VPD:\r
       Value = (UINT8 *) &(((VPD_HEAD *) Value)[i]);\r
-      return ((Value - PcdDb) | PCD_TYPE_VPD);\r
+      return (UINT32) ((Value - PcdDb) | PCD_TYPE_VPD);\r
 \r
     case PCD_TYPE_HII:\r
       Value = (UINT8 *) &(((VARIABLE_HEAD *) Value)[i]);\r
-      return ((Value - PcdDb) | PCD_TYPE_HII);\r
+      return (UINT32) ((Value - PcdDb) | PCD_TYPE_HII);\r
       \r
     case PCD_TYPE_DATA:\r
       Value += Size * i;\r
-      return (Value - PcdDb);\r
+      return (UINT32) (Value - PcdDb);\r
       \r
     default:\r
       ASSERT (FALSE);\r
@@ -583,7 +583,7 @@ ExGetWorker (
   IN UINTN                  GetSize\r
   ) \r
 {\r
-  return GetWorker(GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);\r
+  return GetWorker(GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber), GetSize);\r
 }\r
 \r
 \r
@@ -601,9 +601,9 @@ ExSetWorker (
 {\r
   UINTN                   TokenNumber;\r
   \r
-  TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
+  TokenNumber = GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber);\r
 \r
-  InvokeCallbackOnSet (ExTokenNumber, Guid, TokenNumber, Data, SetSize);\r
+  InvokeCallbackOnSet ((UINT32) ExTokenNumber, Guid, TokenNumber, Data, SetSize);\r
 \r
   SetWorker (TokenNumber, Data, SetSize, PtrType);\r
 \r
@@ -672,7 +672,7 @@ SetHiiVariable (
 UINTN           \r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
-  IN UINTN                      ExTokenNumber\r
+  IN UINT32                     ExTokenNumber\r
   )\r
 {\r
   UINT32              i;\r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h
index 2784d28891c3252706334921542103851bc434cb..59ec06352e6b752ae2a957700dfbd1de43b31d3e 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.h
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h
@@ -119,7 +119,7 @@ BuildPcdDxeDataBase (
 UINTN           \r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
-  IN UINTN                      ExTokenNumber\r
+  IN UINT32                     ExTokenNumber\r
   )\r
 ;\r
 //\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd b/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
index 816cf6f86950bf62de285b269031163e85d3c59a..5defea7d7d16c81f7b9f6002190c40c585d79140 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>PeimEntryPoint</Library>\r
     <Library>BaseLib</Library>\r
     <Library>PeiCoreLib</Library>\r
-    <Library>PeiServicesTablePointerLib</Library>\r
+    <Library OverrideID="4444">PeiServicesTablePointerLib</Library>\r
     <Library>PeiHobLib</Library>\r
     <Library>BaseDebugLibReportStatusCode</Library>\r
     <Library>PeiMemoryLib</Library>\r