From 7ee031bdab33cc6a1e2a7995a7c3a43f3a64b687 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 25 Oct 2012 13:35:47 -0700 Subject: [PATCH] altos: Clean up cc1111 architecture macros a bit, removing cli/sei Just reformatting changes, aside from the removal of cli/sei Signed-off-by: Keith Packard --- src/cc1111/ao_arch.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h index f2442eb6..39468e06 100644 --- a/src/cc1111/ao_arch.h +++ b/src/cc1111/ao_arch.h @@ -147,16 +147,13 @@ 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 -#define cli() ao_arch_block_interrupts() -#define sei() ao_arch_release_interrupts() +/* 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 #define ao_arch_restore_stack() { \ uint8_t stack_len; \ @@ -197,7 +194,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; \ -- 2.30.2