X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=DuetPkg%2FEfiLdr%2FDebug.c;h=84b2772112cb1c1851f33226d6b014af4015867b;hb=3a7ec658e63cbb45f2ee35d02d54809c51bfd206;hp=2cc8c73a1e7ded8a127f3dc59ad017585b22635a;hpb=9071550e8697ed9df3d24b369bd30e3f0e190d1f;p=mirror_edk2.git

diff --git a/DuetPkg/EfiLdr/Debug.c b/DuetPkg/EfiLdr/Debug.c
index 2cc8c73a1e..84b2772112 100644
--- a/DuetPkg/EfiLdr/Debug.c
+++ b/DuetPkg/EfiLdr/Debug.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
@@ -23,6 +23,7 @@ Revision History:
 UINT8 *mCursor;
 UINT8 mHeaderIndex = 10;
 
+
 VOID
 PrintHeader (
   CHAR8 Char
@@ -47,47 +48,32 @@ ClearScreen (
   mCursor = (UINT8 *)(UINTN)(0x000b8000 + 160);
 }
 
-VOID
-PrintValue64 (
-  UINT64 Value
-  )
-{
-  PrintValue ((UINT32) RShiftU64 (Value, 32));
-  PrintValue ((UINT32) Value);
-}
-
-VOID
-PrintValue (
-  UINT32 Value
-  )
-{
-  UINT32 Index;
-  UINT8  Char;
-
-  for (Index = 0; Index < 8; Index++) {
-    Char = (UINT8)((Value >> ((7 - Index) * 4)) & 0x0f) + '0';
-    if (Char > '9') {
-      Char = Char - '0' - 10 + 'A';
-    }
-    *mCursor = Char;
-    mCursor += 2;
-  }
-}
-
 VOID
 PrintString (
-  UINT8 *String
+  IN CONST CHAR8  *FormatString,
+  ...
   )
 {
-  UINT32 Index;
+  UINTN           Index;
+  CHAR8           PrintBuffer[256];
+  VA_LIST         Marker;
 
-  for (Index = 0; String[Index] != 0; Index++) {
-    if (String[Index] == '\n') {
-      mCursor = (UINT8 *)(UINTN)(0xb8000 + (((((UINTN)mCursor - 0xb8000) + 160) / 160) * 160));
+  VA_START (Marker, FormatString);
+  AsciiVSPrint (PrintBuffer, sizeof (PrintBuffer), FormatString, Marker);
+  VA_END (Marker);
+
+  for (Index = 0; PrintBuffer[Index] != 0; Index++) {
+    if (PrintBuffer[Index] == '\n') {
+      mCursor = (UINT8 *) (UINTN) (0xb8000 + (((((UINTN)mCursor - 0xb8000) + 160) / 160) * 160));
     } else {
-      *mCursor = String[Index];
+      *mCursor = (UINT8) PrintBuffer[Index];
       mCursor += 2;
     }
   }
+
+  //
+  // All information also output to serial port.
+  //
+  SerialPortWrite ((UINT8 *) PrintBuffer, Index);
 }