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

[mirror_edk2.git] / MdeModulePkg / Universal / StatusCodeHandler / Smm / SerialStatusCodeWorker.c

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
index b5f2befc35342b8542bd34c432c6db3426129359..e994e69e48ff1edc71ae9e7091878ce0361c218a 100644 (file)
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
@@ -1,22 +1,16 @@
 /** @file\r
   Serial I/O status code reporting worker.\r
 \r
-  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                            \r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
-#include "StatusCodeHandlerSmm.h"\r
+#include "StatusCodeHandlerMm.h"\r
 \r
 /**\r
   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.\r
- \r
+\r
   @param  CodeType         Indicates the type of status code being reported.\r
   @param  Value            Describes the current status of a hardware or software entity.\r
                            This included information about the class and subclass that is used to\r
@@ -36,26 +30,27 @@
 EFI_STATUS\r
 EFIAPI\r
 SerialStatusCodeReportWorker (\r
-  IN EFI_STATUS_CODE_TYPE     CodeType,\r
-  IN EFI_STATUS_CODE_VALUE    Value,\r
-  IN UINT32                   Instance,\r
-  IN EFI_GUID                 *CallerId,\r
-  IN EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
+  IN EFI_STATUS_CODE_TYPE   CodeType,\r
+  IN EFI_STATUS_CODE_VALUE  Value,\r
+  IN UINT32                 Instance,\r
+  IN EFI_GUID               *CallerId,\r
+  IN EFI_STATUS_CODE_DATA   *Data OPTIONAL\r
   )\r
 {\r
-  CHAR8           *Filename;\r
-  CHAR8           *Description;\r
-  CHAR8           *Format;\r
-  CHAR8           Buffer[MAX_DEBUG_MESSAGE_LENGTH];\r
-  UINT32          ErrorLevel;\r
-  UINT32          LineNumber;\r
-  UINTN           CharCount;\r
-  BASE_LIST       Marker;\r
+  CHAR8      *Filename;\r
+  CHAR8      *Description;\r
+  CHAR8      *Format;\r
+  CHAR8      Buffer[MAX_DEBUG_MESSAGE_LENGTH];\r
+  UINT32     ErrorLevel;\r
+  UINT32     LineNumber;\r
+  UINTN      CharCount;\r
+  BASE_LIST  Marker;\r
 \r
   Buffer[0] = '\0';\r
 \r
-  if (Data != NULL &&\r
-      ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) {\r
+  if ((Data != NULL) &&\r
+      ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber))\r
+  {\r
     //\r
     // Print ASSERT() information into output buffer.\r
     //\r
@@ -67,15 +62,16 @@ SerialStatusCodeReportWorker (
                   LineNumber,\r
                   Description\r
                   );\r
-  } else if (Data != NULL &&\r
-             ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format)) {\r
+  } else if ((Data != NULL) &&\r
+             ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format))\r
+  {\r
     //\r
     // Print DEBUG() information into output buffer.\r
     //\r
     CharCount = AsciiBSPrint (\r
-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  Format, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  Format,\r
                   Marker\r
                   );\r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {\r
@@ -83,15 +79,15 @@ SerialStatusCodeReportWorker (
     // Print ERROR information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r
-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  "ERROR: C%x:V%x I%x", \r
-                  CodeType, \r
-                  Value, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  "ERROR: C%08x:V%08x I%x",\r
+                  CodeType,\r
+                  Value,\r
                   Instance\r
                   );\r
     ASSERT (CharCount > 0);\r
-   \r
+\r
     if (CallerId != NULL) {\r
       CharCount += AsciiSPrint (\r
                      &Buffer[CharCount],\r
@@ -120,34 +116,35 @@ SerialStatusCodeReportWorker (
     // Print PROGRESS information into output buffer.\r
     //\r
     CharCount = AsciiSPrint (\r
-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  "PROGRESS CODE: V%x I%x\n\r", \r
-                  Value, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  "PROGRESS CODE: V%08x I%x\n\r",\r
+                  Value,\r
                   Instance\r
                   );\r
-  } else if (Data != NULL &&\r
+  } else if ((Data != NULL) &&\r
              CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&\r
-             ((EFI_STATUS_CODE_STRING_DATA *) Data)->StringType == EfiStringAscii) {\r
+             (((EFI_STATUS_CODE_STRING_DATA *)Data)->StringType == EfiStringAscii))\r
+  {\r
     //\r
     // EFI_STATUS_CODE_STRING_DATA\r
     //\r
     CharCount = AsciiSPrint (\r
                   Buffer,\r
                   sizeof (Buffer),\r
-                  "%a\n\r",\r
-                  ((EFI_STATUS_CODE_STRING_DATA *) Data)->String.Ascii\r
+                  "%a",\r
+                  ((EFI_STATUS_CODE_STRING_DATA *)Data)->String.Ascii\r
                   );\r
   } else {\r
     //\r
     // Code type is not defined.\r
     //\r
     CharCount = AsciiSPrint (\r
-                  Buffer, \r
-                  sizeof (Buffer), \r
-                  "Undefined: C%x:V%x I%x\n\r", \r
-                  CodeType, \r
-                  Value, \r
+                  Buffer,\r
+                  sizeof (Buffer),\r
+                  "Undefined: C%08x:V%08x I%x\n\r",\r
+                  CodeType,\r
+                  Value,\r
                   Instance\r
                   );\r
   }\r
@@ -155,8 +152,7 @@ SerialStatusCodeReportWorker (
   //\r
   // Call SerialPort Lib function to do print.\r
   //\r
-  SerialPortWrite ((UINT8 *) Buffer, CharCount);\r
+  SerialPortWrite ((UINT8 *)Buffer, CharCount);\r
 \r
   return EFI_SUCCESS;\r
 }\r
-\r