X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcc1111%2Fao_arch.h;fp=src%2Fcc1111%2Fao_arch.h;h=9097557ffd3460359f148aa8343dba3851b0a462;hp=39468e061c5ed64b4586db9ca7a14cdb87c7efd1;hb=ccf0faa7d26d56deca7928b521d07be40504466a;hpb=9b978cd467f9128f3069765dd8fbf8abad3459a4

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 39468e06..9097557f 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -112,9 +112,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 +148,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;				\