MdePkg: Remove EfiResetSystem() from UefiRuntimeLib

Removes the EfiResetSystem() API from the library. ResetSystemLib can be used for reset. Signed-off-by: Michael Kubacki <[email protected]>
microsoft · Jun 20, 2024 · a248cf8 · a248cf8
1 parent 2e176fc
commit a248cf8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/MdePkg/Include/Library/UefiRuntimeLib.h b/MdePkg/Include/Library/UefiRuntimeLib.h
@@ -323,6 +323,8 @@ EfiGetNextHighMonotonicCount (
   OUT UINT32  *HighCount
   );
 
+// MU_CHANGE [BEGIN] - Move EfiResetSystem out of UefiRuntimeLib and into ResetSystemLib.
+
 /**
   This service is a wrapper for the UEFI Runtime Service ResetSystem().
 
@@ -351,14 +353,15 @@ EfiGetNextHighMonotonicCount (
                       address. For a ResetType of EfiResetPlatformSpecific the data buffer also starts with a Null-terminated
                       string that is followed by an EFI_GUID that describes the specific type of reset to perform.
 **/
-VOID
-EFIAPI
-EfiResetSystem (
-  IN EFI_RESET_TYPE  ResetType,
-  IN EFI_STATUS      ResetStatus,
-  IN UINTN           DataSize,
-  IN VOID            *ResetData OPTIONAL
-  );
+// VOID
+// EFIAPI
+// EfiResetSystem (
+//   IN EFI_RESET_TYPE               ResetType,
+//   IN EFI_STATUS                   ResetStatus,
+//   IN UINTN                        DataSize,
+//   IN VOID                         *ResetData OPTIONAL
+//   );
+// MU_CHANGE [END] - Move EfiResetSystem out of UefiRuntimeLib and into ResetSystemLib.
 
 /**
   This service is a wrapper for the UEFI Runtime Service ConvertPointer().

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
@@ -192,6 +192,8 @@ EfiGoneVirtual (
   return mEfiGoneVirtual;
 }
 
+// MU_CHANGE [BEGIN] - Move EfiResetSystem out of UefiRuntimeLib and into ResetSystemLib.
+
 /**
   This service is a wrapper for the UEFI Runtime Service ResetSystem().
 
@@ -221,17 +223,18 @@ EfiGoneVirtual (
                       that is followed by a physical VOID * to an EFI_CAPSULE_HEADER.
 
 **/
-VOID
-EFIAPI
-EfiResetSystem (
-  IN EFI_RESET_TYPE  ResetType,
-  IN EFI_STATUS      ResetStatus,
-  IN UINTN           DataSize,
-  IN VOID            *ResetData OPTIONAL
-  )
-{
-  mInternalRT->ResetSystem (ResetType, ResetStatus, DataSize, ResetData);
-}
+// VOID
+// EFIAPI
+// EfiResetSystem (
+//   IN EFI_RESET_TYPE               ResetType,
+//   IN EFI_STATUS                   ResetStatus,
+//   IN UINTN                        DataSize,
+//   IN VOID                         *ResetData OPTIONAL
+//   )
+// {
+//   mInternalRT->ResetSystem (ResetType, ResetStatus, DataSize, ResetData);
+// }
+// MU_CHANGE [END] - Move EfiResetSystem out of UefiRuntimeLib and into ResetSystemLib.
 
 /**
   This service is a wrapper for the UEFI Runtime Service GetTime().