summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2002-06-20 09:01:50 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2002-06-20 09:01:50 +0000
commit601924a777e9e4840990e60f263a4a313da90c3e (patch)
tree750ca7c8869e540e16201e2110a8b4c5603f5cd4 /firmware
parente743c45d9877504705726600cc18252f7f022691 (diff)
downloadrockbox-601924a777e9e4840990e60f263a4a313da90c3e.tar.gz
rockbox-601924a777e9e4840990e60f263a4a313da90c3e.zip
Added global_settings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1116 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/settings.c7
-rw-r--r--firmware/settings.h6
2 files changed, 5 insertions, 8 deletions
diff --git a/firmware/settings.c b/firmware/settings.c
index db86ecb651..da69a9d254 100644
--- a/firmware/settings.c
+++ b/firmware/settings.c
@@ -24,6 +24,8 @@
24#include "panic.h" 24#include "panic.h"
25#include "debug.h" 25#include "debug.h"
26 26
27user_settings_t global_settings;
28
27/* 29/*
28 * persist all runtime user settings to disk 30 * persist all runtime user settings to disk
29 */ 31 */
@@ -97,8 +99,3 @@ void display_current_settings( user_settings_t *settings )
97 settings = settings; 99 settings = settings;
98#endif 100#endif
99} 101}
100
101
102
103
104
diff --git a/firmware/settings.h b/firmware/settings.h
index 935c611161..53b2b4738d 100644
--- a/firmware/settings.h
+++ b/firmware/settings.h
@@ -64,6 +64,9 @@ void reload_all_settings( user_settings_t *settings );
64void reset_settings( user_settings_t *settings ); 64void reset_settings( user_settings_t *settings );
65void display_current_settings( user_settings_t *settings ); 65void display_current_settings( user_settings_t *settings );
66 66
67/* global settings */
68extern user_settings_t global_settings;
69
67/* system defines */ 70/* system defines */
68 71
69#define DEFAULT_VOLUME_SETTING 70 72#define DEFAULT_VOLUME_SETTING 70
@@ -78,6 +81,3 @@ void display_current_settings( user_settings_t *settings );
78 81
79 82
80#endif /* __SETTINGS_H__ */ 83#endif /* __SETTINGS_H__ */
81
82
83