david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[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>
This commit is contained in:
Michael Brown 2016-01-12 15:35:06 +00:00
parent 83c8f2e8e3
commit 47dcd392dc
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.housekeeping
View File

@ -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)

12
src/core/debug.c
View File

@ -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" );
}