Fix build break.

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / ReadOnlyVariable2OnReadOnlyVariableThunk / ReadOnlyVariable2OnReadOnlyVariableThunk.c

diff --git a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2OnReadOnlyVariableThunk/ReadOnlyVariable2OnReadOnlyVariableThunk.c b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2OnReadOnlyVariableThunk/ReadOnlyVariable2OnReadOnlyVariableThunk.c
index 2de6c92785d08e5db7aa75d6619e4b18aa3ed466..80ed6d602881b976f6eb0f5fe2e39a4ca8dd1445 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2OnReadOnlyVariableThunk/ReadOnlyVariable2OnReadOnlyVariableThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2OnReadOnlyVariableThunk/ReadOnlyVariable2OnReadOnlyVariableThunk.c
@@ -26,7 +26,6 @@ Module Name:
 #include <PiPei.h>\r
 #include <Ppi/ReadOnlyVariable2.h>\r
 #include <Ppi/ReadOnlyVariable.h>\r
-#include <Ppi/ReadOnlyVariableThunkPresent.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/PeiServicesTablePointerLib.h>\r
 #include <Library/PeiServicesLib.h>\r
@@ -69,12 +68,6 @@ EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable = {
 };\r
 \r
 \r
-EFI_PEI_PPI_DESCRIPTOR     mReadOnlyVariableThunkPresent = {\r
-    (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
-    &gPeiReadonlyVariableThunkPresentPpiGuid,\r
-    NULL\r
-};\r
-\r
 /**\r
   User entry for this PEIM driver.\r
   \r
@@ -92,8 +85,6 @@ PeimInitializeReadOnlyVariable2 (
   IN CONST EFI_PEI_SERVICES    **PeiServices\r
   )\r
 {\r
-  VOID        *Interface;\r
-  EFI_STATUS  Status;\r
   //\r
   // This thunk module can only be used together with a PI PEI core, as we \r
   // assume PeiServices Pointer Table can be located in a standard way defined\r
@@ -102,15 +93,9 @@ PeimInitializeReadOnlyVariable2 (
   ASSERT ((*PeiServices)->Hdr.Revision >= 0x00010000);\r
 \r
   //\r
-  // Make sure ReadOnlyVariable2ToReadOnlyVariable module is not present. If so, the call chain will form a\r
-  // infinite loop: ReadOnlyVariable2 -> ReadOnlyVariable -> ReadOnlyVariable2 -> ....\r
+  // Developer should make sure ReadOnlyVariable2ToReadOnlyVariable module is not present. or else, the call chain will form a\r
+  // infinite loop: ReadOnlyVariable2 -> ReadOnlyVariable -> ReadOnlyVariable2 -> .....\r
   //\r
-  Status = PeiServicesLocatePpi (&gPeiReadonlyVariableThunkPresentPpiGuid, 0, NULL, &Interface);\r
-  ASSERT (Status == EFI_NOT_FOUND);\r
-  \r
-  Status = PeiServicesInstallPpi (&mReadOnlyVariableThunkPresent);\r
-  ASSERT_EFI_ERROR (Status);\r
-  \r
   //\r
   // Publish the variable capability to other modules\r
   //\r
@@ -154,7 +139,7 @@ PeiGetVariable (
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return ReadOnlyVariable->PeiGetVariable (\r
+  return ReadOnlyVariable->GetVariable (\r
                              (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
                              (CHAR16 *)VariableName,\r
                              (EFI_GUID *)VariableGuid,\r
@@ -199,7 +184,7 @@ PeiGetNextVariableName (
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return ReadOnlyVariable->PeiGetNextVariableName (\r
+  return ReadOnlyVariable->GetNextVariableName (\r
                              (EFI_PEI_SERVICES **) GetPeiServicesTablePointer (),\r
                              VariableNameSize,\r
                              VariableName,\r