summaryrefslogtreecommitdiff
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-07-31 12:43:06 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-07-31 12:43:06 +0000
commit60b01fa0f7e5126406d1fd2f37cce82d2faffdc4 (patch)
treeb3cea13c807d90e3c522bc60e249806f9b5cc15b /firmware/target/arm
parente95d7a0e76261f936b0eee64dfa0c6090bfb1b8c (diff)
downloadrockbox-60b01fa0f7e5126406d1fd2f37cce82d2faffdc4.tar.gz
rockbox-60b01fa0f7e5126406d1fd2f37cce82d2faffdc4.zip
Straignten out some issues with HAVE_LCD_ENABLE. 1g/2g/3g had it defined but it shouldn't have been. lcd_enabled() was only available as a real function on gigabeat but others can use that too. Markup lcd.h a bit because I got a bit lost in it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14100 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/iriver/h10/lcd-h10_20gb.c5
-rw-r--r--firmware/target/arm/sandisk/sansa-e200/lcd-e200.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
index 5ef18b41ad..f6ea87c1d0 100644
--- a/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
+++ b/firmware/target/arm/iriver/h10/lcd-h10_20gb.c
@@ -379,6 +379,11 @@ void lcd_enable(bool on)
379 } 379 }
380} 380}
381 381
382bool lcd_enabled(void)
383{
384 return display_on;
385}
386
382void lcd_sleep(void) 387void lcd_sleep(void)
383{ 388{
384 if (power_on) 389 if (power_on)
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
index 67bca23981..ba194f3272 100644
--- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
@@ -459,6 +459,11 @@ void lcd_enable(bool on)
459 } 459 }
460} 460}
461 461
462bool lcd_enabled(void)
463{
464 return display_on;
465}
466
462void lcd_sleep(void) 467void lcd_sleep(void)
463{ 468{
464 LCD_REG_6 &= ~1; 469 LCD_REG_6 &= ~1;