BaseTools: Extend the Macro used in the FDF !include statement

[mirror_edk2.git] / DuetPkg / DxeIpl / Debug.c

diff --git a/DuetPkg/DxeIpl/Debug.c b/DuetPkg/DxeIpl/Debug.c
index 34628156403f656b78c4b0886a05b99624669674..800f0080e08c9210d84bd05352351c4853c696df 100644 (file)
--- a/DuetPkg/DxeIpl/Debug.c
+++ b/DuetPkg/DxeIpl/Debug.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -19,6 +19,7 @@ Revision History:
 **/\r
 \r
 #include "DxeIpl.h"\r
+#include <Library/SerialPortLib.h>\r
 #include "SerialStatusCode.h"\r
 #include "Debug.h"\r
 \r
@@ -51,57 +52,32 @@ ClearScreen (
 }\r
 \r
 VOID\r
-PrintValue (\r
-  UINT32 Value\r
-  )\r
-{\r
-  UINT32 Index;\r
-  CHAR8  Char;\r
-  CHAR8  String[9];\r
-\r
-  for (Index = 0; Index < 8; Index++) {\r
-    Char = (UINT8)(((Value >> ((7 - Index) * 4)) & 0x0f) + '0');\r
-    if (Char > '9') {\r
-      Char = (UINT8) (Char - '0' - 10 + 'A');\r
-    }\r
-    String[Index] = Char;\r
-  }\r
-\r
-  String[sizeof (String) - 1] = '\0';\r
-\r
-  PrintString (String);\r
-}\r
-\r
-VOID\r
-PrintValue64 (\r
-  UINT64 Value\r
-  )\r
-{\r
-  PrintValue ((UINT32) RShiftU64 (Value, 32));\r
-  PrintValue ((UINT32) Value);\r
-}\r
-\r
-\r
-\r
-VOID\r
+EFIAPI\r
 PrintString (\r
-  CHAR8 *String\r
+  IN CONST CHAR8  *FormatString,\r
+  ...\r
   )\r
 {\r
-  UINT32 Index;\r
+  UINTN           Index;\r
+  CHAR8           PrintBuffer[1000];\r
+  VA_LIST         Marker;\r
 \r
-  for (Index = 0; String[Index] != 0; Index++) {\r
-    if (String[Index] == '\n') {\r
-      mCursor = (UINT8 *)(UINTN)(0xb8000 + (((((UINTN)mCursor - 0xb8000) + 160) / 160) * 160));\r
+  VA_START (Marker, FormatString);\r
+  AsciiVSPrint (PrintBuffer, sizeof (PrintBuffer), FormatString, Marker);\r
+  VA_END (Marker);\r
+\r
+  for (Index = 0; PrintBuffer[Index] != 0; Index++) {\r
+    if (PrintBuffer[Index] == '\n') {\r
+      mCursor = (UINT8 *) (UINTN) (0xb8000 + (((((UINTN)mCursor - 0xb8000) + 160) / 160) * 160));\r
     } else {\r
-      *mCursor = String[Index];\r
+      *mCursor = (UINT8) PrintBuffer[Index];\r
       mCursor += 2;\r
     }\r
   }\r
-  \r
+\r
   //\r
   // All information also output to serial port.\r
   //\r
-  DebugSerialPrint ((CHAR8*)String);\r
+  SerialPortWrite ((UINT8 *) PrintBuffer, Index);\r
 }\r
 \r