diff options
Diffstat (limited to 'apps/settings_menu.c')
-rw-r--r-- | apps/settings_menu.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index c61352b1cc..eae39f905f 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -77,7 +77,7 @@ static bool contrast(void) | |||
77 | MAX_CONTRAST_SETTING ); | 77 | MAX_CONTRAST_SETTING ); |
78 | } | 78 | } |
79 | 79 | ||
80 | #ifdef HAVE_BACKLIGHT | 80 | #ifdef CONFIG_BACKLIGHT |
81 | static bool caption_backlight(void) | 81 | static bool caption_backlight(void) |
82 | { | 82 | { |
83 | bool rc = set_bool( str(LANG_CAPTION_BACKLIGHT), | 83 | bool rc = set_bool( str(LANG_CAPTION_BACKLIGHT), |
@@ -575,7 +575,8 @@ static bool useMRB(void) | |||
575 | names, 3, NULL ); | 575 | names, 3, NULL ); |
576 | } | 576 | } |
577 | 577 | ||
578 | #ifdef HAVE_BACKLIGHT | 578 | #ifdef CONFIG_BACKLIGHT |
579 | #ifdef HAVE_CHARGING | ||
579 | static bool backlight_on_when_charging(void) | 580 | static bool backlight_on_when_charging(void) |
580 | { | 581 | { |
581 | bool result = set_bool(str(LANG_BACKLIGHT_ON_WHEN_CHARGING), | 582 | bool result = set_bool(str(LANG_BACKLIGHT_ON_WHEN_CHARGING), |
@@ -583,6 +584,7 @@ static bool backlight_on_when_charging(void) | |||
583 | backlight_set_on_when_charging(global_settings.backlight_on_when_charging); | 584 | backlight_set_on_when_charging(global_settings.backlight_on_when_charging); |
584 | return result; | 585 | return result; |
585 | } | 586 | } |
587 | #endif | ||
586 | 588 | ||
587 | static bool backlight_timer(void) | 589 | static bool backlight_timer(void) |
588 | { | 590 | { |
@@ -610,7 +612,7 @@ static bool backlight_timer(void) | |||
610 | return set_option(str(LANG_BACKLIGHT), &global_settings.backlight_timeout, | 612 | return set_option(str(LANG_BACKLIGHT), &global_settings.backlight_timeout, |
611 | INT, names, 19, backlight_set_timeout ); | 613 | INT, names, 19, backlight_set_timeout ); |
612 | } | 614 | } |
613 | #endif /* HAVE_BACKLIGHT */ | 615 | #endif /* CONFIG_BACKLIGHT */ |
614 | 616 | ||
615 | static bool poweroff_idle_timer(void) | 617 | static bool poweroff_idle_timer(void) |
616 | { | 618 | { |
@@ -1162,11 +1164,13 @@ static bool lcd_settings_menu(void) | |||
1162 | bool result; | 1164 | bool result; |
1163 | 1165 | ||
1164 | static const struct menu_item items[] = { | 1166 | static const struct menu_item items[] = { |
1165 | #ifdef HAVE_BACKLIGHT | 1167 | #ifdef CONFIG_BACKLIGHT |
1166 | { ID2P(LANG_BACKLIGHT), backlight_timer }, | 1168 | { ID2P(LANG_BACKLIGHT), backlight_timer }, |
1169 | #ifdef HAVE_CHARGING | ||
1167 | { ID2P(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_on_when_charging }, | 1170 | { ID2P(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_on_when_charging }, |
1168 | { ID2P(LANG_CAPTION_BACKLIGHT), caption_backlight }, | ||
1169 | #endif | 1171 | #endif |
1172 | { ID2P(LANG_CAPTION_BACKLIGHT), caption_backlight }, | ||
1173 | #endif /* CONFIG_BACKLIGHT */ | ||
1170 | { ID2P(LANG_CONTRAST), contrast }, | 1174 | { ID2P(LANG_CONTRAST), contrast }, |
1171 | #ifdef HAVE_LCD_BITMAP | 1175 | #ifdef HAVE_LCD_BITMAP |
1172 | { ID2P(LANG_INVERT), invert }, | 1176 | { ID2P(LANG_INVERT), invert }, |