MdeModulePkg: Remove S3Lib.h and PeiS3LibNull

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.wang@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 90b5b5b211997d9f2b23da4585c2ebcb106a3693..ebed1c902ed2dcde2b78608c3051e3786bbb94df 100644 (file)
--- 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>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/PcdLib.h>\r
-#include <Library/S3Lib.h>\r
 #include <Library/RecoveryLib.h>\r
 #include <Library/DebugAgentLib.h>\r
 #include <Library/PeiServicesTablePointerLib.h>\r

diff --git a/MdeModulePkg/Include/Library/S3Lib.h b/MdeModulePkg/Include/Library/S3Lib.h
deleted file mode 100644 (file)
index 171c0cc..0000000
--- a/MdeModulePkg/Include/Library/S3Lib.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/** @file\r
-  S3 library class defines a set of methods related to S3 boot mode.\r
-  This library class is no longer used and modules using this library should\r
-  directly locate EFI_PEI_S3_RESUME_PPI, defined in the PI 1.2 specification.\r
-\r
-Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
-SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-#ifndef __S3_LIB_H__\r
-#define __S3_LIB_H__\r
-\r
-/**\r
-  This function is responsible for calling the S3 resume vector in the ACPI Tables.\r
-\r
-  @retval EFI_SUCCESS   Successfully restored the configuration from S3.\r
-  @retval Others       Failed to restore the configuration from S3.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AcpiS3ResumeOs (\r
-  VOID\r
-  );\r
-\r
-#endif\r
-\r

diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
deleted file mode 100644 (file)
index a864413..0000000
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/** @file\r
-  Null S3 Library instance does nothing and returns unsupported status.\r
-\r
-  This library instance is no longer used and module using this library\r
-  class should update to directly locate EFI_PEI_S3_RESUME_PPI defined\r
-  in PI 1.2 specification.\r
-\r
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
-SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-#include <PiPei.h>\r
-#include <Library/S3Lib.h>\r
-\r
-/**\r
-  This function is responsible for calling the S3 resume vector in the ACPI Tables.\r
-\r
-  @retval EFI_SUCESS   Success to restore config from S3.\r
-  @retval Others       Fail to restore config from S3.\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AcpiS3ResumeOs (\r
-  VOID\r
-  )\r
-{\r
-  return EFI_UNSUPPORTED;\r
-}\r
-\r

diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
deleted file mode 100644 (file)
index 3076c17..0000000
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
+++ /dev/null
@@ -1,34 +0,0 @@
-## @file\r
-#  Null S3 library instance for PEIM module.\r
-#  This library instance is no longer used and module using this library\r
-#  class should update to directly locate EFI_PEI_S3_RESUME_PPI defined\r
-#  in PI 1.2 specification.\r
-#\r
-#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
-#\r
-#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-#\r
-##\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = PeiS3LibNull\r
-  MODULE_UNI_FILE                = PeiS3LibNull.uni\r
-  FILE_GUID                      = 018E1925-D6A2-4a2a-8958-817610A15ADF\r
-  MODULE_TYPE                    = PEIM\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = S3Lib|PEIM\r
-\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 EBC (EBC is for build only)\r
-#\r
-\r
-[Sources]\r
-  PeiS3LibNull.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  MdeModulePkg/MdeModulePkg.dec\r

diff --git a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
deleted file mode 100644 (file)
index 97ec629..0000000
--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.uni
+++ /dev/null
@@ -1,18 +0,0 @@
-// /** @file\r
-// Null S3 library instance for PEIM module.\r
-//\r
-// This library instance is no longer used and module using this library\r
-// class should update to directly locate EFI_PEI_S3_RESUME_PPI defined\r
-// in PI 1.2 specification.\r
-//\r
-// Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
-//\r
-// SPDX-License-Identifier: BSD-2-Clause-Patent\r
-//\r
-// **/\r
-\r
-\r
-#string STR_MODULE_ABSTRACT             #language en-US "Null S3 library instance for PEIM module"\r
-\r
-#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."\r
-\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 12e0bbf57997020ce9bc367715e1ec6f22fdf274..60c69feeaa23764793a340945569112549b59512 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -31,11 +31,6 @@
   ##  @libraryclass  Defines a set of helper functions for resetting the system.\r
   ResetUtilityLib|Include/Library/ResetUtilityLib.h\r
 \r
-  ##  @libraryclass  Defines a set of methods related do S3 mode.\r
-  #   This library class is no longer used and modules using this library should\r
-  #   directly locate EFI_PEI_S3_RESUME_PPI defined in PI 1.2 specification.\r
-  S3Lib|Include/Library/S3Lib.h\r
-\r
   ##  @libraryclass  Defines a set of methods related recovery mode.\r
   #   This library class is no longer used and modules using this library should\r
   #   directly locate EFI_PEI_RECOVERY_MODULE_PPI defined in PI 1.2 specification.\r

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 6ca7d9ade4e17988b705f432ea707ad20eb8e3f8..1c4525cd588ca9019bbdf0fd73a9e6e1eadc88b2 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -284,7 +284,6 @@
   MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf\r
   MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf\r
   MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf\r
-  MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf\r
   MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf\r
   MdeModulePkg/Library/ResetUtilityLib/ResetUtilityLib.inf\r
   MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf\r