Merge branch of PI tree to main trunk

[mirror_edk2.git] / MdeModulePkg / Core / Pei / Ppi / Ppi.c

diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index e429b665a28c8ffa7adba12cce8a06ed5b77cb5d..2ee45c44f7c1e5f387565ee9f82e85f171150ac6 100644 (file)
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -25,7 +25,7 @@ Revision History
 \r
 VOID\r
 InitializePpiServices (\r
-  IN EFI_PEI_SERVICES  **PeiServices,\r
+  IN PEI_CORE_INSTANCE *PrivateData,\r
   IN PEI_CORE_INSTANCE *OldCoreData\r
   )\r
 /*++\r
@@ -45,11 +45,7 @@ Returns:
 \r
 --*/\r
 {\r
-  PEI_CORE_INSTANCE                    *PrivateData;\r
-  \r
   if (OldCoreData == NULL) {\r
-    PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r
-\r
     PrivateData->PpiData.NotifyListEnd = MAX_PPI_DESCRIPTORS-1;\r
     PrivateData->PpiData.DispatchListEnd = MAX_PPI_DESCRIPTORS-1;\r
     PrivateData->PpiData.LastDispatchedNotify = MAX_PPI_DESCRIPTORS-1;\r
@@ -220,7 +216,7 @@ Returns:
   // Dispatch any callback level notifies for newly installed PPIs.\r
   //\r
   DispatchNotify (\r
-    (CONST EFI_PEI_SERVICES **) PeiServices,\r
+    PrivateData,\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     LastCallbackInstall,\r
     PrivateData->PpiData.PpiListEnd,\r
@@ -298,7 +294,7 @@ Returns:
   // Dispatch any callback level notifies for the newly installed PPI.\r
   //\r
   DispatchNotify (\r
-    (CONST EFI_PEI_SERVICES **) PeiServices,\r
+    PrivateData,\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     Index,\r
     Index+1,\r
@@ -496,7 +492,7 @@ Returns:
   // Dispatch any callback level notifies for all previously installed PPIs.\r
   //\r
   DispatchNotify (\r
-    (CONST EFI_PEI_SERVICES **) PeiServices,\r
+    PrivateData,\r
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,\r
     0,\r
     PrivateData->PpiData.PpiListEnd,\r
@@ -511,7 +507,7 @@ Returns:
 \r
 VOID\r
 ProcessNotifyList (\r
-  IN EFI_PEI_SERVICES    **PeiServices\r
+  IN PEI_CORE_INSTANCE  *PrivateData\r
   )\r
 /*++\r
 \r
@@ -528,11 +524,7 @@ Returns:
 --*/\r
 \r
 {\r
-  PEI_CORE_INSTANCE       *PrivateData;\r
   INTN                    TempValue;\r
-\r
-  PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r
-\r
  \r
   while (TRUE) {\r
     //\r
@@ -545,7 +537,7 @@ Returns:
     while (PrivateData->PpiData.LastDispatchedNotify != PrivateData->PpiData.DispatchListEnd) {\r
       TempValue = PrivateData->PpiData.DispatchListEnd;\r
       DispatchNotify (\r
-        (CONST EFI_PEI_SERVICES **) PeiServices,\r
+        PrivateData,\r
         EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH,\r
         0,\r
         PrivateData->PpiData.LastDispatchedInstall,\r
@@ -566,7 +558,7 @@ Returns:
     while (PrivateData->PpiData.LastDispatchedInstall != PrivateData->PpiData.PpiListEnd) {\r
       TempValue = PrivateData->PpiData.PpiListEnd;\r
       DispatchNotify (\r
-        (CONST EFI_PEI_SERVICES **) PeiServices,\r
+        PrivateData,\r
         EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH,\r
         PrivateData->PpiData.LastDispatchedInstall,\r
         PrivateData->PpiData.PpiListEnd,\r
@@ -585,7 +577,7 @@ Returns:
 \r
 VOID\r
 DispatchNotify (\r
-  IN CONST EFI_PEI_SERVICES    **PeiServices,\r
+  IN PEI_CORE_INSTANCE  *PrivateData,\r
   IN UINTN               NotifyType,\r
   IN INTN                InstallStartIndex,\r
   IN INTN                InstallStopIndex,\r
@@ -612,15 +604,12 @@ Returns:  None
 --*/\r
 \r
 {\r
-  PEI_CORE_INSTANCE       *PrivateData;\r
   INTN                   Index1;\r
   INTN                   Index2;\r
   EFI_GUID                *SearchGuid;\r
   EFI_GUID                *CheckGuid;\r
   EFI_PEI_NOTIFY_DESCRIPTOR   *NotifyDescriptor;\r
 \r
-  PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS(PeiServices);\r
-\r
   //\r
   // Remember that Installs moves up and Notifies moves down.\r
   //\r
@@ -645,7 +634,7 @@ Returns:  None
           NotifyDescriptor->Notify\r
           ));\r
         NotifyDescriptor->Notify (\r
-                            (EFI_PEI_SERVICES **)PeiServices,\r
+                            GetPeiServicesTablePointer (),\r
                             NotifyDescriptor,\r
                             (PrivateData->PpiData.PpiListPtrs[Index2].Ppi)->Ppi\r
                             );\r