diff --git a/lib/include/isr.h b/lib/include/isr.h index 8617f7537..06825cc7b 100644 --- a/lib/include/isr.h +++ b/lib/include/isr.h @@ -71,6 +71,8 @@ enum interrupt_nums { #define enable_irq(irq) (*INTENNUM = INT_NUM_##irq) #define disable_irq(irq) (*INTDISNUM = INT_NUM_##irq) +#define safe_irq_disable(x) volatile uint32_t saved_irq; saved_irq = *INTENABLE; disable_irq(x) +#define irq_restore() *INTENABLE = saved_irq extern void tmr0_isr(void) __attribute__((weak)); extern void tmr1_isr(void) __attribute__((weak)); diff --git a/lib/maca.c b/lib/maca.c index a7f68bb51..5a67b2476 100644 --- a/lib/maca.c +++ b/lib/maca.c @@ -98,9 +98,6 @@ enum posts { }; static volatile uint8_t last_post = NO_POST; -#define safe_irq_disable(x) volatile uint32_t saved_irq; saved_irq = *INTENABLE; disable_irq(x) -#define irq_restore() *INTENABLE = saved_irq - volatile uint8_t fcs_mode = USE_FCS; /* call periodically to */