diff options
author | Markus Braun <markus.braun@krawel.de> | 2002-08-07 10:50:46 +0000 |
---|---|---|
committer | Markus Braun <markus.braun@krawel.de> | 2002-08-07 10:50:46 +0000 |
commit | 80be3c319ee49f8f619cffbbef9bd4923718f7da (patch) | |
tree | 65873a90211099fd7a082e9724a2cadcaf17ed44 /apps | |
parent | de8fbf00a8a4a2c85fc9ee4b2758881f4ec435d9 (diff) | |
download | rockbox-80be3c319ee49f8f619cffbbef9bd4923718f7da.tar.gz rockbox-80be3c319ee49f8f619cffbbef9bd4923718f7da.zip |
Moved rtc config bit for status bar from 0x12 to 0xe
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1583 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/settings.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/apps/settings.c b/apps/settings.c index f3e7e554ad..e50fe46580 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -267,7 +267,8 @@ int settings_save( void ) | |||
267 | ((global_settings.playlist_shuffle & 1) | | 267 | ((global_settings.playlist_shuffle & 1) | |
268 | ((global_settings.mp3filter & 1) << 1) | | 268 | ((global_settings.mp3filter & 1) << 1) | |
269 | ((global_settings.sort_case & 1) << 2) | | 269 | ((global_settings.sort_case & 1) << 2) | |
270 | ((global_settings.discharge & 1) << 3)); | 270 | ((global_settings.discharge & 1) << 3) | |
271 | ((global_settings.statusbar & 1) << 4)); | ||
271 | 272 | ||
272 | rtc_config_block[0xf] = (unsigned char) | 273 | rtc_config_block[0xf] = (unsigned char) |
273 | ((global_settings.scroll_speed << 3) | | 274 | ((global_settings.scroll_speed << 3) | |
@@ -275,9 +276,6 @@ int settings_save( void ) | |||
275 | 276 | ||
276 | rtc_config_block[0x11] = (unsigned char)global_settings.avc; | 277 | rtc_config_block[0x11] = (unsigned char)global_settings.avc; |
277 | 278 | ||
278 | rtc_config_block[0x12] = (unsigned char) | ||
279 | ((global_settings.statusbar & 1)); | ||
280 | |||
281 | memcpy(&rtc_config_block[0x24], &global_settings.total_uptime, 4); | 279 | memcpy(&rtc_config_block[0x24], &global_settings.total_uptime, 4); |
282 | 280 | ||
283 | if(save_config_buffer()) | 281 | if(save_config_buffer()) |
@@ -338,6 +336,7 @@ void settings_load(void) | |||
338 | global_settings.mp3filter = (rtc_config_block[0xe] >> 1) & 1; | 336 | global_settings.mp3filter = (rtc_config_block[0xe] >> 1) & 1; |
339 | global_settings.sort_case = (rtc_config_block[0xe] >> 2) & 1; | 337 | global_settings.sort_case = (rtc_config_block[0xe] >> 2) & 1; |
340 | global_settings.discharge = (rtc_config_block[0xe] >> 3) & 1; | 338 | global_settings.discharge = (rtc_config_block[0xe] >> 3) & 1; |
339 | global_settings.statusbar = (rtc_config_block[0xe] >> 4) & 1; | ||
341 | } | 340 | } |
342 | 341 | ||
343 | c = rtc_config_block[0xf] >> 3; | 342 | c = rtc_config_block[0xf] >> 3; |
@@ -351,10 +350,6 @@ void settings_load(void) | |||
351 | if (rtc_config_block[0x11] != 0xFF) | 350 | if (rtc_config_block[0x11] != 0xFF) |
352 | global_settings.avc = rtc_config_block[0x11]; | 351 | global_settings.avc = rtc_config_block[0x11]; |
353 | 352 | ||
354 | if (rtc_config_block[0x12] != 0xFF) { | ||
355 | global_settings.statusbar = rtc_config_block[0x12] & 1; | ||
356 | } | ||
357 | |||
358 | if (rtc_config_block[0x24] != 0xFF) | 353 | if (rtc_config_block[0x24] != 0xFF) |
359 | memcpy(&global_settings.total_uptime, &rtc_config_block[0x24], 4); | 354 | memcpy(&global_settings.total_uptime, &rtc_config_block[0x24], 4); |
360 | } | 355 | } |