Add interrupt lock

This commit is contained in:
Thomas Klaehn 2020-04-12 09:33:53 +02:00
parent 9eaa749d68
commit b0193ca45e
5 changed files with 51 additions and 1 deletions

View File

@ -33,9 +33,11 @@ int main(void)
cm4::SystemTick ticker; cm4::SystemTick ticker;
ticker.enable(); ticker.enable();
uint32_t last_tick = 0; uint32_t last_tick = 0;
cm4::InterruptGuardian::enable_interrupts();
while(true) { while(true) {
for(auto it = std::begin(leds); it != std::end(leds); ++it) { for(auto it = std::begin(leds); it != std::end(leds); ++it) {
uint32_t tick = ticker.tick() / 1000; volatile uint32_t tick = ticker.tick() / 1000;
if(tick != last_tick) { if(tick != last_tick) {
nrf52::Gpio * tmp = *it; nrf52::Gpio * tmp = *it;
tmp->toggle(); tmp->toggle();

View File

@ -5,6 +5,7 @@ using namespace pinetime::platform::cm4;
InterruptGuardian::InterruptGuardian() InterruptGuardian::InterruptGuardian()
{ {
disable_interrupts();
} }
void InterruptGuardian::register_handler(Cm4IrqN irq_nr, InterruptHandler &handler) void InterruptGuardian::register_handler(Cm4IrqN irq_nr, InterruptHandler &handler)

View File

@ -33,6 +33,20 @@ private:
}; };
public: public:
static inline void enable_interrupts() { asm volatile("cpsie i"); }
static inline void disable_interrupts() { asm volatile("cpsid i"); }
static inline bool suspend_interrupts()
{
uint32_t mask;
asm volatile("mrs %0, primask" : "=r" (mask));
asm volatile("cpsid i");
return(mask & 0x01);
}
static inline void resume_interrupts(bool status)
{
asm volatile ("msr primask, %0" : : "r" (status) : "memory");
}
void register_handler(Cm4IrqN irq_nr, InterruptHandler &); void register_handler(Cm4IrqN irq_nr, InterruptHandler &);
static InterruptGuardian instance; static InterruptGuardian instance;

View File

@ -0,0 +1,15 @@
#include "platform/cm4/InterruptHandler.h"
#include "platform/cm4/InterruptGuardian.h"
#include "platform/cm4/InterruptLock.h"
using namespace pinetime::platform::cm4;
InterruptLock::InterruptLock()
{
this->state = InterruptGuardian::suspend_interrupts();
}
InterruptLock::~InterruptLock()
{
InterruptGuardian::resume_interrupts(this->state);
}

View File

@ -0,0 +1,18 @@
#ifndef __PLATFORM_CM$_INTERRUPTLOCK_H__
#define __PLATFORM_CM$_INTERRUPTLOCK_H__
namespace pinetime::platform::cm4 {
class InterruptLock
{
public:
InterruptLock();
~InterruptLock();
private:
bool state;
};
}
#endif