From: Keith Packard <keithp@keithp.com>
Date: Tue, 24 Aug 2010 05:03:36 +0000 (-0700)
Subject: altos: Place rom config variables in fixed location
X-Git-Tag: debian/0.6+373+gcf65c6b~27
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=56b906f535ac2f86bcab71addbbcd376d74f6a73;hp=4c0c099716197ef7539be0cf55bbb164f6804958

altos: Place rom config variables in fixed location

The device serial number and radio calibration values are stored in
flash, mostly so that TeleDongle gets them saved.

Placing them in well-known locations (starting at 0xa0) makes it
possible to find the previous configuration and to re-write it
easily, without requiring the .map file.

altosui doesn't have the .map file parsing code, so it relies upon
this new technique. As a benefit, it reads the old values from the
device before reprogramming it.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/Makefile.proto b/src/Makefile.proto
index eedb878a..8bc8b0e1 100644
--- a/src/Makefile.proto
+++ b/src/Makefile.proto
@@ -35,6 +35,7 @@ ALTOS_SRC = \
 	ao_panic.c \
 	ao_task.c \
 	ao_timer.c \
+	ao_romconfig.c \
 	_bp.c
 
 #
diff --git a/src/ao.h b/src/ao.h
index 5f2b8339..9c418db2 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -289,6 +289,17 @@ ao_led_for(uint8_t colors, uint16_t ticks) __reentrant;
 void
 ao_led_init(uint8_t enable);
 
+/*
+ * ao_romconfig.c
+ */
+
+#define AO_ROMCONFIG_VERSION	1
+
+extern __code __at (0x00a0) uint16_t ao_romconfig_version;
+extern __code __at (0x00a2) uint16_t ao_romconfig_check;
+extern __code __at (0x00a4) uint16_t ao_serial_number;
+extern __code __at (0x00a6) uint32_t ao_radio_cal;
+
 /*
  * ao_usb.c
  */
@@ -998,7 +1009,6 @@ ao_rssi_init(uint8_t rssi_led);
  */
 
 extern const uint8_t ao_usb_descriptors [];
-extern const uint16_t ao_serial_number;
 extern const char ao_version[];
 extern const char ao_manufacturer[];
 extern const char ao_product[];
diff --git a/src/ao_config.c b/src/ao_config.c
index cbd639a5..88b52dc0 100644
--- a/src/ao_config.c
+++ b/src/ao_config.c
@@ -27,16 +27,6 @@ __xdata uint8_t ao_config_mutex;
 #define AO_CONFIG_DEFAULT_CALLSIGN	"N0CALL"
 #define AO_CONFIG_DEFAULT_ACCEL_ZERO_G	16000
 #define AO_CONFIG_DEFAULT_APOGEE_DELAY	0
-/*
- * For 434.550MHz, the frequency value is:
- *
- * 434.550e6 / (24e6 / 2**16) = 1186611.2
- *
- * This value is stored in a const variable so that
- * ao-load can change it during programming for
- * devices that have no eeprom for config data.
- */
-const uint32_t ao_radio_cal = 1186611;
 
 #if HAS_EEPROM
 static void
diff --git a/src/ao_product.c b/src/ao_product.c
index 2bd0b59c..f0eb4c07 100644
--- a/src/ao_product.c
+++ b/src/ao_product.c
@@ -21,7 +21,6 @@
 
 /* Defines which mark this particular AltOS product */
 
-const uint16_t ao_serial_number = AO_iSerial_NUMBER;
 const char ao_version[] = AO_iVersion_STRING;
 const char ao_manufacturer[] = AO_iManufacturer_STRING;
 const char ao_product[] = AO_iProduct_STRING;
diff --git a/src/ao_romconfig.c b/src/ao_romconfig.c
new file mode 100644
index 00000000..f3fe61b1
--- /dev/null
+++ b/src/ao_romconfig.c
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include "ao.h"
+
+__code __at (0x00a0) uint16_t ao_romconfig_version = AO_ROMCONFIG_VERSION;
+__code __at (0x00a2) uint16_t ao_romconfig_check = ~AO_ROMCONFIG_VERSION;
+__code __at (0x00a4) uint16_t ao_serial_number = 0;
+/*
+ * For 434.550MHz, the frequency value is:
+ *
+ * 434.550e6 / (24e6 / 2**16) = 1186611.2
+ *
+ * This value is stored in a const variable so that
+ * ao-load can change it during programming for
+ * devices that have no eeprom for config data.
+ */
+__code __at (0x00a6) uint32_t ao_radio_cal = 1186611;