[PATCH 6/8] QuarkSocPkg/SmmControlPei: Update MM PPI usages.

["Marvin Häuser" <Marvin.Haeuser@outlook.com>]

Update all references to the SMM PPIs from MdeModulePkg to rather use
MdePkg's MM PPI declarations.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
---
 QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.c   | 24 ++++++++++----------
 QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.inf |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.c b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.c
index 4d19c8f89b0b..98f83d2ce82b 100644
--- a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.c
+++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.c
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <PiPei.h>
 
-#include <Ppi/SmmControl.h>
+#include <Ppi/MmControl.h>
 
 #include <Library/DebugLib.h>
 #include <Library/HobLib.h>
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   @param  PeiServices         Describes the list of possible PEI Services.
   @param  This                A pointer to an instance of
-                              EFI_SMM_CONTROL_PPI
+                              EFI_PEI_MM_CONTROL_PPI
   @param  ArgumentBuffer      The argument buffer
   @param  ArgumentBufferSize  The size of the argument buffer
   @param  Periodic            TRUE to indicate a periodical SMI
@@ -48,7 +48,7 @@ EFI_STATUS
 EFIAPI
 PeiActivate (
   IN      EFI_PEI_SERVICES           **PeiServices,
-  IN      PEI_SMM_CONTROL_PPI        *This,
+  IN      EFI_PEI_MM_CONTROL_PPI     *This,
   IN OUT  INT8                       *ArgumentBuffer OPTIONAL,
   IN OUT  UINTN                      *ArgumentBufferSize OPTIONAL,
   IN      BOOLEAN                    Periodic OPTIONAL,
@@ -59,7 +59,7 @@ PeiActivate (
   Clears an SMI.
 
   @param  PeiServices         Describes the list of possible PEI Services.
-  @param  This                Pointer to an instance of EFI_SMM_CONTROL_PPI
+  @param  This                Pointer to an instance of EFI_PEI_MM_CONTROL_PPI
   @param  Periodic            TRUE to indicate a periodical SMI
 
   @return Return value from SmmClear()
@@ -69,18 +69,18 @@ EFI_STATUS
 EFIAPI
 PeiDeactivate (
   IN  EFI_PEI_SERVICES            **PeiServices,
-  IN  PEI_SMM_CONTROL_PPI         *This,
+  IN  EFI_PEI_MM_CONTROL_PPI      *This,
   IN  BOOLEAN                     Periodic OPTIONAL
   );
 
-PEI_SMM_CONTROL_PPI      mSmmControlPpi = {
+EFI_PEI_MM_CONTROL_PPI      mSmmControlPpi = {
   PeiActivate,
   PeiDeactivate
 };
 
 EFI_PEI_PPI_DESCRIPTOR   mPpiList = {
   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
-  &gPeiSmmControlPpiGuid,
+  &gEfiPeiMmControlPpiGuid,
   &mSmmControlPpi
 };
 
@@ -177,7 +177,7 @@ Returns:
 
   @param  PeiServices         Describes the list of possible PEI Services.
   @param  This                A pointer to an instance of
-                              EFI_SMM_CONTROL_PPI
+                              EFI_PEI_MM_CONTROL_PPI
   @param  ArgumentBuffer      The argument buffer
   @param  ArgumentBufferSize  The size of the argument buffer
   @param  Periodic            TRUE to indicate a periodical SMI
@@ -191,7 +191,7 @@ EFI_STATUS
 EFIAPI
 PeiActivate (
   IN      EFI_PEI_SERVICES           **PeiServices,
-  IN      PEI_SMM_CONTROL_PPI        *This,
+  IN      EFI_PEI_MM_CONTROL_PPI     *This,
   IN OUT  INT8                       *ArgumentBuffer OPTIONAL,
   IN OUT  UINTN                      *ArgumentBufferSize OPTIONAL,
   IN      BOOLEAN                    Periodic OPTIONAL,
@@ -232,7 +232,7 @@ PeiActivate (
   Clears an SMI.
 
   @param  PeiServices         Describes the list of possible PEI Services.
-  @param  This                Pointer to an instance of EFI_SMM_CONTROL_PPI
+  @param  This                Pointer to an instance of EFI_PEI_MM_CONTROL_PPI
   @param  Periodic            TRUE to indicate a periodical SMI
 
   @return Return value from SmmClear()
@@ -242,7 +242,7 @@ EFI_STATUS
 EFIAPI
 PeiDeactivate (
   IN  EFI_PEI_SERVICES            **PeiServices,
-  IN  PEI_SMM_CONTROL_PPI         *This,
+  IN  EFI_PEI_MM_CONTROL_PPI      *This,
   IN  BOOLEAN                     Periodic OPTIONAL
   )
 {
@@ -255,7 +255,7 @@ PeiDeactivate (
 /**
   This is the constructor for the SMM Control Ppi.
 
-  This function installs EFI_SMM_CONTROL_PPI.
+  This function installs EFI_PEI_MM_CONTROL_PPI.
 
   @param   FileHandle       Handle of the file being invoked.
   @param   PeiServices      Describes the list of possible PEI Services.
diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.inf b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.inf
index 6b1dd1bcfd1c..0a98e5739416 100644
--- a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.inf
+++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmControlPei/SmmControlPei.inf
@@ -46,7 +46,7 @@ [LibraryClasses]
   QNCAccessLib
 
 [Ppis]
-  gPeiSmmControlPpiGuid                        # ALWAYS_PRODUCED
+  gEfiPeiMmControlPpiGuid                      # ALWAYS_PRODUCED
 
 [Pcd]
   gEfiQuarkNcSocIdTokenSpaceGuid.PcdPm1blkIoBaseAddress
-- 
2.18.0.windows.1