From fa0f02cacd76b64a38c9cb62af98b2de0bbc8aea Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Fri, 16 Jan 2004 09:40:37 +0000 Subject: Fixed the settings crash. The SH1 CPU is very picky about alignment. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4249 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/settings.c b/apps/settings.c index 2e9518afc1..864c4cd186 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -353,14 +353,12 @@ int settings_save( void ) ((global_settings.avc & 0x03) | ((global_settings.channel_config & 0x07) << 2)); -#if 0 *((short*)(&config_block[0x12])) = global_settings.resume_index; *((short*)(&config_block[0x14])) = global_settings.resume_first_index; - *((int*)(&config_block[0x16])) = global_settings.resume_offset; + memcpy(&config_block[0x16], &global_settings.resume_offset, 4); DEBUGF( "+Resume index %X offset %X\n", global_settings.resume_index, global_settings.resume_offset ); -#endif config_block[0x1a] = (unsigned char)global_settings.disk_spindown; config_block[0x1b] = (unsigned char) @@ -372,9 +370,7 @@ int settings_save( void ) (global_settings.flip_display ? 0x40 : 0) | (global_settings.rec_editable?0x80:0); -#if 0 - *((int*)(&config_block[0x1d])) = global_settings.resume_seed; -#endif + memcpy(&config_block[0x1d], &global_settings.resume_seed, 4); config_block[0x21] = (unsigned char) ((global_settings.repeat_mode & 3) | @@ -664,7 +660,7 @@ void settings_load(void) global_settings.resume_first_index= *((short*)(&config_block[0x14])); if (config_block[0x16] != 0xFF) - global_settings.resume_offset = *((int*)(&config_block[0x16])); + memcpy(&global_settings.resume_offset, &config_block[0x16], 4); if (config_block[0x1a] != 0xFF) global_settings.disk_spindown = config_block[0x1a]; @@ -685,7 +681,7 @@ void settings_load(void) } if (config_block[0x1d] != 0xFF) - global_settings.resume_seed = *((int*)(&config_block[0x1d])); + memcpy(&global_settings.resume_seed,&config_block[0x1d], 4); if (config_block[0x21] != 0xFF) { -- cgit v1.2.3