Change the function name.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3933 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
index 053831235b70d81b32cb57ac6cb3f6358d540aa4..ab3395547cec7abcb2f2583a8f81c3371daa4d0e 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c
@@ -26,7 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-Recovery (\r
+PeiRecoverFirmware (\r
   VOID\r
   )\r
 {\r

diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
index 875e1169f2301c3abe724c2c1e8b2d8b93c33222..44a870a6870d1b78ec9df6e64ae0a185130e32b1 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
+++ b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c
@@ -19,14 +19,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Ppi/S3Resume.h>\r
 \r
 /**\r
-  Calling this function causes the system restore config from S3.\r
+  This function is responsible for calling the S3 resume vector in the ACPI Tables.\r
   \r
   @retval EFI_SUCESS   Sucess to restore config from S3.\r
   @retval Others       Fail to restore config from S3.\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-S3RestoreConfig (\r
+AcpiS3ResumeOs (\r
   VOID\r
   )\r
 {\r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 2042efae6dd697ee91c0585e0d0dc4f6fdd372b4..8784822496251ab8fbb87fd688ea80243dafd084 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -196,10 +196,10 @@ DxeLoadCore (
   ASSERT_EFI_ERROR(Status);\r
 \r
   if (BootMode == BOOT_ON_S3_RESUME) {\r
-    Status = S3RestoreConfig();\r
+    Status = AcpiS3ResumeOs();\r
     ASSERT_EFI_ERROR (Status);\r
   } else if (BootMode == BOOT_IN_RECOVERY_MODE) {\r
-    Status = Recovery ();\r
+    Status = PeiRecoverFirmware ();\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "Load Recovery Capsule Failed.(Status = %r)\n", Status));\r
       CpuDeadLoop ();\r

diff --git a/MdeModulePkg/Include/Library/RecoveryLib.h b/MdeModulePkg/Include/Library/RecoveryLib.h
index 6ec4c58b8bf46bd9a346ed0d83bcb9d8cf93f74f..deabf9fdedeab6edf9f54bddadbe6dd8b86b23bb 100644 (file)
--- a/MdeModulePkg/Include/Library/RecoveryLib.h
+++ b/MdeModulePkg/Include/Library/RecoveryLib.h
@@ -23,7 +23,7 @@
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-Recovery (\r
+PeiRecoverFirmware (\r
   VOID\r
   )\r
 ;\r

diff --git a/MdeModulePkg/Include/Library/S3Lib.h b/MdeModulePkg/Include/Library/S3Lib.h
index 0059e0193c4dab458b12d49c90652261a81febc2..ede541ab6c27c43cb1dd710401672b20699965c6 100644 (file)
--- a/MdeModulePkg/Include/Library/S3Lib.h
+++ b/MdeModulePkg/Include/Library/S3Lib.h
@@ -16,14 +16,14 @@
 #define __S3_LIB_H__\r
 \r
 /**\r
-  Calling this function causes the system restore config from S3.\r
+  This function is responsible for calling the S3 resume vector in the ACPI Tables.\r
   \r
   @retval EFI_SUCESS   Sucess to restore config from S3.\r
   @retval Others       Fail to restore config from S3.\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-S3RestoreConfig (\r
+AcpiS3ResumeOs (\r
   VOID\r
   )\r
 ;\r

diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
index 26389556886f1bb1cbe1e3dee0625a55ed02957b..00dbc85eaa0dbb69abbe8d3d80a8261e571a0244 100644 (file)
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
+++ b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c
@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-Recovery (\r
+PeiRecoverFirmware (\r
   VOID\r
   )\r
 {\r

diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
index 5bf65f9377c70f0955d50a96ea199a48c6bf5052..b8ea626322eef301495d408797d379592b8af990 100644 (file)
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
+++ b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
@@ -14,14 +14,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <PiPei.h>\r
 \r
 /**\r
-  Calling this function causes the system restore config from S3.\r
+  This function is responsible for calling the S3 resume vector in the ACPI Tables.\r
   \r
   @retval EFI_SUCESS   Sucess to restore config from S3.\r
   @retval Others       Fail to restore config from S3.\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-S3RestoreConfig (\r
+AcpiS3ResumeOs (\r
   VOID\r
   )\r
 {\r