From 12a0ed3b8dd5d8996abf827115f526e21e838872 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Mon, 26 Jan 2009 23:21:49 +0000 Subject: Commit FS#9724, which reworks the preprocessor defines related to backlight fading to a CONFIG_BACKLIGHT_FADING style. The apps/ code will only see which setting is supposed to be used, specific backlight fading handling is kept in firmware, slightly reword the manual text about software fading too with regards to the Gigabeat S git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19860 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'apps/settings.h') diff --git a/apps/settings.h b/apps/settings.h index efa50f78dd..50c53718f7 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -681,11 +681,10 @@ struct user_settings int lcd_sleep_after_backlight_off; /* when to put lcd to sleep after backlight has turned off */ #endif -#if defined(HAVE_BACKLIGHT_PWM_FADING) +#if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) int backlight_fade_in; /* backlight fade in timing: 0..3 */ int backlight_fade_out; /* backlight fade in timing: 0..7 */ -#elif defined(USE_BACKLIGHT_SW_FADING) \ - || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) +#elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) bool backlight_fade_in; bool backlight_fade_out; #endif -- cgit v1.2.3