From e8da1266b93d62d1998f73a7ec34bd54a074dbcf Mon Sep 17 00:00:00 2001 From: klu2 Date: Thu, 27 Sep 2007 03:20:28 +0000 Subject: Change the function name. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3933 6f19259b-4bc3-4df7-8a09-765794883524 --- IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c | 2 +- IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c | 4 ++-- MdeModulePkg/Core/DxeIplPeim/DxeLoad.c | 4 ++-- MdeModulePkg/Include/Library/RecoveryLib.h | 2 +- MdeModulePkg/Include/Library/S3Lib.h | 4 ++-- MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c | 2 +- MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c b/IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.c index 053831235b..ab3395547c 100644 --- 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. **/ EFI_STATUS EFIAPI -Recovery ( +PeiRecoverFirmware ( VOID ) { diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c index 875e1169f2..44a870a687 100644 --- 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 /** - Calling this function causes the system restore config from S3. + This function is responsible for calling the S3 resume vector in the ACPI Tables. @retval EFI_SUCESS Sucess to restore config from S3. @retval Others Fail to restore config from S3. **/ EFI_STATUS EFIAPI -S3RestoreConfig ( +AcpiS3ResumeOs ( VOID ) { diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c index 2042efae6d..8784822496 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c +++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c @@ -196,10 +196,10 @@ DxeLoadCore ( ASSERT_EFI_ERROR(Status); if (BootMode == BOOT_ON_S3_RESUME) { - Status = S3RestoreConfig(); + Status = AcpiS3ResumeOs(); ASSERT_EFI_ERROR (Status); } else if (BootMode == BOOT_IN_RECOVERY_MODE) { - Status = Recovery (); + Status = PeiRecoverFirmware (); if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "Load Recovery Capsule Failed.(Status = %r)\n", Status)); CpuDeadLoop (); diff --git a/MdeModulePkg/Include/Library/RecoveryLib.h b/MdeModulePkg/Include/Library/RecoveryLib.h index 6ec4c58b8b..deabf9fded 100644 --- a/MdeModulePkg/Include/Library/RecoveryLib.h +++ b/MdeModulePkg/Include/Library/RecoveryLib.h @@ -23,7 +23,7 @@ **/ EFI_STATUS EFIAPI -Recovery ( +PeiRecoverFirmware ( VOID ) ; diff --git a/MdeModulePkg/Include/Library/S3Lib.h b/MdeModulePkg/Include/Library/S3Lib.h index 0059e0193c..ede541ab6c 100644 --- a/MdeModulePkg/Include/Library/S3Lib.h +++ b/MdeModulePkg/Include/Library/S3Lib.h @@ -16,14 +16,14 @@ #define __S3_LIB_H__ /** - Calling this function causes the system restore config from S3. + This function is responsible for calling the S3 resume vector in the ACPI Tables. @retval EFI_SUCESS Sucess to restore config from S3. @retval Others Fail to restore config from S3. **/ EFI_STATUS EFIAPI -S3RestoreConfig ( +AcpiS3ResumeOs ( VOID ) ; diff --git a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.c index 2638955688..00dbc85eaa 100644 --- 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. **/ EFI_STATUS EFIAPI -Recovery ( +PeiRecoverFirmware ( VOID ) { diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c index 5bf65f9377..b8ea626322 100644 --- 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 /** - Calling this function causes the system restore config from S3. + This function is responsible for calling the S3 resume vector in the ACPI Tables. @retval EFI_SUCESS Sucess to restore config from S3. @retval Others Fail to restore config from S3. **/ EFI_STATUS EFIAPI -S3RestoreConfig ( +AcpiS3ResumeOs ( VOID ) { -- cgit v1.2.3