X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_config.c;h=38b72798bab00b346b82f498adaa660f9a9ee762;hb=3bcf14f12f6681888c3162d0f33ef2d454eb75dd;hp=88b52dc05950ebfe37f950bdb7673551387b63b2;hpb=5f2f6a8f9ba56be867888758848bc7f152ccbd47;p=fw%2Faltos

diff --git a/src/ao_config.c b/src/ao_config.c
index 88b52dc0..38b72798 100644
--- a/src/ao_config.c
+++ b/src/ao_config.c
@@ -32,7 +32,19 @@ __xdata uint8_t ao_config_mutex;
 static void
 _ao_config_put(void)
 {
-	ao_ee_write_config((uint8_t *) &ao_config, sizeof (ao_config));
+	ao_storage_setup();
+	ao_storage_erase(ao_storage_config);
+	ao_storage_write(ao_storage_config, &ao_config, sizeof (ao_config));
+	ao_log_write_erase(0);
+	ao_storage_flush();
+}
+
+void
+ao_config_put(void)
+{
+	ao_mutex_get(&ao_config_mutex);
+	_ao_config_put();
+	ao_mutex_put(&ao_config_mutex);
 }
 #endif
 
@@ -42,7 +54,8 @@ _ao_config_get(void)
 	if (ao_config_loaded)
 		return;
 #if HAS_EEPROM
-	ao_ee_read_config((uint8_t *) &ao_config, sizeof (ao_config));
+	ao_storage_setup();
+	ao_storage_read(ao_storage_config, &ao_config, sizeof (ao_config));
 #endif
 	if (ao_config.major != AO_CONFIG_MAJOR) {
 		ao_config.major = AO_CONFIG_MAJOR;
@@ -141,7 +154,7 @@ ao_config_radio_channel_set(void) __reentrant
 	ao_config_dirty = 1;
 	ao_mutex_put(&ao_config_mutex);
 	ao_config_radio_channel_show();
-	ao_radio_abort();
+	ao_radio_recv_abort();
 }
 
 #if HAS_ADC
@@ -285,13 +298,13 @@ struct ao_config_var {
 	const char	*help;
 };
 
-void
+static void
 ao_config_help(void) __reentrant;
 
-void
+static void
 ao_config_show(void) __reentrant;
 
-void
+static void
 ao_config_write(void) __reentrant;
 
 __code struct ao_config_var ao_config_vars[] = {
@@ -345,7 +358,7 @@ ao_config_set(void)
 		ao_cmd_status = ao_cmd_syntax_error;
 }
 
-void
+static void
 ao_config_help(void) __reentrant
 {
 	uint8_t cmd;
@@ -353,7 +366,7 @@ ao_config_help(void) __reentrant
 		puts (ao_config_vars[cmd].help);
 }
 
-void
+static void
 ao_config_show(void) __reentrant
 {
 	uint8_t cmd;
@@ -365,7 +378,7 @@ ao_config_show(void) __reentrant
 }
 
 #if HAS_EEPROM
-void
+static void
 ao_config_write(void) __reentrant
 {
 	uint8_t saved = 0;