MdeModulePkg/VariableInfo: switch to MM communicate 2 protocol

[mirror_edk2.git] / MdeModulePkg / Application / VariableInfo / VariableInfo.c

diff --git a/MdeModulePkg/Application/VariableInfo/VariableInfo.c b/MdeModulePkg/Application/VariableInfo/VariableInfo.c
index c04ba182132faa44c2fdc224a177c1e085fc1d3f..a7df365b58958dc2e7726d0b7f3573e52ece797b 100644 (file)
--- a/MdeModulePkg/Application/VariableInfo/VariableInfo.c
+++ b/MdeModulePkg/Application/VariableInfo/VariableInfo.c
@@ -20,10 +20,10 @@
 #include <Guid/VariableFormat.h>\r
 #include <Guid/SmmVariableCommon.h>\r
 #include <Guid/PiSmmCommunicationRegionTable.h>\r
-#include <Protocol/SmmCommunication.h>\r
+#include <Protocol/MmCommunication2.h>\r
 #include <Protocol/SmmVariable.h>\r
 \r
-EFI_SMM_COMMUNICATION_PROTOCOL  *mSmmCommunication = NULL;\r
+EFI_MM_COMMUNICATION2_PROTOCOL  *mMmCommunication2 = NULL;\r
 \r
 /**\r
   This function get the variable statistics data from SMM variable driver.\r
@@ -41,7 +41,7 @@ EFI_SMM_COMMUNICATION_PROTOCOL  *mSmmCommunication = NULL;
 EFI_STATUS\r
 EFIAPI\r
 GetVariableStatisticsData (\r
-  IN OUT  EFI_SMM_COMMUNICATE_HEADER  *SmmCommunicateHeader,\r
+  IN OUT  EFI_MM_COMMUNICATE_HEADER   *SmmCommunicateHeader,\r
   IN OUT  UINTN                       *SmmCommunicateSize\r
   )\r
 {\r
@@ -49,12 +49,15 @@ GetVariableStatisticsData (
   SMM_VARIABLE_COMMUNICATE_HEADER     *SmmVariableFunctionHeader;\r
 \r
   CopyGuid (&SmmCommunicateHeader->HeaderGuid, &gEfiSmmVariableProtocolGuid);\r
-  SmmCommunicateHeader->MessageLength = *SmmCommunicateSize - OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
+  SmmCommunicateHeader->MessageLength = *SmmCommunicateSize - OFFSET_OF (EFI_MM_COMMUNICATE_HEADER, Data);\r
 \r
   SmmVariableFunctionHeader = (SMM_VARIABLE_COMMUNICATE_HEADER *) &SmmCommunicateHeader->Data[0];\r
   SmmVariableFunctionHeader->Function = SMM_VARIABLE_FUNCTION_GET_STATISTICS;\r
 \r
-  Status = mSmmCommunication->Communicate (mSmmCommunication, SmmCommunicateHeader, SmmCommunicateSize);\r
+  Status = mMmCommunication2->Communicate (mMmCommunication2,\r
+                                           SmmCommunicateHeader,\r
+                                           SmmCommunicateHeader,\r
+                                           SmmCommunicateSize);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = SmmVariableFunctionHeader->ReturnStatus;\r
@@ -76,7 +79,7 @@ PrintInfoFromSmm (
 {\r
   EFI_STATUS                                     Status;\r
   VARIABLE_INFO_ENTRY                            *VariableInfo;\r
-  EFI_SMM_COMMUNICATE_HEADER                     *CommBuffer;\r
+  EFI_MM_COMMUNICATE_HEADER                      *CommBuffer;\r
   UINTN                                          RealCommSize;\r
   UINTN                                          CommSize;\r
   SMM_VARIABLE_COMMUNICATE_HEADER                *FunctionHeader;\r
@@ -92,7 +95,7 @@ PrintInfoFromSmm (
     return Status;\r
   }\r
 \r
-  Status = gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &mSmmCommunication);\r
+  Status = gBS->LocateProtocol (&gEfiMmCommunication2ProtocolGuid, NULL, (VOID **) &mMmCommunication2);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -117,7 +120,7 @@ PrintInfoFromSmm (
         if (Size > MaxSize) {\r
           MaxSize = Size;\r
           RealCommSize = MaxSize;\r
-          CommBuffer = (EFI_SMM_COMMUNICATE_HEADER *) (UINTN) Entry->PhysicalStart;\r
+          CommBuffer = (EFI_MM_COMMUNICATE_HEADER *) (UINTN) Entry->PhysicalStart;\r
         }\r
       }\r
     }\r