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/coldfire/iaudio/x5 | |
| 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/coldfire/iaudio/x5')
| -rw-r--r-- | firmware/target/coldfire/iaudio/x5/lcd-x5.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-x5.c b/firmware/target/coldfire/iaudio/x5/lcd-x5.c index 4737f31bc8..105dc43322 100644 --- a/firmware/target/coldfire/iaudio/x5/lcd-x5.c +++ b/firmware/target/coldfire/iaudio/x5/lcd-x5.c @@ -374,6 +374,7 @@ void lcd_init_device(void) #endif } +#if defined(HAVE_LCD_ENABLE) void lcd_enable(bool on) { if (on == display_on) @@ -392,12 +393,10 @@ void lcd_enable(bool on) lcd_display_off(); } } +#endif -bool lcd_active(void) -{ - return display_on; -} +#if defined(HAVE_LCD_SLEEP) void lcd_sleep(void) { if (power_on) @@ -407,7 +406,14 @@ void lcd_sleep(void) /* BT2-0=000, DC2-0=000, AP2-0=000, SLP=0, STB=1 */ lcd_write_reg(R_POWER_CONTROL1, 0x0001); } +#endif +#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) +bool lcd_active(void) +{ + return display_on; +} +#endif /*** update functions ***/ /* Line write helper function for lcd_yuv_blit. Write two lines of yuv420. |