summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2022-11-23 21:09:49 -0500
committerWilliam Wilgus <wilgus.william@gmail.com>2022-11-23 21:14:09 -0500
commit80b8b13544c79f57bf7da6320cee5d76c162e96c (patch)
tree4b4082f4457dd6652e81d48a84a602f5410322cb
parent8379c6eb07e7daf26ca74aac7f46c4e331743d84 (diff)
downloadrockbox-80b8b13544c79f57bf7da6320cee5d76c162e96c.tar.gz
rockbox-80b8b13544c79f57bf7da6320cee5d76c162e96c.zip
BUG FIX settings_list fix un-macro'd int_settings for backlight & contrast
missed these Change-Id: Ifdc682cc36a9192c8e0bbd2e2fee1f32946362e7
-rw-r--r--apps/settings_list.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index e92753d1bf..8e6271dd41 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -945,8 +945,10 @@ const struct settings_list settings[] = {
945 { F_T_INT|F_DEF_ISFUNC|F_INT_SETTING, &global_settings.contrast, 945 { F_T_INT|F_DEF_ISFUNC|F_INT_SETTING, &global_settings.contrast,
946 LANG_CONTRAST, FUNCTYPE(lcd_default_contrast), "contrast", NULL , { 946 LANG_CONTRAST, FUNCTYPE(lcd_default_contrast), "contrast", NULL , {
947 .int_setting = (struct int_setting[]) { 947 .int_setting = (struct int_setting[]) {
948 { lcd_set_contrast, UNIT_INT, MIN_CONTRAST_SETTING, 948 { .option_callback = lcd_set_contrast,
949 MAX_CONTRAST_SETTING, 1, NULL, NULL }}}}, 949 .unit = UNIT_INT, .step = 1,
950 .min = MIN_CONTRAST_SETTING, .max = MAX_CONTRAST_SETTING,
951 .formatter = NULL, .get_talk_id = NULL }}}},
950#endif 952#endif
951#ifdef HAVE_BACKLIGHT 953#ifdef HAVE_BACKLIGHT
952 TABLE_SETTING_LIST(F_TIME_SETTING | F_ALLOW_ARBITRARY_VALS, 954 TABLE_SETTING_LIST(F_TIME_SETTING | F_ALLOW_ARBITRARY_VALS,
@@ -1062,8 +1064,10 @@ const struct settings_list settings[] = {
1062 LANG_BATTERY_CAPACITY, FUNCTYPE(battery_default_capacity), 1064 LANG_BATTERY_CAPACITY, FUNCTYPE(battery_default_capacity),
1063 "battery capacity", NULL , { 1065 "battery capacity", NULL , {
1064 .int_setting = (struct int_setting[]) { 1066 .int_setting = (struct int_setting[]) {
1065 { set_battery_capacity, UNIT_MAH, BATTERY_CAPACITY_MIN, 1067 { .option_callback = set_battery_capacity,
1066 BATTERY_CAPACITY_MAX, BATTERY_CAPACITY_INC, NULL, NULL }}}}, 1068 .unit = UNIT_MAH, .step = BATTERY_CAPACITY_INC,
1069 .min = BATTERY_CAPACITY_MIN, .max = BATTERY_CAPACITY_MAX,
1070 .formatter = NULL, .get_talk_id = NULL }}}},
1067#else /* IPOD_VIDEO */ 1071#else /* IPOD_VIDEO */
1068 INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY, 1072 INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY,
1069 BATTERY_CAPACITY_DEFAULT, "battery capacity", UNIT_MAH, 1073 BATTERY_CAPACITY_DEFAULT, "battery capacity", UNIT_MAH,