From c6e6ddf2d437d620ec8aab96b5fe3bc3c56cfdab Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Fri, 28 Jan 2005 06:10:01 +0000
Subject: [PATCH] allow oring multiple DebugPort values

svn path=/trunk/; revision=13345
---
 reactos/boot/freeldr/freeldr/debug.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/reactos/boot/freeldr/freeldr/debug.c b/reactos/boot/freeldr/freeldr/debug.c
index abd8ec38aab..ac953ea45d2 100644
--- a/reactos/boot/freeldr/freeldr/debug.c
+++ b/reactos/boot/freeldr/freeldr/debug.c
@@ -46,9 +46,9 @@ U32		DebugPrintMask = DPRINT_WARNING|DPRINT_FILESYSTEM|DPRINT_MEMORY|DPRINT_LINU
 U32		DebugPrintMask = 0;
 #endif
 
-#define	SCREEN				0
-#define	RS232				1
-#define BOCHS				2
+#define	SCREEN				1
+#define	RS232				2
+#define BOCHS				4
 
 #define	COM1				1
 #define	COM2				2
@@ -60,6 +60,7 @@ U32		DebugPrintMask = 0;
 U32		DebugPort = RS232;
 //U32		DebugPort = SCREEN;
 //U32		DebugPort = BOCHS;
+//U32		DebugPort = SCREEN|BOCHS;
 U32		ComPort = COM1;
 //U32		BaudRate = 19200;
 U32		BaudRate = 115200;
@@ -81,7 +82,7 @@ VOID DebugPrintChar(UCHAR Character)
 		DebugStartOfLine = TRUE;
 	}
 
-	if (DebugPort == RS232)
+	if (DebugPort & RS232)
 	{
 		if (Character == '\n')
 		{
@@ -89,11 +90,11 @@ VOID DebugPrintChar(UCHAR Character)
 		}
 		Rs232PortPutByte(Character);
 	}
-	else if (DebugPort == BOCHS)
+	if (DebugPort & BOCHS)
 	{
 		WRITE_PORT_UCHAR((PUCHAR)BOCHS_OUTPUT_PORT, Character);
 	}
-	else
+	if (DebugPort & SCREEN)
 	{
 		MachConsPutChar(Character);
 	}
@@ -257,7 +258,7 @@ static VOID DebugPrintV(char *format, int *dataptr)
 			switch (c = *(format++))
 			{
 			case 'd': case 'u': case 'x':
-				
+
 				if (ll)
 				{
 					*convert_i64_to_ascii(str, c, *((unsigned long long*) dataptr)) = 0;
@@ -311,7 +312,7 @@ static VOID DebugPrintV(char *format, int *dataptr)
 VOID DebugPrint(U32 Mask, char *format, ...)
 {
 	int *dataptr = (int *) &format;
-	
+
 	// Mask out unwanted debug messages
 	if (!(Mask & DebugPrintMask))
 	{
@@ -340,7 +341,7 @@ VOID DebugDumpBuffer(U32 Mask, PVOID Buffer, U32 Length)
 	PUCHAR	BufPtr = (PUCHAR)Buffer;
 	U32		Idx;
 	U32		Idx2;
-	
+
 	// Mask out unwanted debug messages
 	if (!(Mask & DebugPrintMask))
 	{