From 9b4fb6d2d2e0cbdb8248499140928bdf1f9dee1c Mon Sep 17 00:00:00 2001 From: mcuelenaere Date: Thu, 17 Dec 2009 14:22:15 +0000 Subject: [PATCH] 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 --- firmware/export/config.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/firmware/export/config.h b/firmware/export/config.h index 594b4f6e6..114952e21 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) -- 2.11.4.GIT