BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

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

diff --git a/DuetPkg/EfiLdr/Debug.c b/DuetPkg/EfiLdr/Debug.c
index d0049218dc80964ab470658fbc180c0e5f3c335b..07272928cd40b395f9ba28ba2a375196b2536b17 100644 (file)
--- a/DuetPkg/EfiLdr/Debug.c
+++ b/DuetPkg/EfiLdr/Debug.c
@@ -1,6 +1,6 @@
 /*++\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,11 +19,11 @@ Revision History:
 --*/\r
 #include "EfiLdr.h"\r
 #include "Debug.h"\r
-#include <Library/SerialPortLib.h>\r
 \r
 UINT8 *mCursor;\r
 UINT8 mHeaderIndex = 10;\r
 \r
+\r
 VOID\r
 PrintHeader (\r
   CHAR8 Char\r
@@ -48,82 +48,26 @@ ClearScreen (
   mCursor = (UINT8 *)(UINTN)(0x000b8000 + 160);\r
 }\r
 \r
-\r
-VOID \r
-PrintU32Base10 (\r
-  UINT32 Value\r
-  )\r
-{\r
-  UINT32 Index;\r
-  CHAR8  Char;\r
-  CHAR8  String[11];\r
-  UINTN  StringPos;\r
-  UINT32 B10Div;\r
-\r
-  B10Div = 1000000000;\r
-  for (Index = 0, StringPos = 0; Index < 10; Index++) {\r
-    Char = ((Value / B10Div) % 10) + '0';\r
-    if ((StringPos > 0) || (Char != '0')) {\r
-      String[StringPos] = Char;\r
-      StringPos++;\r
-    }\r
-    B10Div = B10Div / 10;\r
-  }\r
-\r
-  if (StringPos == 0) {\r
-      String[0] = '0';\r
-      StringPos++;\r
-  }\r
-\r
-  String[StringPos] = '\0';\r
-\r
-  PrintString (String);\r
-}\r
-\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
 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[256];\r
+  VA_LIST         Marker;\r
+\r
+  VA_START (Marker, FormatString);\r
+  AsciiVSPrint (PrintBuffer, sizeof (PrintBuffer), FormatString, Marker);\r
+  VA_END (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
+  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
@@ -131,6 +75,6 @@ PrintString (
   //\r
   // All information also output to serial port.\r
   //\r
-  SerialPortWrite ((UINT8*) String, Index);\r
+  SerialPortWrite ((UINT8 *) PrintBuffer, Index);\r
 }\r
 \r