summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/iriver
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-03-17 03:36:36 +0000
committerThomas Martitz <kugel@rockbox.org>2009-03-17 03:36:36 +0000
commit4ed387d60313ac79fa7ac8b403bf3195f7c0c549 (patch)
treed5bc4861cbdde61b054d12deed4ffea92af03bd3 /firmware/target/arm/iriver
parent68f9ef2d575c4d6801730a0a8242227383d682f7 (diff)
downloadrockbox-4ed387d60313ac79fa7ac8b403bf3195f7c0c549.tar.gz
rockbox-4ed387d60313ac79fa7ac8b403bf3195f7c0c549.tar.bz2
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/iriver')
-rw-r--r--firmware/target/arm/iriver/h10/lcd-h10_20gb.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
index 03a398af8d..5bc2ebc2b3 100644
--- a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
+++ b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
@@ -352,6 +352,7 @@ static void lcd_display_off(void)
lcd_write_reg(R_DISP_CONTROL, 0x0000);
}
+#if defined(HAVE_LCD_ENABLE)
void lcd_enable(bool on)
{
if (on == display_on)
@@ -370,12 +371,9 @@ void lcd_enable(bool on)
lcd_display_off();
}
}
+#endif
-bool lcd_active(void)
-{
- return display_on;
-}
-
+#ifdef HAVE_LCD_SLEEP
void lcd_sleep(void)
{
if (power_on)
@@ -385,6 +383,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 ***/