altos: add GCC/SDCC compat macros, init_stack, save_context and GCC stdio hooks

More arch-indepdency bits.

GCC stdio is different from SDCC, so create suitable code in
avr/ao_avr_stdio.c

Create macros to initialize the task stack frame and save the task
context.

Add GCC/SDCC type definition compatibility macros

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

2 files changed, 524 insertions, 0 deletions

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 585fffe5..35fd66f8 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -24,9 +24,108 @@
 
 #include "cc1111.h"
 
+/* Convert a __data pointer into an __xdata pointer */
+#define DATA_TO_XDATA(a)	((void __xdata *) ((uint8_t) (a) | 0xff00))
+
+/* Stack runs from above the allocated __data space to 0xfe, which avoids
+ * writing to 0xff as that triggers the stack overflow indicator
+ */
+#define AO_STACK_START	0x90
+#define AO_STACK_END	0xfe
+#define AO_STACK_SIZE	(AO_STACK_END - AO_STACK_START + 1)
+
 #define ao_arch_reboot() do {					\
 	WDCTL = WDCTL_EN | WDCTL_MODE_WATCHDOG | WDCTL_INT_64;	\
 	ao_delay(AO_SEC_TO_TICKS(2));				\
 	} while (0)
 	
+#define ao_arch_nop()	_asm nop _endasm
+#define ao_arch_interrupt(n)	__interrupt n
+
+#define ao_arch_naked_declare	__naked
+#define ao_arch_naked_define	__naked
+
+/* CC1111-specific drivers */
+
+/*
+ * ao_romconfig.c
+ */
+
+#define AO_ROMCONFIG_VERSION	2
+
+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;
+
+#ifndef HAS_USB
+#error Please define HAS_USB
+#endif
+
+#if HAS_USB
+extern __code __at (0x00aa) uint8_t ao_usb_descriptors [];
+#endif
+
+/* Initialize stack */
+#define ao_arch_init_stack(task, start) {			\
+	uint8_t __xdata *stack = task->stack;			\
+	uint8_t	t;						\
+	*stack++ = ((uint16_t) start);		/* 0 */		\
+	*stack++ = ((uint16_t) start) >> 8;	/* 1 */		\
+								\
+	/* and the stuff saved by ao_switch */			\
+	*stack++ = 0;				/* 2 acc */   	\
+	*stack++ = 0x80;			/* 3 IE */ 	\
+								\
+	/*  4 DPL 						\
+	 *  5 DPH 						\
+	 *  6 B 						\
+	 *  7 R2 						\
+	 *  8 R3 						\
+	 *  9 R4 						\
+	 * 10 R5 						\
+	 * 11 R6 						\
+	 * 12 R7 						\
+	 * 13 R0 						\
+	 * 14 R1 						\
+	 * 15 PSW 						\
+	 * 16 BP 						\
+	 */ 							\
+	for (t = 0; t < 13; t++) 				\
+		*stack++ = 0; 					\
+	task->stack_count = 17;					\
+	}
+
+
+  
+/* Save current context */
+
+#define ao_arch_save_context() \
+	_asm \
+		/* Push ACC first, as when restoring the context it must be restored \
+		 * last (it is used to set the IE register). */ \
+		push	ACC \
+		/* Store the IE register then enable interrupts. */ \
+		push	_IEN0 \
+		setb	_EA \
+		push	DPL \
+		push	DPH \
+		push	b \
+		push	ar2 \
+		push	ar3 \
+		push	ar4 \
+		push	ar5 \
+		push	ar6 \
+		push	ar7 \
+		push	ar0 \
+		push	ar1 \
+		push	PSW \
+	_endasm; \
+	PSW = 0; \
+	_asm \
+		push	_bp \
+	_endasm
+
+
+
 #endif /* _AO_ARCH_H_ */
diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h
new file mode 100644
index 00000000..4ac6a84b
--- /dev/null
+++ b/src/cc1111/ao_pins.h
@@ -0,0 +1,425 @@
+/*
+ * 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.
+ */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#if defined(TELEMETRUM_V_1_0)
+	#define HAS_FLIGHT		1
+	#define HAS_USB			1
+	#define HAS_BEEP		1
+	#define HAS_GPS			1
+	#define HAS_SERIAL_1		1
+	#define HAS_ADC			1
+	#define USE_SERIAL_STDIN	0
+	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	0
+	#define HAS_DBG			1
+	#define DBG_ON_P1 		1
+	#define DBG_ON_P0 		0
+	#define IGNITE_ON_P2		1
+	#define IGNITE_ON_P0		0
+	#define PACKET_HAS_MASTER	0
+	#define PACKET_HAS_SLAVE	1
+
+	#define HAS_COMPANION		1
+	#define COMPANION_CS_ON_P1	1
+	#define COMPANION_CS_MASK	0x4	/* CS1 is P1_2 */
+	#define COMPANION_CS		P1_2
+
+	#define AO_LED_RED		1
+	#define LEDS_AVAILABLE		(AO_LED_RED)
+	#define HAS_EXTERNAL_TEMP	0
+	#define HAS_ACCEL_REF		0
+	#define HAS_ACCEL		1
+	#define HAS_IGNITE		1
+	#define HAS_MONITOR		0
+#endif
+
+#if defined(TELEMETRUM_V_1_1)
+	#define HAS_FLIGHT		1
+	#define HAS_USB			1
+	#define HAS_BEEP		1
+	#define HAS_GPS			1
+	#define HAS_SERIAL_1		1
+	#define USE_SERIAL_STDIN	0
+	#define HAS_ADC			1
+	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	0
+	#define HAS_DBG			1
+	#define DBG_ON_P1 		1
+	#define DBG_ON_P0 		0
+	#define IGNITE_ON_P2		1
+	#define IGNITE_ON_P0		0
+	#define PACKET_HAS_MASTER	0
+	#define PACKET_HAS_SLAVE	1
+
+	#define HAS_COMPANION		1
+	#define COMPANION_CS_ON_P1	1
+	#define COMPANION_CS_MASK	0x4	/* CS1 is P1_2 */
+	#define COMPANION_CS		P1_2
+
+	#define AO_LED_RED		1
+	#define LEDS_AVAILABLE		(AO_LED_RED)
+	#define HAS_EXTERNAL_TEMP	0
+	#define HAS_ACCEL_REF		1
+	#define SPI_CS_ON_P1		1
+	#define SPI_CS_ON_P0		0
+	#define M25_CS_MASK		0x02	/* CS0 is P1_1 */
+	#define M25_MAX_CHIPS		1
+	#define HAS_ACCEL		1
+	#define HAS_IGNITE		1
+	#define HAS_MONITOR		0
+#endif
+
+#if defined(TELEDONGLE_V_0_2)
+	#define HAS_FLIGHT		0
+	#define HAS_USB			1
+	#define HAS_BEEP		0
+	#define HAS_SERIAL_1		0
+	#define USE_SERIAL_STDIN	0
+	#define HAS_ADC			0
+	#define HAS_DBG			1
+	#define HAS_EEPROM		0
+	#define DBG_ON_P1		1
+	#define DBG_ON_P0 		0
+	#define IGNITE_ON_P2		0
+	#define IGNITE_ON_P0		0
+	#define PACKET_HAS_MASTER	1
+	#define PACKET_HAS_SLAVE	0
+	#define AO_LED_RED		1
+	#define AO_LED_GREEN		2
+	#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
+	#define SPI_CS_ON_P1		1
+	#define SPI_CS_ON_P0		0
+	#define HAS_IGNITE		0
+	#define HAS_MONITOR		1
+#endif
+
+#if defined(TELEMINI_V_1_0)
+	#define HAS_FLIGHT		1
+	#define HAS_USB			0
+	#define HAS_BEEP		0
+	#define HAS_GPS			0
+	#define HAS_SERIAL_1		0
+	#define USE_SERIAL_STDIN	0
+	#define HAS_ADC			1
+	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	1
+	#define HAS_DBG			0
+	#define IGNITE_ON_P2		0
+	#define IGNITE_ON_P0		1
+	#define PACKET_HAS_MASTER	0
+	#define PACKET_HAS_SLAVE	1
+	#define USE_FAST_ASCENT_LOG	1
+
+	#define AO_LED_GREEN		1
+	#define AO_LED_RED		2
+	#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
+	#define HAS_EXTERNAL_TEMP	0
+	#define HAS_ACCEL		0
+	#define HAS_IGNITE		1
+	#define HAS_MONITOR		0
+#endif
+
+#if defined(TELENANO_V_0_1)
+	#define HAS_FLIGHT		1
+	#define HAS_USB			0
+	#define HAS_BEEP		0
+	#define HAS_GPS			0
+	#define HAS_SERIAL_1		0
+	#define USE_SERIAL_STDIN	0
+	#define HAS_ADC			1
+	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	1
+	#define HAS_DBG			0
+	#define IGNITE_ON_P2		0
+	#define IGNITE_ON_P0		1
+	#define PACKET_HAS_MASTER	0
+	#define PACKET_HAS_SLAVE	1
+
+	#define AO_LED_GREEN		1
+	#define AO_LED_RED		2
+	#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
+	#define HAS_EXTERNAL_TEMP	0
+	#define HAS_ACCEL		0
+	#define HAS_IGNITE		0
+	#define HAS_MONITOR		0
+#endif
+
+#if defined(TELEMETRUM_V_0_1)
+	#define HAS_FLIGHT		1
+	#define HAS_USB			1
+	#define HAS_BEEP		1
+	#define HAS_GPS			1
+	#define HAS_SERIAL_1		1
+	#define USE_SERIAL_STDIN	0
+	#define HAS_ADC			1
+	#define HAS_DBG			0
+	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	0
+	#define DBG_ON_P1 		0
+	#define DBG_ON_P0 		1
+	#define IGNITE_ON_P2		1
+	#define IGNITE_ON_P0		0
+	#define PACKET_HAS_MASTER	0
+	#define PACKET_HAS_SLAVE	1
+	#define AO_LED_RED		2
+	#define AO_LED_GREEN		1
+	#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
+	#define HAS_EXTERNAL_TEMP	1
+	#define HAS_ACCEL_REF		0
+	#define SPI_CS_ON_P1		1
+	#define SPI_CS_ON_P0		0
+	#define HAS_ACCEL		1
+	#define HAS_IGNITE		1
+	#define HAS_MONITOR		0
+#endif
+
+#if defined(TELEDONGLE_V_0_1)
+	#define HAS_FLIGHT		0
+	#define HAS_USB			1
+	#define HAS_BEEP		0
+	#define HAS_SERIAL_1		0
+	#define USE_SERIAL_STDIN	0
+	#define HAS_ADC			0
+	#define HAS_DBG			0
+	#define HAS_EEPROM		0
+	#define DBG_ON_P1		0
+	#define DBG_ON_P0 		1
+	#define IGNITE_ON_P2		0
+	#define IGNITE_ON_P0		0
+	#define PACKET_HAS_MASTER	1
+	#define PACKET_HAS_SLAVE	0
+	#define AO_LED_RED		2
+	#define AO_LED_GREEN		1
+	#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
+	#define SPI_CS_ON_P1		0
+	#define SPI_CS_ON_P0		1
+	#define HAS_IGNITE		0
+	#define HAS_MONITOR		1
+#endif
+
+#if defined(TIDONGLE)
+	#define HAS_FLIGHT		0
+	#define HAS_USB			1
+	#define HAS_BEEP		0
+	#define HAS_SERIAL_1		0
+	#define USE_SERIAL_STDIN	0
+	#define HAS_ADC			0
+	#define HAS_DBG			1
+	#define HAS_EEPROM		0
+	#define DBG_ON_P1		0
+	#define DBG_ON_P0		1
+	#define IGNITE_ON_P2		0
+	#define IGNITE_ON_P0		0
+	#define PACKET_HAS_MASTER	1
+	#define PACKET_HAS_SLAVE	0
+	#define AO_LED_RED		2
+	#define LEDS_AVAILABLE		(AO_LED_RED)
+	#define SPI_CS_ON_P1		0
+	#define SPI_CS_ON_P0		1
+	#define HAS_IGNITE		0
+	#define HAS_MONITOR		1
+#endif
+
+#if defined(TELEBT_V_0_0)
+	#define HAS_FLIGHT		0
+	#define HAS_USB			1
+	#define HAS_BEEP		0
+	#define HAS_SERIAL_1		1
+	#define USE_SERIAL_STDIN	1
+	#define HAS_ADC			0
+	#define HAS_DBG			1
+	#define HAS_EEPROM		0
+	#define HAS_BTM			1
+	#define DBG_ON_P1 		0
+	#define DBG_ON_P0 		1
+	#define IGNITE_ON_P2		0
+	#define IGNITE_ON_P0		0
+	#define PACKET_HAS_MASTER	1
+	#define PACKET_HAS_SLAVE	0
+	#define AO_LED_RED		2
+	#define AO_LED_GREEN		1
+	#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
+	#define SPI_CS_ON_P1		1
+	#define SPI_CS_ON_P0		0
+	#define HAS_IGNITE		0
+	#define BT_LINK_ON_P2		1
+	#define BT_LINK_ON_P1		0
+	#define BT_LINK_PIN_INDEX	7
+	#define BT_LINK_PIN		P2_1
+	#define HAS_MONITOR		1
+#endif
+
+#if defined(TELEBT_V_0_1)
+	#define HAS_FLIGHT		0
+	#define HAS_USB			1
+	#define HAS_BEEP		1
+	#define HAS_SERIAL_1		1
+	#define HAS_SERIAL_1_ALT_1	1
+	#define HAS_SERIAL_1_ALT_2	0
+	#define HAS_SERIAL_1_HW_FLOW	1
+	#define USE_SERIAL_STDIN	1
+	#define HAS_ADC			0
+	#define HAS_DBG			1
+	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	0
+	#define HAS_BTM			1
+	#define DBG_ON_P1 		1
+	#define DBG_ON_P0 		0
+	#define IGNITE_ON_P2		0
+	#define IGNITE_ON_P0		0
+	#define PACKET_HAS_MASTER	1
+	#define PACKET_HAS_SLAVE	0
+	#define AO_LED_RED		1
+	#define AO_LED_GREEN		2
+	#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
+	#define SPI_CS_ON_P1		1
+	#define SPI_CS_ON_P0		0
+	#define M25_CS_MASK		0x04	/* CS0 is P1_2 */
+	#define M25_MAX_CHIPS		1
+	#define HAS_ACCEL		0
+	#define HAS_IGNITE		0
+	#define BT_LINK_ON_P2		0
+	#define BT_LINK_ON_P1		1
+	#define BT_LINK_PIN_INDEX	7
+	#define BT_LINK_PIN		P1_7
+	#define HAS_MONITOR		1
+#endif
+
+#if DBG_ON_P1
+
+	#define DBG_CLOCK	(1 << 4)	/* mi0 */
+	#define DBG_DATA	(1 << 5)	/* mo0 */
+	#define DBG_RESET_N	(1 << 3)	/* c0 */
+
+	#define DBG_CLOCK_PIN	(P1_4)
+	#define DBG_DATA_PIN	(P1_5)
+	#define DBG_RESET_N_PIN	(P1_3)
+
+	#define DBG_PORT_NUM	1
+	#define DBG_PORT	P1
+	#define DBG_PORT_SEL	P1SEL
+	#define DBG_PORT_INP	P1INP
+	#define DBG_PORT_DIR	P1DIR
+
+#endif /* DBG_ON_P1 */
+
+#if DBG_ON_P0
+
+	#define DBG_CLOCK	(1 << 3)
+	#define DBG_DATA	(1 << 4)
+	#define DBG_RESET_N	(1 << 5)
+
+	#define DBG_CLOCK_PIN	(P0_3)
+	#define DBG_DATA_PIN	(P0_4)
+	#define DBG_RESET_N_PIN	(P0_5)
+
+	#define DBG_PORT_NUM	0
+	#define DBG_PORT	P0
+	#define DBG_PORT_SEL	P0SEL
+	#define DBG_PORT_INP	P0INP
+	#define DBG_PORT_DIR	P0DIR
+
+#endif /* DBG_ON_P0 */
+
+#if COMPANION_CS_ON_P1
+	#define COMPANION_CS_PORT	P1
+	#define COMPANION_CS_SEL	P1SEL
+	#define COMPANION_CS_DIR	P1DIR
+#endif
+
+#if SPI_CS_ON_P1
+	#define SPI_CS_PORT	P1
+	#define SPI_CS_SEL	P1SEL
+	#define SPI_CS_DIR	P1DIR
+#endif
+
+#if SPI_CS_ON_P0
+	#define SPI_CS_PORT	P0
+	#define SPI_CS_SEL	P0SEL
+	#define SPI_CS_DIR	P0DIR
+#endif
+
+#ifndef IGNITE_ON_P2
+#error Please define IGNITE_ON_P2
+#endif
+
+#ifndef IGNITE_ON_P0
+#error Please define IGNITE_ON_P0
+#endif
+
+#ifndef HAS_SERIAL_1
+#error Please define HAS_SERIAL_1
+#endif
+
+#ifndef USE_SERIAL_STDIN
+#error Please define USE_SERIAL_STDIN
+#endif
+
+#ifndef HAS_ADC
+#error Please define HAS_ADC
+#endif
+
+#ifndef HAS_EEPROM
+#error Please define HAS_EEPROM
+#endif
+
+#if HAS_EEPROM
+#ifndef USE_INTERNAL_FLASH
+#error Please define USE_INTERNAL_FLASH
+#endif
+#endif
+
+#ifndef HAS_DBG
+#error Please define HAS_DBG
+#endif
+
+#ifndef HAS_IGNITE
+#error Please define HAS_IGNITE
+#endif
+
+#ifndef PACKET_HAS_MASTER
+#error Please define PACKET_HAS_MASTER
+#endif
+
+#ifndef PACKET_HAS_SLAVE
+#error Please define PACKET_HAS_SLAVE
+#endif
+
+#ifndef HAS_MONITOR
+#error Please define HAS_MONITOR
+#endif
+
+#ifndef HAS_ADC
+#error Please define HAS_ADC
+#endif
+
+#if HAS_ADC
+
+#if HAS_ACCEL
+#ifndef HAS_ACCEL_REF
+#error Please define HAS_ACCEL_REF
+#endif
+#else
+#define HAS_ACCEL_REF 0
+#endif
+
+#endif /* HAS_ADC */
+
+#endif /* _AO_PINS_H_ */