summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2009-12-17 14:22:15 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2009-12-17 14:22:15 +0000
commit665bdd5638bc6a24a805d9ef302a10f8eee18708 (patch)
tree7ba4c71cd8b203dbb9a5e8b9a94dd41b2add2c4f
parentb7879ad742e0a462f85065fc5da7887b9ca2f07c (diff)
downloadrockbox-665bdd5638bc6a24a805d9ef302a10f8eee18708.tar.gz
rockbox-665bdd5638bc6a24a805d9ef302a10f8eee18708.zip
Don't do fading in simulator on targets with BACKLIGHT_FADING_PWM or BACKLIGHT_FADING_TARGET (should fix red)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24045 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/config.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 594b4f6e6f..114952e211 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -558,17 +558,14 @@ Lyre prototype 1 */
#define CONFIG_TUNER_MULTI
#endif
-/* deactivate fading in bootloader */
-#ifdef BOOTLOADER
+/* deactivate fading in bootloader/sim */
+#if defined(BOOTLOADER) || (defined(SIMULATOR) && \
+ (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM || \
+ CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_TARGET))
#undef CONFIG_BACKLIGHT_FADING
#define CONFIG_BACKLIGHT_FADING BACKLIGHT_NO_FADING
#endif
-#ifdef SIMULATOR
-#undef CONFIG_BACKLIGHT_FADING
-#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING
-#endif
-
/* determine which setting/manual text to use */
#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM)