diff options
Diffstat (limited to 'DuetPkg/EfiLdr/Debug.c')
| -rw-r--r-- | DuetPkg/EfiLdr/Debug.c | 89 |
1 files changed, 16 insertions, 73 deletions
diff --git a/DuetPkg/EfiLdr/Debug.c b/DuetPkg/EfiLdr/Debug.c index a4a067ca6e..f4cd7c15ed 100644 --- a/DuetPkg/EfiLdr/Debug.c +++ b/DuetPkg/EfiLdr/Debug.c @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+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
@@ -19,11 +19,11 @@ Revision History: --*/
#include "EfiLdr.h"
#include "Debug.h"
-#include <Library/SerialPortLib.h>
UINT8 *mCursor;
UINT8 mHeaderIndex = 10;
+
VOID
PrintHeader (
CHAR8 Char
@@ -48,82 +48,25 @@ ClearScreen ( mCursor = (UINT8 *)(UINTN)(0x000b8000 + 160);
}
-
-VOID
-PrintU32Base10 (
- UINT32 Value
- )
-{
- UINT32 Index;
- CHAR8 Char;
- CHAR8 String[11];
- UINTN StringPos;
- UINT32 B10Div;
-
- B10Div = 1000000000;
- for (Index = 0, StringPos = 0; Index < 10; Index++) {
- Char = (UINT8) (((Value / B10Div) % 10) + '0');
- if ((StringPos > 0) || (Char != '0')) {
- String[StringPos] = Char;
- StringPos++;
- }
- B10Div = B10Div / 10;
- }
-
- if (StringPos == 0) {
- String[0] = '0';
- StringPos++;
- }
-
- String[StringPos] = '\0';
-
- PrintString (String);
-}
-
-
-VOID
-PrintValue (
- UINT32 Value
- )
-{
- UINT32 Index;
- CHAR8 Char;
- CHAR8 String[9];
-
- for (Index = 0; Index < 8; Index++) {
- Char = (UINT8)(((Value >> ((7 - Index) * 4)) & 0x0f) + '0');
- if (Char > '9') {
- Char = (UINT8) (Char - '0' - 10 + 'A');
- }
- String[Index] = Char;
- }
-
- String[sizeof (String) - 1] = '\0';
-
- PrintString (String);
-}
-
-VOID
-PrintValue64 (
- UINT64 Value
- )
-{
- PrintValue ((UINT32) RShiftU64 (Value, 32));
- PrintValue ((UINT32) Value);
-}
-
VOID
PrintString (
- CHAR8 *String
+ IN CONST CHAR8 *FormatString,
+ ...
)
{
- UINT32 Index;
+ UINTN Index;
+ CHAR8 PrintBuffer[256];
+ VA_LIST Marker;
+
+ VA_START (Marker, FormatString);
+ AsciiVSPrint (PrintBuffer, sizeof (PrintBuffer), FormatString, Marker);
+ VA_END (Marker);
- for (Index = 0; String[Index] != 0; Index++) {
- if (String[Index] == '\n') {
- mCursor = (UINT8 *)(UINTN)(0xb8000 + (((((UINTN)mCursor - 0xb8000) + 160) / 160) * 160));
+ 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;
}
}
@@ -131,6 +74,6 @@ PrintString ( //
// All information also output to serial port.
//
- SerialPortWrite ((UINT8*) String, Index);
+ SerialPortWrite (PrintBuffer, Index);
}
|