diff options
| author | Daniel Friesel <daniel.friesel@uos.de> | 2020-10-26 08:54:16 +0100 |
|---|---|---|
| committer | Daniel Friesel <daniel.friesel@uos.de> | 2020-10-26 08:54:16 +0100 |
| commit | c5a37ca21e3360059bcd2caf006c764947b73e58 (patch) | |
| tree | dfadd844494bf010a7f43c9ec880a2cabff3b107 | |
| parent | d4f38c14cd22131ba20e3ff5d30fcc43c6fc5b2f (diff) | |
msp430 sleep_ms: restore previous interrupt state on exit
| -rw-r--r-- | src/arch/msp430fr5994lp/arch.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/arch/msp430fr5994lp/arch.cc b/src/arch/msp430fr5994lp/arch.cc index ac5a21d..9b243d1 100644 --- a/src/arch/msp430fr5994lp/arch.cc +++ b/src/arch/msp430fr5994lp/arch.cc @@ -119,6 +119,13 @@ void Arch::delay_ms(unsigned int const ms) } } +inline static unsigned int irq_enabled() +{ + unsigned int sr; + __asm__ __volatile__("mov SR, %0" : "=r" (sr) : ); + return sr & GIE; +} + volatile bool sleep_done = false; // max delay: 262 ms @ 16 MHz @@ -128,6 +135,7 @@ void Arch::sleep_ms(unsigned int const ms) if (ms == 0) { return; } + int int_enabled = irq_enabled(); sleep_done = false; #if F_CPU == 16000000UL TA3CTL = TASSEL__SMCLK | ID__8; // /8 @@ -154,7 +162,9 @@ void Arch::sleep_ms(unsigned int const ms) asm volatile("nop"); __bis_SR_register(GIE | LPM2_bits); asm volatile("nop"); - //__dint(); // XXX das verträgt sich nicht gut mit energytrace=sync=timer und allen anderen counter-messungen! + if (!int_enabled) { + __dint(); + } } TA3CTL = TASSEL__SMCLK; } |