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 | |
| parent | b165947d81466dce9563816dbe90187b06ed1c93 (diff) | |
| download | rockbox-6b569d3ace5b92f80b5726b2d833bd7a21b5f2cf.zip rockbox-6b569d3ace5b92f80b5726b2d833bd7a21b5f2cf.tar.gz rockbox-6b569d3ace5b92f80b5726b2d833bd7a21b5f2cf.tar.bz2 rockbox-6b569d3ace5b92f80b5726b2d833bd7a21b5f2cf.tar.xz | |
completed the CONFIG_BACKLIGHT transition
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7887 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/settings.c | 4 | ||||
| -rw-r--r-- | apps/settings.h | 2 | ||||
| -rw-r--r-- | apps/settings_menu.c | 4 | ||||
| -rw-r--r-- | firmware/export/backlight.h | 2 | ||||
| -rw-r--r-- | firmware/export/config-iaudiox5.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/apps/settings.c b/apps/settings.c index 7e6947c..63da47e 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -417,7 +417,7 @@ static const struct bit_entry hd_bits[] = {4, S_O(rec_trigger_mode ), 0, "trigger mode", "off,once,repeat"}, #endif -#if CONFIG_BACKLIGHT == BL_IRIVER +#if CONFIG_BACKLIGHT == BL_IRIVER_H100 /* backlight fading */ {2, S_O(backlight_fade_in), 1, "backlight fade in", "off,500ms,1s,2s"}, {3, S_O(backlight_fade_out), 3, "backlight fade out", @@ -843,7 +843,7 @@ void settings_apply(void) #endif backlight_set_timeout(global_settings.backlight_timeout); backlight_set_on_when_charging(global_settings.backlight_on_when_charging); -#if !defined(SIMULATOR) && (CONFIG_BACKLIGHT == BL_IRIVER) +#if CONFIG_BACKLIGHT == BL_IRIVER_H100 backlight_set_fade_in(global_settings.backlight_fade_in); backlight_set_fade_out(global_settings.backlight_fade_out); #endif diff --git a/apps/settings.h b/apps/settings.h index d1a367c..50f38ca 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -220,7 +220,7 @@ struct user_settings 1=always, then according to timeout_values[] */ bool backlight_on_when_charging; -#if CONFIG_BACKLIGHT == BL_IRIVER +#if CONFIG_BACKLIGHT == BL_IRIVER_H100 int backlight_fade_in; /* backlight fade in timing: 0..3 */ int backlight_fade_out; /* backlight fade in timing: 0..7 */ #endif diff --git a/apps/settings_menu.c b/apps/settings_menu.c index ce2399b..9b6ee93 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -166,7 +166,7 @@ static bool backlight_timer(void) INT, names, 19, backlight_set_timeout ); } -#if CONFIG_BACKLIGHT == BL_IRIVER +#if CONFIG_BACKLIGHT == BL_IRIVER_H100 static bool backlight_fade_in(void) { static const struct opt_items names[] = { @@ -1525,7 +1525,7 @@ static bool lcd_settings_menu(void) { ID2P(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_on_when_charging }, #endif { ID2P(LANG_CAPTION_BACKLIGHT), caption_backlight }, -#if CONFIG_BACKLIGHT == BL_IRIVER +#if CONFIG_BACKLIGHT == BL_IRIVER_H100 { ID2P(LANG_BACKLIGHT_FADE_IN), backlight_fade_in }, { ID2P(LANG_BACKLIGHT_FADE_OUT), backlight_fade_out }, #endif diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h index b2a2448..6fee2c0 100644 --- a/firmware/export/backlight.h +++ b/firmware/export/backlight.h @@ -27,7 +27,7 @@ void backlight_off(void); void backlight_tick(void); int backlight_get_timeout(void); void backlight_set_timeout(int index); -#if CONFIG_BACKLIGHT == BL_IRIVER +#if CONFIG_BACKLIGHT == BL_IRIVER_H100 void backlight_set_fade_in(int index); void backlight_set_fade_out(int index); #endif diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index 19a97b1..dd31ada 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h @@ -60,7 +60,7 @@ #define ROM_START 0x11010 /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IRIVER /* port controlled */ +#define CONFIG_BACKLIGHT BL_IRIVER_H100 /* port controlled */ /* Define this to the CPU frequency */ #define CPU_FREQ 11289600 |