From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: shenglei.zhang@intel.com) Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Thu, 20 Jun 2019 20:00:10 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jun 2019 20:00:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,398,1557212400"; d="scan'208";a="358739669" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by fmsmga005.fm.intel.com with ESMTP; 20 Jun 2019 20:00:09 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Liming Gao Subject: [PATCH 2/4] IntelFrameworkModulePkg: Remove PeiS3Lib Date: Fri, 21 Jun 2019 10:59:58 +0800 Message-Id: <20190621030000.12716-3-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20190621030000.12716-1-shenglei.zhang@intel.com> References: <20190621030000.12716-1-shenglei.zhang@intel.com> PeiS3Lib has been deprecated since 2009 so remove it. https://bugzilla.tianocore.org/show_bug.cgi?id=1299 Cc: Liming Gao Signed-off-by: Shenglei Zhang --- .../Library/PeiS3Lib/PeiS3Lib.c | 45 ------------------- .../IntelFrameworkModulePkg.dsc | 1 - .../Library/PeiS3Lib/PeiS3Lib.inf | 44 ------------------ .../Library/PeiS3Lib/PeiS3Lib.uni | 18 -------- 4 files changed, 108 deletions(-) delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf delete mode 100644 IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c deleted file mode 100644 index a8583498afc1..000000000000 --- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.c +++ /dev/null @@ -1,45 +0,0 @@ -/** @file - This library provides API to invoke the S3 resume vector in the APCI Table in S3 resume mode. - - This library instance is no longer used and module using this library - class should update to directly locate EFI_PEI_S3_RESUME_PPI defined - in PI 1.2 specification. - -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include -#include -#include -#include - -#include - -/** - This function is responsible for calling the S3 resume vector in the ACPI Tables. - - @retval EFI_SUCESS Success to restore config from S3. - @retval Others Fail to restore config from S3. -**/ -EFI_STATUS -EFIAPI -AcpiS3ResumeOs ( - VOID - ) -{ - EFI_STATUS Status; - EFI_PEI_S3_RESUME_PPI *S3Resume; - - Status = PeiServicesLocatePpi ( - &gEfiPeiS3ResumePpiGuid, - 0, - NULL, - (VOID **)&S3Resume - ); - ASSERT_EFI_ERROR (Status); - - return S3Resume->S3RestoreConfig ((EFI_PEI_SERVICES **) GetPeiServicesTablePointer()); -} - diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index c56c0f88bb78..524e7c54e323 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -114,7 +114,6 @@ [PcdsFixedAtBuild] [Components] IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf - IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf deleted file mode 100644 index c368db98068f..000000000000 --- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf +++ /dev/null @@ -1,44 +0,0 @@ -## @file -# This library provides API to invoke the S3 resume vector in the ACPI Table in S3 resume mode. -# -# This library instance is no longer used and module using this library -# class should update to directly locate EFI_PEI_S3_RESUME_PPI defined -# in PI 1.2 specification. -# -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -# -## - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = PeiS3Lib - MODULE_UNI_FILE = PeiS3Lib.uni - FILE_GUID = EFB7D3A8-DEB9-4bed-B6D6-3B09BEEB835A - MODULE_TYPE = PEIM - VERSION_STRING = 1.0 - LIBRARY_CLASS = S3Lib|PEIM - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 EBC -# - -[Sources] - PeiS3Lib.c - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - -[LibraryClasses] - PeiServicesTablePointerLib - DebugLib - -[Ppis] - gEfiPeiS3ResumePpiGuid ## CONSUMES - diff --git a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni b/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni deleted file mode 100644 index 85d004e798e1..000000000000 --- a/IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.uni +++ /dev/null @@ -1,18 +0,0 @@ -// /** @file -// This library provides API to invoke the S3 resume vector in the ACPI Table in S3 resume mode. -// -// This library instance is no longer used and module using this library -// class should update to directly locate EFI_PEI_S3_RESUME_PPI defined -// in PI 1.2 specification. -// -// Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
-// -// SPDX-License-Identifier: BSD-2-Clause-Patent -// -// **/ - - -#string STR_MODULE_ABSTRACT #language en-US "Provides an API to invoke the S3 resume vector in the ACPI Table in S3 resume mode" - -#string STR_MODULE_DESCRIPTION #language en-US "This library instance is no longer used and any module using this library class should update to directly locate EFI_PEI_S3_RESUME_PPI defined in the PI 1.2 Specification." - -- 2.18.0.windows.1