diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2007-07-31 12:43:06 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2007-07-31 12:43:06 +0000 |
commit | 60b01fa0f7e5126406d1fd2f37cce82d2faffdc4 (patch) | |
tree | b3cea13c807d90e3c522bc60e249806f9b5cc15b /firmware/target | |
parent | e95d7a0e76261f936b0eee64dfa0c6090bfb1b8c (diff) | |
download | rockbox-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')
-rw-r--r-- | firmware/target/arm/iriver/h10/lcd-h10_20gb.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | 5 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/x5/lcd-x5.c | 5 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/lcd-h300.c | 5 |
4 files changed, 20 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 | ||
382 | bool lcd_enabled(void) | ||
383 | { | ||
384 | return display_on; | ||
385 | } | ||
386 | |||
382 | void lcd_sleep(void) | 387 | void 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 | ||
462 | bool lcd_enabled(void) | ||
463 | { | ||
464 | return display_on; | ||
465 | } | ||
466 | |||
462 | void lcd_sleep(void) | 467 | void lcd_sleep(void) |
463 | { | 468 | { |
464 | LCD_REG_6 &= ~1; | 469 | LCD_REG_6 &= ~1; |
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-x5.c b/firmware/target/coldfire/iaudio/x5/lcd-x5.c index 92b9fde2e2..2cc5b5ba65 100644 --- a/firmware/target/coldfire/iaudio/x5/lcd-x5.c +++ b/firmware/target/coldfire/iaudio/x5/lcd-x5.c | |||
@@ -399,6 +399,11 @@ void lcd_enable(bool on) | |||
399 | } | 399 | } |
400 | } | 400 | } |
401 | 401 | ||
402 | bool lcd_enabled(void) | ||
403 | { | ||
404 | return display_on; | ||
405 | } | ||
406 | |||
402 | void lcd_sleep(void) | 407 | void lcd_sleep(void) |
403 | { | 408 | { |
404 | if (power_on) | 409 | if (power_on) |
diff --git a/firmware/target/coldfire/iriver/h300/lcd-h300.c b/firmware/target/coldfire/iriver/h300/lcd-h300.c index 3e5642e35d..8f76d5255a 100644 --- a/firmware/target/coldfire/iriver/h300/lcd-h300.c +++ b/firmware/target/coldfire/iriver/h300/lcd-h300.c | |||
@@ -284,6 +284,11 @@ void lcd_enable(bool on) | |||
284 | } | 284 | } |
285 | } | 285 | } |
286 | 286 | ||
287 | bool lcd_enabled(void) | ||
288 | { | ||
289 | return display_on; | ||
290 | } | ||
291 | |||
287 | /*** update functions ***/ | 292 | /*** update functions ***/ |
288 | 293 | ||
289 | /* Performance function that works with an external buffer | 294 | /* Performance function that works with an external buffer |