Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / avr / ao_arch.h

diff --git a/src/avr/ao_arch.h b/src/avr/ao_arch.h
index b816279e29f540f14a49f63f41083365ee051f45..96659aaf9c530c92fd16837b0975724da34a0918 100644 (file)
--- a/src/avr/ao_arch.h
+++ b/src/avr/ao_arch.h
@@ -37,7 +37,9 @@
  * AVR definitions and code fragments for AltOS
  */
 
+#ifndef AO_STACK_SIZE
 #define AO_STACK_SIZE  116
+#endif
 
 /* Various definitions to make GCC look more like SDCC */
 
@@ -67,7 +69,11 @@ extern void putchar(char c);
 extern char getchar(void);
 extern void ao_avr_stdio_init(void);
 
-extern const uint16_t ao_serial_number;
+#define AO_ROMCONFIG_VERSION   2
+
+#define AO_ROMCONFIG_SYMBOL(a) const
+
+extern AO_ROMCONFIG_SYMBOL(0) uint16_t ao_serial_number;
 
 #define AVR_PUSH8(stack, val)  (*((stack)--) = (val))
 
@@ -146,12 +152,5 @@ extern uint8_t     ao_cpu_sleep_disable;
 
 #define AO_TELESCIENCE_NUM_ADC 12
 
-struct ao_adc {
-       uint16_t        tick;           /* tick when the sample was read */
-       uint16_t        adc[AO_TELESCIENCE_NUM_ADC];    /* samples */
-};
-
-#define AO_ADC_RING    16
-
 #endif /* _AO_ARCH_H_ */