diff options
author | Greg White <gwhite@rockbox.org> | 2007-01-04 12:13:56 +0000 |
---|---|---|
committer | Greg White <gwhite@rockbox.org> | 2007-01-04 12:13:56 +0000 |
commit | 922c0d6d3357bcd36f0c695a19ee2ab3f20c52de (patch) | |
tree | 83eae28e2d6954d021a7cba86da73851e8885c30 | |
parent | ae5cf68e481ff09d6da5078ecb8ea6d05d6d3290 (diff) | |
download | rockbox-922c0d6d3357bcd36f0c695a19ee2ab3f20c52de.tar.gz rockbox-922c0d6d3357bcd36f0c695a19ee2ab3f20c52de.zip |
Fix simulator build
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11910 a1c6a512-1295-4272-9138-f99709370657
-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) | |||
2049 | } | 2049 | } |
2050 | #endif /* CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) */ | 2050 | #endif /* CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) */ |
2051 | 2051 | ||
2052 | #if defined(TOSHIBA_GIGABEAT_F) | 2052 | #if defined(TOSHIBA_GIGABEAT_F) && !defined(SIMULATOR) |
2053 | 2053 | ||
2054 | extern volatile bool lcd_poweroff; | 2054 | extern volatile bool lcd_poweroff; |
2055 | 2055 | ||
@@ -2139,7 +2139,7 @@ bool debug_menu(void) | |||
2139 | bool result; | 2139 | bool result; |
2140 | 2140 | ||
2141 | static const struct menu_item items[] = { | 2141 | static const struct menu_item items[] = { |
2142 | #if defined(TOSHIBA_GIGABEAT_F) | 2142 | #if defined(TOSHIBA_GIGABEAT_F) && !defined(SIMULATOR) |
2143 | { "LCD Power Off", dbg_lcd_power_off }, | 2143 | { "LCD Power Off", dbg_lcd_power_off }, |
2144 | #endif | 2144 | #endif |
2145 | #if CONFIG_CPU == SH7034 || defined(CPU_COLDFIRE) | 2145 | #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) | |||
104 | return drawmode; | 104 | return drawmode; |
105 | } | 105 | } |
106 | 106 | ||
107 | #if !defined(TOSHIBA_GIGABEAT_F) | 107 | #if !defined(TOSHIBA_GIGABEAT_F) || defined(SIMULATOR) |
108 | void lcd_set_foreground(unsigned color) | 108 | void lcd_set_foreground(unsigned color) |
109 | { | 109 | { |
110 | fg_pattern = color; | 110 | fg_pattern = color; |
@@ -116,7 +116,7 @@ unsigned lcd_get_foreground(void) | |||
116 | return fg_pattern; | 116 | return fg_pattern; |
117 | } | 117 | } |
118 | 118 | ||
119 | #if !defined(TOSHIBA_GIGABEAT_F) | 119 | #if !defined(TOSHIBA_GIGABEAT_F) || defined(SIMULATOR) |
120 | void lcd_set_background(unsigned color) | 120 | void lcd_set_background(unsigned color) |
121 | { | 121 | { |
122 | bg_pattern = color; | 122 | bg_pattern = color; |
@@ -231,7 +231,7 @@ fb_data* lcd_get_backdrop(void) | |||
231 | /*** drawing functions ***/ | 231 | /*** drawing functions ***/ |
232 | 232 | ||
233 | /* Clear the whole display */ | 233 | /* Clear the whole display */ |
234 | #if !defined(TOSHIBA_GIGABEAT_F) | 234 | #if !defined(TOSHIBA_GIGABEAT_F) || defined(SIMULATOR) |
235 | void lcd_clear_display(void) | 235 | void lcd_clear_display(void) |
236 | { | 236 | { |
237 | fb_data *dst = LCDADDR(0, 0); | 237 | 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); | |||
345 | extern void lcd_set_drawinfo(int mode, unsigned foreground, | 345 | extern void lcd_set_drawinfo(int mode, unsigned foreground, |
346 | unsigned background); | 346 | unsigned background); |
347 | void lcd_set_backdrop(fb_data* backdrop); | 347 | void lcd_set_backdrop(fb_data* backdrop); |
348 | #if !defined(TOSHIBA_GIGABEAT_F) | 348 | #if defined(TOSHIBA_GIGABEAT_F) && !defined(SIMULATOR) |
349 | #define lcd_device_prepare_backdrop(x) ; | ||
350 | #else | ||
351 | void lcd_device_prepare_backdrop(fb_data* backdrop); | 349 | void lcd_device_prepare_backdrop(fb_data* backdrop); |
350 | #else | ||
351 | #define lcd_device_prepare_backdrop(x) ; | ||
352 | #endif | 352 | #endif |
353 | 353 | ||
354 | fb_data* lcd_get_backdrop(void); | 354 | fb_data* lcd_get_backdrop(void); |