S3Lib.h and PeiS3LibNull have been deprecated since 2009, so remove them.
https://bugzilla.tianocore.org/show_bug.cgi?id=1299
Cc: Jian J Wang <jian.j.w...@intel.com>
Cc: Hao A Wu <hao.a...@intel.com>
Cc: Ray Ni <ray...@intel.com>
Cc: Star Zeng <star.z...@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zh...@intel.com>
---
.../Library/PeiS3LibNull/PeiS3LibNull.c | 29 ----------------
MdeModulePkg/Core/DxeIplPeim/DxeIpl.h | 1 -
MdeModulePkg/Include/Library/S3Lib.h | 28 ---------------
.../Library/PeiS3LibNull/PeiS3LibNull.inf | 34 -------------------
.../Library/PeiS3LibNull/PeiS3LibNull.uni | 18 ----------
MdeModulePkg/MdeModulePkg.dec | 5 ---
MdeModulePkg/MdeModulePkg.dsc | 1 -
7 files changed, 116 deletions(-)
delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
delete mode 100644 MdeModulePkg/Include/Library/S3Lib.h
delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
delete mode 100644 MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
deleted file mode 100644
index a864413bc891..000000000000
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/** @file
- Null S3 Library instance does nothing and returns unsupported status.
-
- 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.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-#include <PiPei.h>
-#include <Library/S3Lib.h>
-
-/**
- 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
- )
-{
- return EFI_UNSUPPORTED;
-}
-
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 90b5b5b21199..ebed1c902ed2 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -39,7 +39,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/PcdLib.h>
-#include <Library/S3Lib.h>
#include <Library/RecoveryLib.h>
#include <Library/DebugAgentLib.h>
#include <Library/PeiServicesTablePointerLib.h>
diff --git a/MdeModulePkg/Include/Library/S3Lib.h
b/MdeModulePkg/Include/Library/S3Lib.h
deleted file mode 100644
index 171c0ccb92db..000000000000
--- a/MdeModulePkg/Include/Library/S3Lib.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/** @file
- S3 library class defines a set of methods related to S3 boot mode.
- This library class is no longer used and modules using this library should
- directly locate EFI_PEI_S3_RESUME_PPI, defined in the PI 1.2 specification.
-
-Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef __S3_LIB_H__
-#define __S3_LIB_H__
-
-/**
- This function is responsible for calling the S3 resume vector in the ACPI
Tables.
-
- @retval EFI_SUCCESS Successfully restored the configuration from S3.
- @retval Others Failed to restore the configuration from S3.
-
-**/
-EFI_STATUS
-EFIAPI
-AcpiS3ResumeOs (
- VOID
- );
-
-#endif
-
diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
deleted file mode 100644
index 3076c17d5cdd..000000000000
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
+++ /dev/null
@@ -1,34 +0,0 @@
-## @file
-# Null S3 library instance for PEIM module.
-# 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.<BR>
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = PeiS3LibNull
- MODULE_UNI_FILE = PeiS3LibNull.uni
- FILE_GUID = 018E1925-D6A2-4a2a-8958-817610A15ADF
- 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 (EBC is for build only)
-#
-
-[Sources]
- PeiS3LibNull.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
deleted file mode 100644
index 97ec62979ee0..000000000000
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
+++ /dev/null
@@ -1,18 +0,0 @@
-// /** @file
-// Null S3 library instance for PEIM module.
-//
-// 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.<BR>
-//
-// SPDX-License-Identifier: BSD-2-Clause-Patent
-//
-// **/
-
-
-#string STR_MODULE_ABSTRACT #language en-US "Null S3 library
instance for PEIM module"
-
-#string STR_MODULE_DESCRIPTION #language en-US "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."
-
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 08b3cbd7f2a1..563fc1818531 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -31,11 +31,6 @@ [LibraryClasses]
## @libraryclass Defines a set of helper functions for resetting the
system.
ResetUtilityLib|Include/Library/ResetUtilityLib.h
- ## @libraryclass Defines a set of methods related do S3 mode.
- # This library class is no longer used and modules using this library
should
- # directly locate EFI_PEI_S3_RESUME_PPI defined in PI 1.2 specification.
- S3Lib|Include/Library/S3Lib.h
-
## @libraryclass Defines a set of methods related recovery mode.
# This library class is no longer used and modules using this library
should
# directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in PI 1.2
specification.
diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 6ca7d9ade4e1..1c4525cd588c 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -284,7 +284,6 @@ [Components]
MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf
- MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf
MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf
--
2.18.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#42684): https://edk2.groups.io/g/devel/message/42684
Mute This Topic: https://groups.io/mt/32154923/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
