[PATCH 5/8] QuarkSocPkg/SmmAccessPei: 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/SmmAccessPei/SmmAccessPei.c   | 48 ++++++++++----------
 QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c
index 70fdf096117f..6686d87a3fda 100644
--- a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c
+++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 #include <PiPei.h>
-#include <Ppi/SmmAccess.h>
+#include <Ppi/MmAccess.h>
 #include <Guid/SmramMemoryReserve.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
@@ -29,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   CR ( \
   a, \
   SMM_ACCESS_PRIVATE_DATA, \
-  SmmAccess, \
+  MmAccess, \
   SMM_ACCESS_PRIVATE_DATA_SIGNATURE \
   )
 
@@ -39,7 +39,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef struct {
   UINTN                            Signature;
   EFI_HANDLE                       Handle;
-  PEI_SMM_ACCESS_PPI               SmmAccess;
+  EFI_PEI_MM_ACCESS_PPI            MmAccess;
   UINTN                            NumberRegions;
   EFI_SMRAM_DESCRIPTOR             SmramDesc[MAX_SMRAM_RANGES];
   UINT8                            TsegSize;
@@ -55,7 +55,7 @@ EFI_STATUS
 EFIAPI
 Open (
   IN EFI_PEI_SERVICES           **PeiServices,
-  IN PEI_SMM_ACCESS_PPI         *This,
+  IN EFI_PEI_MM_ACCESS_PPI      *This,
   IN UINTN                      DescriptorIndex
   )
 /*++
@@ -70,7 +70,7 @@ Routine Description:
 Arguments:
 
   PeiServices      - General purpose services available to every PEIM.
-  This             -  Pointer to the SMM Access Interface.
+  This             -  Pointer to the MM Access Interface.
   DescriptorIndex  -  Region of SMRAM to Open.
 
 Returns:
@@ -102,7 +102,7 @@ Returns:
 
   SmmAccess->SmramDesc[DescriptorIndex].RegionState &= ~(EFI_SMRAM_CLOSED | EFI_ALLOCATED);
   SmmAccess->SmramDesc[DescriptorIndex].RegionState |= EFI_SMRAM_OPEN;
-  SmmAccess->SmmAccess.OpenState = TRUE;
+  SmmAccess->MmAccess.OpenState = TRUE;
 
   return EFI_SUCCESS;
 }
@@ -111,7 +111,7 @@ EFI_STATUS
 EFIAPI
 Close (
   IN EFI_PEI_SERVICES        **PeiServices,
-  IN PEI_SMM_ACCESS_PPI      *This,
+  IN EFI_PEI_MM_ACCESS_PPI   *This,
   IN UINTN                   DescriptorIndex
   )
 /*++
@@ -124,7 +124,7 @@ Routine Description:
 Arguments:
 
   PeiServices      - General purpose services available to every PEIM.
-  This             -  Pointer to the SMM Access Interface.
+  This             -  Pointer to the MM Access Interface.
   DescriptorIndex  -  Region of SMRAM to Close.
 
 Returns:
@@ -174,7 +174,7 @@ Returns:
     }
   }
 
-  SmmAccess->SmmAccess.OpenState = OpenState;
+  SmmAccess->MmAccess.OpenState = OpenState;
 
   return EFI_SUCCESS;
 }
@@ -183,7 +183,7 @@ EFI_STATUS
 EFIAPI
 Lock (
   IN EFI_PEI_SERVICES          **PeiServices,
-  IN PEI_SMM_ACCESS_PPI        *This,
+  IN EFI_PEI_MM_ACCESS_PPI     *This,
   IN UINTN                     DescriptorIndex
   )
 /*++
@@ -198,7 +198,7 @@ Routine Description:
 Arguments:
 
   PeiServices      - General purpose services available to every PEIM.
-  This             -  Pointer to the SMM Access Interface.
+  This             -  Pointer to the MM Access Interface.
   DescriptorIndex  -  Region of SMRAM to Lock.
 
 Returns:
@@ -216,12 +216,12 @@ Returns:
 
   if (DescriptorIndex >= SmmAccess->NumberRegions) {
     return EFI_INVALID_PARAMETER;
-  } else if (SmmAccess->SmmAccess.OpenState) {
+  } else if (SmmAccess->MmAccess.OpenState) {
     return EFI_DEVICE_ERROR;
   }
 
   SmmAccess->SmramDesc[DescriptorIndex].RegionState |= EFI_SMRAM_LOCKED;
-  SmmAccess->SmmAccess.LockState                     = TRUE;
+  SmmAccess->MmAccess.LockState                     = TRUE;
 
   //
   // Lock TSEG
@@ -235,7 +235,7 @@ EFI_STATUS
 EFIAPI
 GetCapabilities (
   IN EFI_PEI_SERVICES                **PeiServices,
-  IN PEI_SMM_ACCESS_PPI              *This,
+  IN EFI_PEI_MM_ACCESS_PPI           *This,
   IN OUT UINTN                       *SmramMapSize,
   IN OUT EFI_SMRAM_DESCRIPTOR        *SmramMap
   )
@@ -293,7 +293,7 @@ SmmAccessPeiEntryPoint (
 
 Routine Description:
 
-    This is the constructor for the SMM Access Ppi
+    This is the constructor for the MM Access Ppi
 
 Arguments:
 
@@ -354,17 +354,17 @@ Returns:
     SmmAccessPrivate->SmramDesc[Index].RegionState   = DescriptorBlock->Descriptor[Index].RegionState;
   }
 
-  SmmAccessPrivate->NumberRegions              = Index;
-  SmmAccessPrivate->SmmAccess.Open             = Open;
-  SmmAccessPrivate->SmmAccess.Close            = Close;
-  SmmAccessPrivate->SmmAccess.Lock             = Lock;
-  SmmAccessPrivate->SmmAccess.GetCapabilities  = GetCapabilities;
-  SmmAccessPrivate->SmmAccess.LockState        = FALSE;
-  SmmAccessPrivate->SmmAccess.OpenState        = FALSE;
+  SmmAccessPrivate->NumberRegions             = Index;
+  SmmAccessPrivate->MmAccess.Open             = Open;
+  SmmAccessPrivate->MmAccess.Close            = Close;
+  SmmAccessPrivate->MmAccess.Lock             = Lock;
+  SmmAccessPrivate->MmAccess.GetCapabilities  = GetCapabilities;
+  SmmAccessPrivate->MmAccess.LockState        = FALSE;
+  SmmAccessPrivate->MmAccess.OpenState        = FALSE;
 
   PpiList->Flags = (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST);
-  PpiList->Guid  = &gPeiSmmAccessPpiGuid;
-  PpiList->Ppi   = &SmmAccessPrivate->SmmAccess;
+  PpiList->Guid  = &gEfiPeiMmAccessPpiGuid;
+  PpiList->Ppi   = &SmmAccessPrivate->MmAccess;
 
   Status      = (**PeiServices).InstallPpi (PeiServices, PpiList);
   ASSERT_EFI_ERROR(Status);
diff --git a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf
index a1e4af7725ac..41566d5ecc2b 100644
--- a/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf
+++ b/QuarkSocPkg/QuarkNorthCluster/Smm/Pei/SmmAccessPei/SmmAccessPei.inf
@@ -44,7 +44,7 @@ [Guids]
   gEfiSmmPeiSmramMemoryReserveGuid             # ALWAYS_CONSUMED
 
 [Ppis]
-  gPeiSmmAccessPpiGuid                         # ALWAYS_PRODUCED
+  gEfiPeiMmAccessPpiGuid                       # ALWAYS_PRODUCED
   gEfiPeiMemoryDiscoveredPpiGuid               # ALWAYS_CONSUMED
 
 [Depex]
-- 
2.18.0.windows.1