diff options
author | Igor B. Poretsky <poretsky@mlbox.ru> | 2015-08-14 18:11:49 +0300 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-06-30 14:20:37 +0000 |
commit | f26cf6a3ecb6b321f8ffdb8f144f5c169b28c0c0 (patch) | |
tree | 7dbdb97cddada6a37e20642478f979bd796f5eca /apps/settings.c | |
parent | 553f2180267ea869a364c929ac2cf1bfc98b6585 (diff) | |
download | rockbox-f26cf6a3ecb6b321f8ffdb8f144f5c169b28c0c0.tar.gz rockbox-f26cf6a3ecb6b321f8ffdb8f144f5c169b28c0c0.zip |
Fixed system state information loss when it is saved in file
Change-Id: If2aca712af4152e144ec919cfc4b4d9cb23bf4f2
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/settings.c b/apps/settings.c index 2d38c4a5ef..2841133957 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -89,7 +89,12 @@ struct system_status global_status; | |||
89 | #include "pcm_sampr.h" | 89 | #include "pcm_sampr.h" |
90 | #endif /* CONFIG_CODEC == SWCODEC */ | 90 | #endif /* CONFIG_CODEC == SWCODEC */ |
91 | 91 | ||
92 | #define NVRAM_DATA_START 8 | ||
93 | #ifdef HAVE_RTC_RAM | ||
92 | #define NVRAM_BLOCK_SIZE 44 | 94 | #define NVRAM_BLOCK_SIZE 44 |
95 | #else | ||
96 | #define NVRAM_BLOCK_SIZE (sizeof(struct system_status) + NVRAM_DATA_START) | ||
97 | #endif | ||
93 | 98 | ||
94 | #ifdef HAVE_LCD_BITMAP | 99 | #ifdef HAVE_LCD_BITMAP |
95 | #define MAX_LINES 10 | 100 | #define MAX_LINES 10 |
@@ -118,7 +123,6 @@ long lasttime = 0; | |||
118 | [4-7] crc32 checksum | 123 | [4-7] crc32 checksum |
119 | [8-NVRAM_BLOCK_SIZE] data | 124 | [8-NVRAM_BLOCK_SIZE] data |
120 | */ | 125 | */ |
121 | #define NVRAM_DATA_START 8 | ||
122 | static char nvram_buffer[NVRAM_BLOCK_SIZE]; | 126 | static char nvram_buffer[NVRAM_BLOCK_SIZE]; |
123 | 127 | ||
124 | static bool read_nvram_data(char* buf, int max_len) | 128 | static bool read_nvram_data(char* buf, int max_len) |