diff options
| -rw-r--r-- | apps/debug_menu.c | 4 | ||||
| -rw-r--r-- | firmware/drivers/lcd-16bit.c | 6 | ||||
| -rw-r--r-- | firmware/export/lcd.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index c459b7b8de..4f2266ff47 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -2049,7 +2049,7 @@ static bool dbg_set_memory_guard(void) } #endif /* CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) */ -#if defined(TOSHIBA_GIGABEAT_F) +#if defined(TOSHIBA_GIGABEAT_F) && !defined(SIMULATOR) extern volatile bool lcd_poweroff; @@ -2139,7 +2139,7 @@ bool debug_menu(void) bool result; static const struct menu_item items[] = { -#if defined(TOSHIBA_GIGABEAT_F) +#if defined(TOSHIBA_GIGABEAT_F) && !defined(SIMULATOR) { "LCD Power Off", dbg_lcd_power_off }, #endif #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index 949f80ffbc..024386e4e5 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c @@ -104,7 +104,7 @@ int lcd_get_drawmode(void) return drawmode; } -#if !defined(TOSHIBA_GIGABEAT_F) +#if !defined(TOSHIBA_GIGABEAT_F) || defined(SIMULATOR) void lcd_set_foreground(unsigned color) { fg_pattern = color; @@ -116,7 +116,7 @@ unsigned lcd_get_foreground(void) return fg_pattern; } -#if !defined(TOSHIBA_GIGABEAT_F) +#if !defined(TOSHIBA_GIGABEAT_F) || defined(SIMULATOR) void lcd_set_background(unsigned color) { bg_pattern = color; @@ -231,7 +231,7 @@ fb_data* lcd_get_backdrop(void) /*** drawing functions ***/ /* Clear the whole display */ -#if !defined(TOSHIBA_GIGABEAT_F) +#if !defined(TOSHIBA_GIGABEAT_F) || defined(SIMULATOR) void lcd_clear_display(void) { fb_data *dst = LCDADDR(0, 0); diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index fc0562419c..8a65d09fa3 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -345,10 +345,10 @@ extern unsigned lcd_get_background(void); extern void lcd_set_drawinfo(int mode, unsigned foreground, unsigned background); void lcd_set_backdrop(fb_data* backdrop); -#if !defined(TOSHIBA_GIGABEAT_F) -#define lcd_device_prepare_backdrop(x) ; -#else +#if defined(TOSHIBA_GIGABEAT_F) && !defined(SIMULATOR) void lcd_device_prepare_backdrop(fb_data* backdrop); +#else +#define lcd_device_prepare_backdrop(x) ; #endif fb_data* lcd_get_backdrop(void); |