diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 03:36:36 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 03:36:36 +0000 |
commit | 4ed387d60313ac79fa7ac8b403bf3195f7c0c549 (patch) | |
tree | d5bc4861cbdde61b054d12deed4ffea92af03bd3 /firmware/target/arm/sandisk | |
parent | 68f9ef2d575c4d6801730a0a8242227383d682f7 (diff) | |
download | rockbox-4ed387d60313ac79fa7ac8b403bf3195f7c0c549.tar.gz rockbox-4ed387d60313ac79fa7ac8b403bf3195f7c0c549.zip |
Fix reds and yellows (hopefully). Some targets apparently didn't properly #ifdef lcd_enable and lcd_sleep code out, so that it got partly active in the bootloader; rename the ui simulator stub fixes most reds; for the clip: move the hook code into lcd-1bit-vert.c which should fix the bootloader red.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20333 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/sandisk')
-rw-r--r-- | firmware/target/arm/sandisk/sansa-c200/lcd-c200.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/firmware/target/arm/sandisk/sansa-c200/lcd-c200.c b/firmware/target/arm/sandisk/sansa-c200/lcd-c200.c index be730d3291..922fb9e1ab 100644 --- a/firmware/target/arm/sandisk/sansa-c200/lcd-c200.c +++ b/firmware/target/arm/sandisk/sansa-c200/lcd-c200.c | |||
@@ -190,6 +190,7 @@ void lcd_set_invert_display(bool yesno) | |||
190 | (void)yesno; | 190 | (void)yesno; |
191 | } | 191 | } |
192 | 192 | ||
193 | #if defined(HAVE_LCD_ENABLE) | ||
193 | void lcd_enable(bool yesno) | 194 | void lcd_enable(bool yesno) |
194 | { | 195 | { |
195 | if (yesno == is_lcd_enabled) | 196 | if (yesno == is_lcd_enabled) |
@@ -206,11 +207,14 @@ void lcd_enable(bool yesno) | |||
206 | lcd_send_command(R_STANDBY_ON); | 207 | lcd_send_command(R_STANDBY_ON); |
207 | } | 208 | } |
208 | } | 209 | } |
210 | #endif | ||
209 | 211 | ||
210 | bool lcd_enabled(void) | 212 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
213 | bool lcd_active(void) | ||
211 | { | 214 | { |
212 | return is_lcd_enabled; | 215 | return is_lcd_enabled; |
213 | } | 216 | } |
217 | #endif | ||
214 | 218 | ||
215 | 219 | ||
216 | /* turn the display upside down (call lcd_update() afterwards) */ | 220 | /* turn the display upside down (call lcd_update() afterwards) */ |
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c index e1a4d738d7..eebd678b83 100644 --- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | |||
@@ -22,11 +22,11 @@ | |||
22 | * KIND, either express or implied. | 22 | * KIND, either express or implied. |
23 | * | 23 | * |
24 | ****************************************************************************/ | 24 | ****************************************************************************/ |
25 | #include "lcd.h" | ||
26 | #include "system.h" | ||
27 | #include <string.h> | 25 | #include <string.h> |
28 | #include "backlight-target.h" | ||
29 | #include "cpu.h" | 26 | #include "cpu.h" |
27 | #include "system.h" | ||
28 | #include "backlight-target.h" | ||
29 | #include "lcd.h" | ||
30 | 30 | ||
31 | /* Power and display status */ | 31 | /* Power and display status */ |
32 | static bool power_on = false; /* Is the power turned on? */ | 32 | static bool power_on = false; /* Is the power turned on? */ |
@@ -427,7 +427,7 @@ void lcd_init_device(void) | |||
427 | 427 | ||
428 | LCD_REG_6 |= 1; /* Start DMA */ | 428 | LCD_REG_6 |= 1; /* Start DMA */ |
429 | } | 429 | } |
430 | 430 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | |
431 | void lcd_enable(bool on) | 431 | void lcd_enable(bool on) |
432 | { | 432 | { |
433 | if (on == display_on) | 433 | if (on == display_on) |
@@ -455,7 +455,7 @@ bool lcd_active(void) | |||
455 | { | 455 | { |
456 | return display_on; | 456 | return display_on; |
457 | } | 457 | } |
458 | 458 | #endif | |
459 | void lcd_sleep(void) | 459 | void lcd_sleep(void) |
460 | { | 460 | { |
461 | LCD_REG_6 &= ~1; | 461 | LCD_REG_6 &= ~1; |