Base on PI spec, GetPeiServicesTablePointer is updated to return CONST EFI_PEI_SERVIC...

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

diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Image/Image.c
index efe8c83b101b8a7a4679dc5f39861b8abcfbe9e0..25c6330db79cef7b217705aa59ea6e1f99e6ccf0 100644 (file)
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -215,7 +215,7 @@ LoadAndRelocatePeCoffImage (
 **/\r
 EFI_STATUS\r
 PeiLoadImageLoadImage (\r
-  IN     EFI_PEI_SERVICES             **PeiServices,\r
+  IN     CONST EFI_PEI_SERVICES       **PeiServices,\r
   IN     EFI_PEI_FILE_HANDLE          FileHandle,\r
   OUT    EFI_PHYSICAL_ADDRESS         *ImageAddressArg,  OPTIONAL\r
   OUT    UINT64                       *ImageSizeArg,     OPTIONAL\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index b086f70c206ce5214cafdb9ff7e6a635fbcf1c14..2e83e660e075cc6db17e8a87d2dc95d3ae408773 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -68,6 +68,8 @@
   CacheMaintenanceLib\r
   PeCoffLib\r
   PeiPiLib\r
+  PeiServicesTablePointerLib\r
+  \r
 \r
 [Guids]\r
   gPeiAprioriFileNameGuid\r

diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index c121c5206451c5601b5371bdd9a31971c70baacc..13b1588177185c356c191b873032a631daf63689 100644 (file)
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -574,7 +574,7 @@ DispatchNotify (
           NotifyDescriptor->Notify\r
           ));\r
         NotifyDescriptor->Notify (\r
-                            GetPeiServicesTablePointer (),\r
+                            (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
                             NotifyDescriptor,\r
                             (PrivateData->PpiData.PpiListPtrs[Index2].Ppi)->Ppi\r
                             );\r

diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c
index 517d38130bd72b4d5538785d4b1a316a19e15247..14261240054db6e1979b5517ed6628b9c4b11f5a 100644 (file)
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -403,7 +403,7 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 FindVariable (\r
-  IN EFI_PEI_SERVICES         **PeiServices,\r
+  IN CONST EFI_PEI_SERVICES   **PeiServices,\r
   IN CONST  CHAR16            *VariableName,\r
   IN CONST  EFI_GUID          *VendorGuid,\r
   OUT VARIABLE_POINTER_TRACK  *PtrTrack\r
@@ -582,7 +582,7 @@ Returns:
   VARIABLE_POINTER_TRACK  Variable;\r
   UINTN                   VarDataSize;\r
   EFI_STATUS              Status;\r
-  EFI_PEI_SERVICES        **PeiServices;\r
+  CONST EFI_PEI_SERVICES  **PeiServices;\r
 \r
   PeiServices = GetPeiServicesTablePointer ();\r
   if (VariableName == NULL || VariableGuid == NULL || DataSize == NULL) {\r
@@ -659,7 +659,7 @@ Returns:
   VARIABLE_POINTER_TRACK  Variable;\r
   UINTN                   VarNameSize;\r
   EFI_STATUS              Status;\r
-  EFI_PEI_SERVICES        **PeiServices;\r
+  CONST EFI_PEI_SERVICES  **PeiServices;\r
 \r
   PeiServices = GetPeiServicesTablePointer ();\r
   if (VariableName == NULL || VariableGuid == NULL || VariableNameSize == NULL) {\r