altos: Add ao_arch_block/release_interrupts to avr and cc1111

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

diff --git a/src/avr/ao_arch.h b/src/avr/ao_arch.h
index c775dab649a7d38068fa88a46f9815f46024a603..c82612a8ca12bf98666cc7f2970b147229ca6657 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))
 
@@ -144,6 +150,9 @@ extern uint8_t      ao_cpu_sleep_disable;
 
 #define ao_arch_critical(b) do { cli(); do { b } while (0); sei(); } while (0)
 
+#define ao_arch_block_interrupts()     cli()
+#define ao_arch_release_interrupts()   sei()
+
 #define AO_TELESCIENCE_NUM_ADC 12
 
 #endif /* _AO_ARCH_H_ */