[board msba2-common board-config]

* fixed casting to satisfy strict-aliasing rules
12 years ago · 4870dc7be4
parent 5993dad674
commit 4870dc7be4
1 changed files with 8 additions and 6 deletions
--- a/board/msba2-common/board_config.c
+++ b/board/msba2-common/board_config.c
@ -5,12 +5,14 @@

 void config_load(void) {
    extern char configmem[];
-   if (*((uint16_t*) configmem) ==  CONFIG_KEY) {
-       memcpy(&sysconfig, (configmem + sizeof(CONFIG_KEY)), sizeof(sysconfig));
-   }
-   else {
-       config_save();
-   }
+    /* cast it here for strict-aliasing */
+    uint16_t* tmp = (uint16_t*) configmem;
+    if (*tmp ==  CONFIG_KEY) {
+        memcpy(&sysconfig, (configmem + sizeof(CONFIG_KEY)), sizeof(sysconfig));
+    }
+    else {
+        config_save();
+    }
 }

 uint8_t config_save(void) {