Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a problem with the nvram settings which meant adding new items to the end needed the version bump (they dont anymore, but I'm bumping it now anyway to save some bug reports)

Browse source 
Also operator precedence fixing.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14290 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-08-12 07:22:38 +00:00
parent bcf97a4801
commit 7cb80a2a70
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/filetypes.c
View file

@ -241,7 +241,7 @@ void filetype_init(void)
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
/* the extra item here is for the unknown types /* the extra item here is for the unknown types
which use the last array element */ which use the last array element */
custom_colors = (int*)buffer_alloc(sizeof(int)*max_types+1); custom_colors = (int*)buffer_alloc(sizeof(int)*(max_types+1));
#endif #endif
/* set the directory item first */ /* set the directory item first */
filetypes[0].extension = NULL; filetypes[0].extension = NULL;

9
apps/settings.c
View file

@ -143,16 +143,23 @@ static bool read_nvram_data(char* buf, int max_len)
/* all good, so read in the settings */ /* all good, so read in the settings */
var_count = buf[3]; var_count = buf[3];
buf_pos = NVRAM_DATA_START; buf_pos = NVRAM_DATA_START;
for(i=0; (i<nb_settings) && (var_count>0) && (buf_pos<max_len); i++) for(i=0; i<nb_settings; i++)
{ {
int nvram_bytes = (settings[i].flags&F_NVRAM_BYTES_MASK) int nvram_bytes = (settings[i].flags&F_NVRAM_BYTES_MASK)
>>F_NVRAM_MASK_SHIFT; >>F_NVRAM_MASK_SHIFT;
if (nvram_bytes) if (nvram_bytes)
{
if ((var_count>0) && (buf_pos<max_len))
{ {
memcpy(settings[i].setting,&buf[buf_pos],nvram_bytes); memcpy(settings[i].setting,&buf[buf_pos],nvram_bytes);
buf_pos += nvram_bytes; buf_pos += nvram_bytes;
var_count--; var_count--;
} }
else /* should only happen when new items are added to the end */
{
memcpy(settings[i].setting, &settings[i].default_val, nvram_bytes);
}
}
} }
return true; return true;
} }

2
apps/settings_list.h
View file

@ -96,7 +96,7 @@ struct choice_setting {
#define F_NVRAM_BYTES_MASK 0xE000 /*0-4 bytes can be stored */ #define F_NVRAM_BYTES_MASK 0xE000 /*0-4 bytes can be stored */
#define F_NVRAM_MASK_SHIFT 13 #define F_NVRAM_MASK_SHIFT 13
#define NVRAM_CONFIG_VERSION 2 #define NVRAM_CONFIG_VERSION 3
/* Above define should be bumped if /* Above define should be bumped if
- a new NVRAM setting is added between 2 other NVRAM settings - a new NVRAM setting is added between 2 other NVRAM settings
- number of bytes for a NVRAM setting is changed - number of bytes for a NVRAM setting is changed