summaryrefslogtreecommitdiff
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-03-29 23:50:56 +0000
committerThomas Martitz <kugel@rockbox.org>2009-03-29 23:50:56 +0000
commitddc554f62bb99a00b534e5f18aa0f1165df0622f (patch)
tree8b0cdc8f943df11a2920bdc3d8c286460d3faa91 /firmware/target/arm
parent148b0e98fc1361111364a13e64897319735ed4a0 (diff)
Correct some preprocessor checks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20573 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/sandisk/sansa-e200/lcd-e200.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
index eebd678b83..702f95bba9 100644
--- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
@@ -427,7 +427,15 @@ void lcd_init_device(void)
LCD_REG_6 |= 1; /* Start DMA */
}
+
#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
+bool lcd_active(void)
+{
+ return display_on;
+}
+#endif
+
+#if defined(HAVE_LCD_ENABLE)
void lcd_enable(bool on)
{
if (on == display_on)
@@ -450,12 +458,9 @@ void lcd_enable(bool on)
DEV_EN &= ~DEV_LCD; /* Disable LCD controller */
}
}
-
-bool lcd_active(void)
-{
- return display_on;
-}
#endif
+
+#if defined(HAVE_LCD_SLEEP)
void lcd_sleep(void)
{
LCD_REG_6 &= ~1;
@@ -474,6 +479,7 @@ void lcd_sleep(void)
/* SAP2-0=000, BT2-0=000, AP2-0=000, DK=0, SLP=0, STB=1 */
lcd_write_reg(R_POWER_CONTROL1, 0x0001);
}
+#endif
/* Copies a rectangle from one framebuffer to another. Can be used in
single transfer mode with width = num pixels, and height = 1 which