summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/iriver
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-03-17 04:22:28 +0000
committerThomas Martitz <kugel@rockbox.org>2009-03-17 04:22:28 +0000
commitd0e834aa7349fab6367e74d0df88575dfd854496 (patch)
treebc4487049a425e7dd9c26426641fee5f827ac2bf /firmware/target/arm/iriver
parent9771c9c77190910309901ceaf3400b3e2c94a536 (diff)
downloadrockbox-d0e834aa7349fab6367e74d0df88575dfd854496.tar.gz
rockbox-d0e834aa7349fab6367e74d0df88575dfd854496.tar.bz2
rockbox-d0e834aa7349fab6367e74d0df88575dfd854496.zip
Okay, this should be the last. I'm sorry for the trouble, but now everything *should* be properly #ifdef'd (which wasn't before) :/
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20336 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/iriver')
-rw-r--r--firmware/target/arm/iriver/h10/lcd-h10_20gb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
index 7b42dfe4d9..547999aed3 100644
--- a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
+++ b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
@@ -187,6 +187,7 @@ void lcd_init_device(void)
lcd_contrast = DEFAULT_CONTRAST_SETTING << 8;
}
+#ifdef HAVE_LCD_SLEEP
static void lcd_power_on(void)
{
/* Be sure standby bit is clear. */
@@ -274,7 +275,6 @@ static void lcd_power_on(void)
power_on = true;
}
-#ifdef HAVE_LCD_SLEEP
static void lcd_power_off(void)
{
/* Display must be off first */
@@ -314,7 +314,7 @@ void lcd_sleep(void)
}
#endif
-
+#if defined(HAVE_LCD_ENABLE)
static void lcd_display_off(void)
{
display_on = false;
@@ -337,8 +337,6 @@ static void lcd_display_off(void)
/* PT1-0=00, VLE2-1=00, SPT=0, GON=0, DTE=0, REV=0, D1-0=00 */
lcd_write_reg(R_DISP_CONTROL, 0x0000);
}
-
-#if defined(HAVE_LCD_ENABLE)
static void lcd_display_on(void)
{
/* Be sure power is on first */