altos: Make ao_xmem funcs require __xdata void * instead of casting

[fw/altos] / src / core / ao_config.c

diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index 7f999feb10ea2612f1fcfd87953c3654481f22bd..f0a576ee9692289b0784ba9e62a232fb1ab910fc 100644 (file)
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -78,8 +78,8 @@ _ao_config_get(void)
                /* Version 0 stuff */
                ao_config.main_deploy = AO_CONFIG_DEFAULT_MAIN_DEPLOY;
                ao_config.radio_channel = AO_CONFIG_DEFAULT_RADIO_CHANNEL;
-               memset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
-               memcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
+               ao_xmemset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
+               ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
                       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
                ao_config_dirty = 1;
        }
@@ -108,7 +108,7 @@ _ao_config_get(void)
                if (ao_config.minor < 8)
                        ao_config.radio_enable = TRUE;
                if (ao_config.minor < 9)
-                       memset(&ao_config.aes_key, '\0', AO_AES_LEN);
+                       memset(&ao_config.aes_key, 0, AO_AES_LEN);
                ao_config.minor = AO_CONFIG_MINOR;
                ao_config_dirty = 1;
        }
@@ -148,7 +148,7 @@ ao_config_callsign_set(void) __reentrant
        uint8_t c;
        static __xdata char callsign[AO_MAX_CALLSIGN + 1];
 
-       memset(callsign, '\0', sizeof callsign);
+       ao_xmemset(callsign, '\0', sizeof callsign);
        ao_cmd_white();
        c = 0;
        while (ao_cmd_lex_c != '\n') {
@@ -161,7 +161,7 @@ ao_config_callsign_set(void) __reentrant
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       memcpy(&ao_config.callsign, &callsign,
+       ao_xmemcpy(&ao_config.callsign, &callsign,
               AO_MAX_CALLSIGN + 1);
        _ao_config_edit_finish();
 }
@@ -308,7 +308,7 @@ ao_config_radio_cal_set(void) __reentrant
        _ao_config_edit_finish();
 }
 
-#if HAS_EEPROM && HAS_FLIGHT
+#if HAS_LOG
 void
 ao_config_log_show(void) __reentrant
 {
@@ -336,7 +336,7 @@ ao_config_log_set(void) __reentrant
                _ao_config_edit_finish();
        }
 }
-#endif /* HAS_EEPROM && HAS_FLIGHT */
+#endif /* HAS_LOG */
 
 #if HAS_IGNITE
 void
@@ -482,7 +482,7 @@ __code struct ao_config_var ao_config_vars[] = {
 #endif /* HAS_ACCEL */
        { "f <cal>\0Radio calib (cal = rf/(xtal/2^16))",
          ao_config_radio_cal_set,      ao_config_radio_cal_show },
-#if HAS_EEPROM && HAS_FLIGHT
+#if HAS_LOG
        { "l <size>\0Flight log size in kB",
          ao_config_log_set,            ao_config_log_show },
 #endif
@@ -535,7 +535,8 @@ ao_config_help(void) __reentrant
        for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
                printf("%-20s %s\n",
                       ao_config_vars[cmd].str,
-                      ao_config_vars[cmd].str+1+strlen(ao_config_vars[cmd].str));
+                      ao_config_vars[cmd].str+1+
+                      strlen(ao_config_vars[cmd].str));
 }
 
 static void