UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / MdeModulePkg / Library / ResetUtilityLib / ResetUtility.c

diff --git a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
index 2b5af4b95a7df7f1229d32208d1fec63eaf4b4a0..50131a431f972a613fb9e798eb3ce88dce140e86 100644 (file)
--- a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
+++ b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c
@@ -15,12 +15,15 @@
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  CHAR16 NullTerminator;\r
-  GUID   ResetSubtype;\r
+  CHAR16    NullTerminator;\r
+  GUID      ResetSubtype;\r
 } RESET_UTILITY_GUID_SPECIFIC_RESET_DATA;\r
 #pragma pack()\r
 \r
-VERIFY_SIZE_OF (RESET_UTILITY_GUID_SPECIFIC_RESET_DATA, 18);\r
+STATIC_ASSERT (\r
+  sizeof (RESET_UTILITY_GUID_SPECIFIC_RESET_DATA) == 18,\r
+  "sizeof (RESET_UTILITY_GUID_SPECIFIC_RESET_DATA) is expected to be 18 bytes"\r
+  );\r
 \r
 /**\r
   This is a shorthand helper function to reset with reset type and a subtype\r
@@ -42,8 +45,8 @@ VERIFY_SIZE_OF (RESET_UTILITY_GUID_SPECIFIC_RESET_DATA, 18);
 VOID\r
 EFIAPI\r
 ResetSystemWithSubtype (\r
-  IN EFI_RESET_TYPE     ResetType,\r
-  IN CONST  GUID        *ResetSubtype\r
+  IN EFI_RESET_TYPE  ResetType,\r
+  IN CONST  GUID     *ResetSubtype\r
   )\r
 {\r
   RESET_UTILITY_GUID_SPECIFIC_RESET_DATA  ResetData;\r
@@ -76,7 +79,7 @@ ResetSystemWithSubtype (
 VOID\r
 EFIAPI\r
 ResetPlatformSpecificGuid (\r
-  IN CONST  GUID        *ResetSubtype\r
+  IN CONST  GUID  *ResetSubtype\r
   )\r
 {\r
   ResetSystemWithSubtype (EfiResetPlatformSpecific, ResetSubtype);\r
@@ -107,8 +110,8 @@ GetResetPlatformSpecificGuid (
   IN CONST VOID  *ResetData\r
   )\r
 {\r
-  UINTN          ResetDataStringSize;\r
-  GUID           *ResetSubtypeGuid;\r
+  UINTN  ResetDataStringSize;\r
+  GUID   *ResetSubtypeGuid;\r
 \r
   //\r
   // Make sure parameters are valid\r
@@ -127,11 +130,12 @@ GetResetPlatformSpecificGuid (
   // Now, assuming that we have enough data for a GUID after the string, the\r
   // GUID should be immediately after the string itself.\r
   //\r
-  if ((ResetDataStringSize < DataSize) && (DataSize - ResetDataStringSize) >= sizeof (GUID)) {\r
+  if ((ResetDataStringSize < DataSize) && ((DataSize - ResetDataStringSize) >= sizeof (GUID))) {\r
     ResetSubtypeGuid = (GUID *)((UINT8 *)ResetData + ResetDataStringSize);\r
     DEBUG ((DEBUG_VERBOSE, "%a - Detected reset subtype %g...\n", __FUNCTION__, ResetSubtypeGuid));\r
     return ResetSubtypeGuid;\r
   }\r
+\r
   return NULL;\r
 }\r
 \r
@@ -171,12 +175,12 @@ GetResetPlatformSpecificGuid (
 RETURN_STATUS\r
 EFIAPI\r
 BuildResetData (\r
-  IN OUT   UINTN     *ResetDataSize,\r
-  IN OUT   VOID      *ResetData,\r
-  IN CONST GUID      *ResetSubtype  OPTIONAL,\r
-  IN CONST CHAR16    *ResetString   OPTIONAL,\r
-  IN       UINTN     ExtraDataSize  OPTIONAL,\r
-  IN CONST VOID      *ExtraData     OPTIONAL\r
+  IN OUT   UINTN   *ResetDataSize,\r
+  IN OUT   VOID    *ResetData,\r
+  IN CONST GUID    *ResetSubtype  OPTIONAL,\r
+  IN CONST CHAR16  *ResetString   OPTIONAL,\r
+  IN       UINTN   ExtraDataSize  OPTIONAL,\r
+  IN CONST VOID    *ExtraData     OPTIONAL\r
   )\r
 {\r
   UINTN  ResetStringSize;\r
@@ -189,16 +193,18 @@ BuildResetData (
   if (ResetDataSize == NULL) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // If extra data is indicated, but pointer is NULL.\r
   //\r
-  if (ExtraDataSize > 0 && ExtraData == NULL) {\r
+  if ((ExtraDataSize > 0) && (ExtraData == NULL)) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
+\r
   //\r
   // If extra data is indicated, but no subtype GUID is supplied.\r
   //\r
-  if (ResetSubtype == NULL && ExtraDataSize > 0) {\r
+  if ((ResetSubtype == NULL) && (ExtraDataSize > 0)) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
@@ -226,6 +232,7 @@ BuildResetData (
     *ResetDataSize = ResetDataBufferSize;\r
     return RETURN_BUFFER_TOO_SMALL;\r
   }\r
+\r
   *ResetDataSize = ResetDataBufferSize;\r
   if (ResetData == NULL) {\r
     return RETURN_INVALID_PARAMETER;\r
@@ -241,6 +248,7 @@ BuildResetData (
     CopyMem (Data, ResetSubtype, sizeof (GUID));\r
     Data += sizeof (GUID);\r
   }\r
+\r
   if (ExtraDataSize > 0) {\r
     CopyMem (Data, ExtraData, ExtraDataSize);\r
   }\r