diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-11-14 23:37:19 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-11-14 23:37:19 +0000 |
commit | 6b569d3ace5b92f80b5726b2d833bd7a21b5f2cf (patch) | |
tree | 26ba8e6ad899a909090c0d2642c5ff4880fc4714 /apps/settings.c | |
parent | b165947d81466dce9563816dbe90187b06ed1c93 (diff) | |
download | rockbox-6b569d3ace5b92f80b5726b2d833bd7a21b5f2cf.tar.gz rockbox-6b569d3ace5b92f80b5726b2d833bd7a21b5f2cf.zip |
completed the CONFIG_BACKLIGHT transition
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7887 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/settings.c b/apps/settings.c index 7e6947ce09..63da47e34b 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -417,7 +417,7 @@ static const struct bit_entry hd_bits[] = | |||
417 | {4, S_O(rec_trigger_mode ), 0, "trigger mode", "off,once,repeat"}, | 417 | {4, S_O(rec_trigger_mode ), 0, "trigger mode", "off,once,repeat"}, |
418 | #endif | 418 | #endif |
419 | 419 | ||
420 | #if CONFIG_BACKLIGHT == BL_IRIVER | 420 | #if CONFIG_BACKLIGHT == BL_IRIVER_H100 |
421 | /* backlight fading */ | 421 | /* backlight fading */ |
422 | {2, S_O(backlight_fade_in), 1, "backlight fade in", "off,500ms,1s,2s"}, | 422 | {2, S_O(backlight_fade_in), 1, "backlight fade in", "off,500ms,1s,2s"}, |
423 | {3, S_O(backlight_fade_out), 3, "backlight fade out", | 423 | {3, S_O(backlight_fade_out), 3, "backlight fade out", |
@@ -843,7 +843,7 @@ void settings_apply(void) | |||
843 | #endif | 843 | #endif |
844 | backlight_set_timeout(global_settings.backlight_timeout); | 844 | backlight_set_timeout(global_settings.backlight_timeout); |
845 | backlight_set_on_when_charging(global_settings.backlight_on_when_charging); | 845 | backlight_set_on_when_charging(global_settings.backlight_on_when_charging); |
846 | #if !defined(SIMULATOR) && (CONFIG_BACKLIGHT == BL_IRIVER) | 846 | #if CONFIG_BACKLIGHT == BL_IRIVER_H100 |
847 | backlight_set_fade_in(global_settings.backlight_fade_in); | 847 | backlight_set_fade_in(global_settings.backlight_fade_in); |
848 | backlight_set_fade_out(global_settings.backlight_fade_out); | 848 | backlight_set_fade_out(global_settings.backlight_fade_out); |
849 | #endif | 849 | #endif |