diff --git a/firmware/panic.c b/firmware/panic.c index 358c9602ae..bbbb014807 100644 --- a/firmware/panic.c +++ b/firmware/panic.c @@ -103,9 +103,7 @@ void panicf( const char *fmt, ...) #if LCD_DEPTH > 1 lcd_set_backdrop(NULL); - lcd_set_drawmode(DRMODE_SOLID); - lcd_set_foreground(LCD_BLACK); - lcd_set_background(LCD_WHITE); + lcd_set_drawinfo(DRMODE_SOLID, LCD_BLACK, LCD_WHITE); #endif lcd_clear_display(); diff --git a/firmware/target/arm/system-arm.c b/firmware/target/arm/system-arm.c index 41d0cce723..d956b5e64a 100644 --- a/firmware/target/arm/system-arm.c +++ b/firmware/target/arm/system-arm.c @@ -99,9 +99,7 @@ void NORETURN_ATTR UIE(unsigned int pc, unsigned int num) #if LCD_DEPTH > 1 lcd_set_backdrop(NULL); - lcd_set_drawmode(DRMODE_SOLID); - lcd_set_foreground(LCD_BLACK); - lcd_set_background(LCD_WHITE); + lcd_set_drawinfo(DRMODE_SOLID, LCD_BLACK, LCD_WHITE); #endif unsigned line = 0; diff --git a/firmware/target/coldfire/system-coldfire.c b/firmware/target/coldfire/system-coldfire.c index 2f2f2cb45b..1ab08c8772 100644 --- a/firmware/target/coldfire/system-coldfire.c +++ b/firmware/target/coldfire/system-coldfire.c @@ -185,9 +185,7 @@ static void system_display_exception_info(unsigned long format, /* clear screen */ #if LCD_DEPTH > 1 lcd_set_backdrop(NULL); - lcd_set_drawmode(DRMODE_SOLID); - lcd_set_foreground(LCD_BLACK); - lcd_set_background(LCD_WHITE); + lcd_set_drawinfo(DRMODE_SOLID, LCD_BLACK, LCD_WHITE); #endif lcd_setfont(FONT_SYSFIXED); lcd_set_viewport(NULL); diff --git a/firmware/target/hosted/fiio/system-fiio.c b/firmware/target/hosted/fiio/system-fiio.c index 3d6b1a82cd..48fb0b5231 100644 --- a/firmware/target/hosted/fiio/system-fiio.c +++ b/firmware/target/hosted/fiio/system-fiio.c @@ -53,9 +53,7 @@ static void sig_handler(int sig, siginfo_t *siginfo, void *context) static bool triggered = false; lcd_set_backdrop(NULL); - lcd_set_drawmode(DRMODE_SOLID); - lcd_set_foreground(LCD_BLACK); - lcd_set_background(LCD_WHITE); + lcd_set_drawinfo(DRMODE_SOLID, LCD_BLACK, LCD_WHITE); unsigned line = 0; lcd_setfont(FONT_SYSFIXED); diff --git a/firmware/target/hosted/sonynwz/system-nwz.c b/firmware/target/hosted/sonynwz/system-nwz.c index e525042070..abc6514c23 100644 --- a/firmware/target/hosted/sonynwz/system-nwz.c +++ b/firmware/target/hosted/sonynwz/system-nwz.c @@ -129,9 +129,7 @@ static void nwz_sig_handler(int sig, siginfo_t *siginfo, void *context) dump_proc_map(); lcd_set_backdrop(NULL); - lcd_set_drawmode(DRMODE_SOLID); - lcd_set_foreground(LCD_BLACK); - lcd_set_background(LCD_WHITE); + lcd_set_drawinfo(DRMODE_SOLID, LCD_BLACK, LCD_WHITE); unsigned line = 0; lcd_setfont(FONT_SYSFIXED); diff --git a/firmware/target/hosted/system-hosted.c b/firmware/target/hosted/system-hosted.c index e8a9671818..ce2417fbbd 100644 --- a/firmware/target/hosted/system-hosted.c +++ b/firmware/target/hosted/system-hosted.c @@ -50,9 +50,7 @@ static void sig_handler(int sig, siginfo_t *siginfo, void *context) static bool triggered = false; lcd_set_backdrop(NULL); - lcd_set_drawmode(DRMODE_SOLID); - lcd_set_foreground(LCD_BLACK); - lcd_set_background(LCD_WHITE); + lcd_set_drawinfo(DRMODE_SOLID, LCD_BLACK, LCD_WHITE); unsigned line = 0; lcd_setfont(FONT_SYSFIXED); diff --git a/firmware/target/mips/system-mips.c b/firmware/target/mips/system-mips.c index e6bb2d8ea6..c0e766d997 100644 --- a/firmware/target/mips/system-mips.c +++ b/firmware/target/mips/system-mips.c @@ -70,9 +70,7 @@ static void exception_dump(void* frame, unsigned long epc, lcd_set_viewport(NULL); #if LCD_DEPTH > 1 lcd_set_backdrop(NULL); - lcd_set_drawmode(DRMODE_SOLID); - lcd_set_foreground(LCD_BLACK); - lcd_set_background(LCD_WHITE); + lcd_set_drawinfo(DRMODE_SOLID, LCD_BLACK, LCD_WHITE); #endif lcd_clear_display();