X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_arch.h;h=6eb1a11101c6f473d09b950b60ae0d8ee386ff28;hb=f4c812bef76a2cd95f675cb27ea89059561ceec7;hp=39468e061c5ed64b4586db9ca7a14cdb87c7efd1;hpb=7ee031bdab33cc6a1e2a7995a7c3a43f3a64b687;p=fw%2Faltos

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 39468e06..6eb1a111 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -40,6 +40,8 @@
 #define AO_STACK_END	0xfe
 #define AO_STACK_SIZE	(AO_STACK_END - AO_STACK_START + 1)
 
+#define AO_PORT_TYPE	uint8_t
+
 #define ao_arch_reboot() do {					\
 	WDCTL = WDCTL_EN | WDCTL_MODE_WATCHDOG | WDCTL_INT_64;	\
 	ao_delay(AO_SEC_TO_TICKS(2));				\
@@ -112,9 +114,7 @@ extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
 	/* 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							\
@@ -150,11 +150,16 @@ extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
 /* Empty the stack; might as well let interrupts have the whole thing */
 #define ao_arch_isr_stack()		(SP = AO_STACK_START - 1)
 
-/* Idle the CPU, waking when an interrupt occurs */
-#define ao_arch_cpu_idle()		(PCON = PCON_IDLE)
 #define ao_arch_block_interrupts()	__asm clr _EA __endasm
 #define ao_arch_release_interrupts()	__asm setb _EA __endasm
 
+/* Idle the CPU, waking when an interrupt occurs */
+#define ao_arch_wait_interrupt() do {		\
+		ao_arch_release_interrupts();	\
+		(PCON = PCON_IDLE);		\
+		ao_arch_block_interrupts();	\
+	} while (0)
+
 #define ao_arch_restore_stack() {					\
 		uint8_t stack_len;					\
 		__data uint8_t *stack_ptr;				\
@@ -223,7 +228,7 @@ void
 ao_button_init(void);
 
 char
-ao_button_get(void) __critical;
+ao_button_get(uint16_t timeout) __critical;
 
 void
 ao_button_clear(void) __critical;
@@ -318,4 +323,11 @@ void
 ao_serial1_tx_isr(void) ao_arch_interrupt(14);
 #endif
 
+#if HAS_EXTI_0
+void
+ao_p0_isr(void) __interrupt(13);
+#endif
+
+#define AO_ADC_MAX	32767
+
 #endif /* _AO_ARCH_H_ */