summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/settings.c4
-rw-r--r--apps/settings.h2
-rw-r--r--apps/settings_menu.c4
-rw-r--r--firmware/export/backlight.h2
-rw-r--r--firmware/export/config-iaudiox5.h2
5 files changed, 7 insertions, 7 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
diff --git a/apps/settings.h b/apps/settings.h
index d1a367cc64..50f38cab50 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -220,7 +220,7 @@ struct user_settings
220 1=always, 220 1=always,
221 then according to timeout_values[] */ 221 then according to timeout_values[] */
222 bool backlight_on_when_charging; 222 bool backlight_on_when_charging;
223#if CONFIG_BACKLIGHT == BL_IRIVER 223#if CONFIG_BACKLIGHT == BL_IRIVER_H100
224 int backlight_fade_in; /* backlight fade in timing: 0..3 */ 224 int backlight_fade_in; /* backlight fade in timing: 0..3 */
225 int backlight_fade_out; /* backlight fade in timing: 0..7 */ 225 int backlight_fade_out; /* backlight fade in timing: 0..7 */
226#endif 226#endif
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index ce2399b1e5..9b6ee931fd 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -166,7 +166,7 @@ static bool backlight_timer(void)
166 INT, names, 19, backlight_set_timeout ); 166 INT, names, 19, backlight_set_timeout );
167} 167}
168 168
169#if CONFIG_BACKLIGHT == BL_IRIVER 169#if CONFIG_BACKLIGHT == BL_IRIVER_H100
170static bool backlight_fade_in(void) 170static bool backlight_fade_in(void)
171{ 171{
172 static const struct opt_items names[] = { 172 static const struct opt_items names[] = {
@@ -1525,7 +1525,7 @@ static bool lcd_settings_menu(void)
1525 { ID2P(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_on_when_charging }, 1525 { ID2P(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_on_when_charging },
1526#endif 1526#endif
1527 { ID2P(LANG_CAPTION_BACKLIGHT), caption_backlight }, 1527 { ID2P(LANG_CAPTION_BACKLIGHT), caption_backlight },
1528#if CONFIG_BACKLIGHT == BL_IRIVER 1528#if CONFIG_BACKLIGHT == BL_IRIVER_H100
1529 { ID2P(LANG_BACKLIGHT_FADE_IN), backlight_fade_in }, 1529 { ID2P(LANG_BACKLIGHT_FADE_IN), backlight_fade_in },
1530 { ID2P(LANG_BACKLIGHT_FADE_OUT), backlight_fade_out }, 1530 { ID2P(LANG_BACKLIGHT_FADE_OUT), backlight_fade_out },
1531#endif 1531#endif
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h
index b2a2448328..6fee2c0db5 100644
--- a/firmware/export/backlight.h
+++ b/firmware/export/backlight.h
@@ -27,7 +27,7 @@ void backlight_off(void);
27void backlight_tick(void); 27void backlight_tick(void);
28int backlight_get_timeout(void); 28int backlight_get_timeout(void);
29void backlight_set_timeout(int index); 29void backlight_set_timeout(int index);
30#if CONFIG_BACKLIGHT == BL_IRIVER 30#if CONFIG_BACKLIGHT == BL_IRIVER_H100
31void backlight_set_fade_in(int index); 31void backlight_set_fade_in(int index);
32void backlight_set_fade_out(int index); 32void backlight_set_fade_out(int index);
33#endif 33#endif
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index 19a97b1164..dd31ada298 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -60,7 +60,7 @@
60#define ROM_START 0x11010 60#define ROM_START 0x11010
61 61
62/* Define this for LCD backlight available */ 62/* Define this for LCD backlight available */
63#define CONFIG_BACKLIGHT BL_IRIVER /* port controlled */ 63#define CONFIG_BACKLIGHT BL_IRIVER_H100 /* port controlled */
64 64
65/* Define this to the CPU frequency */ 65/* Define this to the CPU frequency */
66#define CPU_FREQ 11289600 66#define CPU_FREQ 11289600