summaryrefslogtreecommitdiff
path: root/apps/settings_list.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-01-24 02:19:22 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-01-24 02:19:22 +0000
commit228d62dd18906eaef814ec63cf888b30a94cd1c8 (patch)
treea15e27e0e52222e4514e2b163e726869b33b5397 /apps/settings_list.c
parentcdcffd988372606abea31fad4a815f0b4968b21c (diff)
downloadrockbox-228d62dd18906eaef814ec63cf888b30a94cd1c8.tar.gz
rockbox-228d62dd18906eaef814ec63cf888b30a94cd1c8.zip
Split the system status variables out of global_settings and put them into a new struct global_status. Use status_save() if these need
saving. Added car_adapter_mode to the nvram settings, so nvram settings will be reset. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12101 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r--apps/settings_list.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index bffee257d1..861c3df6ff 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -104,7 +104,7 @@ static const char backlight_times_conf [] =
104 {{cb,LANG_SET_BOOL_YES,LANG_SET_BOOL_NO}}} } 104 {{cb,LANG_SET_BOOL_YES,LANG_SET_BOOL_NO}}} }
105 105
106#define SYSTEM_SETTING(flags,var,default) \ 106#define SYSTEM_SETTING(flags,var,default) \
107 {flags|F_T_INT, GS(var), INT(default), NULL, NULL, UNUSED} 107 {flags|F_T_INT, &global_status.var, INT(default), NULL, NULL, UNUSED}
108 108
109#define FILENAME_SETTING(flags,var,name,default,prefix,suffix,len) \ 109#define FILENAME_SETTING(flags,var,name,default,prefix,suffix,len) \
110 {flags|F_T_UCHARPTR, GS(var), CHARPTR(default),name,NULL,\ 110 {flags|F_T_UCHARPTR, GS(var), CHARPTR(default),name,NULL,\
@@ -179,7 +179,7 @@ const struct settings_list settings[] = {
179 {F_T_INT,GS(battery_capacity),INT(BATTERY_CAPACITY_DEFAULT), 179 {F_T_INT,GS(battery_capacity),INT(BATTERY_CAPACITY_DEFAULT),
180 "battery capacity",NULL,UNUSED}, 180 "battery capacity",NULL,UNUSED},
181#ifdef CONFIG_CHARGING 181#ifdef CONFIG_CHARGING
182 OFFON_SETTING(0,car_adapter_mode,false,"car adapter mode", NULL), 182 OFFON_SETTING(NVRAM(1),car_adapter_mode,false,"car adapter mode", NULL),
183#endif 183#endif
184 /* tuner */ 184 /* tuner */
185#ifdef CONFIG_TUNER 185#ifdef CONFIG_TUNER