From 355b01ce9881eba6dfd2c92283144bb4a4ccde30 Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Fri, 15 May 2020 10:53:48 +0200 Subject: [PATCH] cpu/atmega_common: Moved atmega_state to cpu.c The global state flags should never have bin in irq_arch.c but in cpu.c. This is not fixed. --- cpu/atmega_common/cpu.c | 1 + cpu/atmega_common/irq_arch.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cpu/atmega_common/cpu.c b/cpu/atmega_common/cpu.c index 423d2efc82..11fdeba5b2 100644 --- a/cpu/atmega_common/cpu.c +++ b/cpu/atmega_common/cpu.c @@ -58,6 +58,7 @@ */ uint8_t mcusr_mirror __attribute__((section(".noinit"))); uint8_t soft_rst __attribute__((section(".noinit"))); +uint8_t atmega_state = 0; void get_mcusr(void) __attribute__((naked, section(".init0"), used)); void get_mcusr(void) diff --git a/cpu/atmega_common/irq_arch.c b/cpu/atmega_common/irq_arch.c index 25c374e933..a65af00b51 100644 --- a/cpu/atmega_common/irq_arch.c +++ b/cpu/atmega_common/irq_arch.c @@ -33,8 +33,6 @@ static uint8_t atmega_get_interrupt_state(void); static void atmega_set_interrupt_state(uint8_t state); -uint8_t atmega_state = 0; - __attribute__((always_inline)) static inline uint8_t atmega_get_interrupt_state(void) { uint8_t sreg;