diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 03:36:36 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 03:36:36 +0000 |
commit | 4ed387d60313ac79fa7ac8b403bf3195f7c0c549 (patch) | |
tree | d5bc4861cbdde61b054d12deed4ffea92af03bd3 /firmware/target/arm/iriver/h10 | |
parent | 68f9ef2d575c4d6801730a0a8242227383d682f7 (diff) | |
download | rockbox-4ed387d60313ac79fa7ac8b403bf3195f7c0c549.tar.gz 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/h10')
-rw-r--r-- | firmware/target/arm/iriver/h10/lcd-h10_20gb.c | 16 |
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) | |||
352 | lcd_write_reg(R_DISP_CONTROL, 0x0000); | 352 | lcd_write_reg(R_DISP_CONTROL, 0x0000); |
353 | } | 353 | } |
354 | 354 | ||
355 | #if defined(HAVE_LCD_ENABLE) | ||
355 | void lcd_enable(bool on) | 356 | void lcd_enable(bool on) |
356 | { | 357 | { |
357 | if (on == display_on) | 358 | if (on == display_on) |
@@ -370,12 +371,9 @@ void lcd_enable(bool on) | |||
370 | lcd_display_off(); | 371 | lcd_display_off(); |
371 | } | 372 | } |
372 | } | 373 | } |
374 | #endif | ||
373 | 375 | ||
374 | bool lcd_active(void) | 376 | #ifdef HAVE_LCD_SLEEP |
375 | { | ||
376 | return display_on; | ||
377 | } | ||
378 | |||
379 | void lcd_sleep(void) | 377 | void lcd_sleep(void) |
380 | { | 378 | { |
381 | if (power_on) | 379 | if (power_on) |
@@ -385,6 +383,14 @@ void lcd_sleep(void) | |||
385 | /* BT2-0=000, DC2-0=000, AP2-0=000, SLP=0, STB=1 */ | 383 | /* BT2-0=000, DC2-0=000, AP2-0=000, SLP=0, STB=1 */ |
386 | lcd_write_reg(R_POWER_CONTROL1, 0x0001); | 384 | lcd_write_reg(R_POWER_CONTROL1, 0x0001); |
387 | } | 385 | } |
386 | #endif | ||
387 | |||
388 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | ||
389 | bool lcd_active(void) | ||
390 | { | ||
391 | return display_on; | ||
392 | } | ||
393 | #endif | ||
388 | 394 | ||
389 | /*** update functions ***/ | 395 | /*** update functions ***/ |
390 | 396 | ||