diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-06-21 17:10:22 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-06-21 17:10:22 +0000 |
| commit | 637010541af5677acc676e8c770d07cc8a3187dd (patch) | |
| tree | 8bb6f4daf8fabc69f709a1904aa9fd18636912b4 | |
| parent | b59d6642e21d3b9a7c64824780742aaa2294fee3 (diff) | |
| download | rockbox-637010541af5677acc676e8c770d07cc8a3187dd.zip rockbox-637010541af5677acc676e8c770d07cc8a3187dd.tar.gz rockbox-637010541af5677acc676e8c770d07cc8a3187dd.tar.bz2 rockbox-637010541af5677acc676e8c770d07cc8a3187dd.tar.xz | |
Fix yellows and reds (one was a type, the other was rather incorrect before already)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27021 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/plugins/chip8.c | 2 | ||||
| -rw-r--r-- | firmware/backlight.c | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index a1372cd..f60bdb3 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -1266,7 +1266,7 @@ static void chip8_update_display(void) *row++ = w; } } -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || (LCD_DEPTH > 1) +#if (CONFIG_PLATFORM & PLATFORM_HOSTED) || (LCD_DEPTH >= 4) rb->lcd_set_drawmode(DRMODE_SOLID); rb->lcd_mono_bitmap(lcd_framebuf[0], CHIP8_X, CHIP8_Y, CHIP8_LCDWIDTH, CHIP8_HEIGHT); diff --git a/firmware/backlight.c b/firmware/backlight.c index 6a5070d..5406f1e 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c @@ -37,18 +37,20 @@ #include "lcd.h" #include "screendump.h" +#ifdef HAVE_BACKLIGHT + #ifdef HAVE_REMOTE_LCD #include "lcd-remote.h" #endif -#if defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) - #ifndef SIMULATOR #include "backlight-target.h" #else #include "backlight-sim.h" #endif +#if defined(BACKLIGHT_FULL_INIT) + #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) #include "backlight-sw-fading.h" @@ -960,16 +962,13 @@ void buttonlight_set_brightness(int val) } #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ -#else /* !defined(HAVE_BACKLIGHT) || !defined(BACKLIGHT_FULL_INIT) +#else /* !defined(BACKLIGHT_FULL_INIT) -- no backlight, empty dummy functions */ - -#if defined(HAVE_BACKLIGHT) && !defined(BACKLIGHT_FULL_INIT) void backlight_init(void) { (void)_backlight_init(); _backlight_on(); } -#endif void backlight_on(void) {} void backlight_off(void) {} @@ -998,4 +997,6 @@ void backlight_set_brightness(int val) { (void)val; } #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS void buttonlight_set_brightness(int val) { (void)val; } #endif -#endif /* defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) */ +#endif /* defined(BACKLIGHT_FULL_INIT) */ + +#endif /* HAVE_BACKLIGHT */ |