summaryrefslogtreecommitdiffstats
path: root/apps/menus/display_menu.c
diff options
context:
space:
mode:
authorSteve Bavin <pondlife@pondlife.me>2008-11-26 08:26:13 +0000
committerSteve Bavin <pondlife@pondlife.me>2008-11-26 08:26:13 +0000
commitf6847265804b650b007eb8ecdc86876214ee7302 (patch)
tree5f92d0097167f2e5c257b42427fd182e704ae4c1 /apps/menus/display_menu.c
parent756bcc4bd53b34371c073c8468cbd8c01ffe094a (diff)
downloadrockbox-f6847265804b650b007eb8ecdc86876214ee7302.tar.gz
rockbox-f6847265804b650b007eb8ecdc86876214ee7302.tar.bz2
rockbox-f6847265804b650b007eb8ecdc86876214ee7302.zip
Add software backlight fading for E100/H300/X5/D2, by Thomas Martitz and others - see FS#6800 for credits.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19221 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/display_menu.c')
-rw-r--r--apps/menus/display_menu.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 016255bad1..744a9e9354 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -91,7 +91,8 @@ MENUITEM_SETTING(backlight_on_button_hold,
&global_settings.backlight_on_button_hold, NULL);
#endif
MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL);
-#if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)
+#if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \
+ defined(USE_BACKLIGHT_SW_FADING)
MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL);
MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL);
#endif
@@ -130,9 +131,10 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
,&backlight_on_button_hold
# endif
,&caption_backlight
-# if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)
+#if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \
+ defined(USE_BACKLIGHT_SW_FADING)
,&backlight_fade_in, &backlight_fade_out
-# endif
+#endif
,&bl_filter_first_keypress
# ifdef HAVE_LCD_SLEEP_SETTING
,&lcd_sleep_after_backlight_off