altos/teletiny-v2.0: Support multiple SPI busses on CC1111

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

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 7fdfad80825cbbd22fffe62d6e0b89e7d52bd0f3..34235b085421d3c49d2d86852d57f0ff39b335eb 100644 (file)
--- 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                                                       \
@@ -147,11 +145,18 @@ extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
                while (--stack_len);                                    \
        }
 
-#define ao_arch_isr_stack()                                            \
-       /* Empty the stack; might as well let interrupts have the whole thing */ \
-       (SP = AO_STACK_START - 1)
+/* Empty the stack; might as well let interrupts have the whole thing */
+#define ao_arch_isr_stack()            (SP = AO_STACK_START - 1)
 
-#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;                                      \
@@ -192,7 +197,7 @@ extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
                0098$:                                                  \
                        SETB            _EA                             \
                0099$:                                                  \
-               /* Finally pop off the ACC, which was the first register saved. */ \
+               /* Finally restore ACC, which was the first register saved. */ \
                pop             ACC                                     \
                ret                                                     \
                __endasm;                                               \
@@ -316,4 +321,9 @@ void
 ao_serial1_tx_isr(void) ao_arch_interrupt(14);
 #endif
 
+#if HAS_EXTI_0
+void
+ao_p0_isr(void) __interrupt(13);
+#endif
+
 #endif /* _AO_ARCH_H_ */