From: Michael Brown <mcb30@ipxe.org>
Date: Tue, 12 Jan 2016 15:35:06 +0000 (+0000)
Subject: [debug] Allow debug colourisation to be disabled
X-Git-Tag: v1.20.1~630
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47dcd392dcd79d02eec2714696012785dd7a47c9;p=thirdparty%2Fipxe.git

[debug] Allow debug colourisation to be disabled

Some BIOS console redirection capabilities do not work well with the
colourised debug messages used by iPXE.  We already allow the range of
colours to be controlled via the DBGCOL=... build parameter.  Extend
this syntax to allow DBGCOL=0 to be used to mean "disable colours".

Requested-by: Wissam Shoukair <wissams@mellanox.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 70ec50c5e..0a80d2ac9 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -734,8 +734,8 @@ $(DBGCOL_LIST) : $(MAKEDEPS)
 VERYCLEANUP += $(DBGCOL_LIST)
 
 DBGCOL_COLOURS := $(subst -, ,$(DBGCOL))
-DBGCOL_MIN := $(word 1,$(DBGCOL_COLOURS))
-DBGCOL_MAX := $(word 2,$(DBGCOL_COLOURS))
+DBGCOL_MIN := $(firstword $(DBGCOL_COLOURS))
+DBGCOL_MAX := $(lastword $(DBGCOL_COLOURS))
 
 debug_DEPS += $(DBGCOL_LIST)
 
diff --git a/src/core/debug.c b/src/core/debug.c
index def5d8b09..9b2a823f5 100644
--- a/src/core/debug.c
+++ b/src/core/debug.c
@@ -194,8 +194,12 @@ static int dbg_autocolour ( unsigned long stream ) {
  * @v stream		Message stream ID
  */
 void dbg_autocolourise ( unsigned long stream ) {
-	dbg_printf ( "\033[%dm",
-		     ( stream ? ( DBGCOL_MIN + dbg_autocolour ( stream ) ) :0));
+
+	if ( DBGCOL_MIN ) {
+		dbg_printf ( "\033[%dm",
+			     ( stream ?
+			       ( DBGCOL_MIN + dbg_autocolour ( stream ) ) : 0));
+	}
 }
 
 /**
@@ -203,5 +207,7 @@ void dbg_autocolourise ( unsigned long stream ) {
  *
  */
 void dbg_decolourise ( void ) {
-	dbg_printf ( "\033[0m" );
+
+	if ( DBGCOL_MIN )
+		dbg_printf ( "\033[0m" );
 }