Skip to content
Snippets Groups Projects
Commit 9431f33b authored by Federico's avatar Federico
Browse files

Renamed tick_interrupt.h to timer_interrupt.h, renamed IRQtickInterrupt() to...

Renamed tick_interrupt.h to timer_interrupt.h, renamed IRQtickInterrupt() to IRQtimerInterrupt(), removed calls to IRQstackOverflowCheck() in ISR_preempt, they are now moved in IRQtimerInterrupt()
parent d1150ea4
Branches
No related tags found
2 merge requests!40Update to Miosix 2.7,!17Draft: Improved miosix build system and fixed cmake scripts
......@@ -34,7 +34,7 @@
#include "miosix.h"
#include "portability_impl.h"
#include "kernel/scheduler/scheduler.h"
#include "kernel/scheduler/tick_interrupt.h"
#include "kernel/scheduler/timer_interrupt.h"
#include "board_settings.h"
#include <algorithm>
......@@ -55,8 +55,7 @@ void ISR_preempt()
T0IR=0x1;//Clear interrupt
VICVectAddr=0xff;//Restart VIC
IRQstackOverflowCheck();
miosix::IRQtickInterrupt();
miosix::IRQtimerInterrupt();
}
/**
......
......@@ -31,7 +31,7 @@
#include "kernel/error.h"
#include "interfaces/bsp.h"
#include "kernel/scheduler/scheduler.h"
#include "kernel/scheduler/tick_interrupt.h"
#include "kernel/scheduler/timer_interrupt.h"
#include <algorithm>
/**
......@@ -97,8 +97,7 @@ namespace miosix_private {
void ISR_preempt() __attribute__((noinline));
void ISR_preempt()
{
IRQstackOverflowCheck();
miosix::IRQtickInterrupt();
miosix::IRQtimerInterrupt();
}
/**
......
......@@ -31,7 +31,7 @@
#include "kernel/error.h"
#include "interfaces/bsp.h"
#include "kernel/scheduler/scheduler.h"
#include "kernel/scheduler/tick_interrupt.h"
#include "kernel/scheduler/timer_interrupt.h"
#include <algorithm>
/**
......@@ -97,8 +97,7 @@ namespace miosix_private {
void ISR_preempt() __attribute__((noinline));
void ISR_preempt()
{
IRQstackOverflowCheck();
miosix::IRQtickInterrupt();
miosix::IRQtimerInterrupt();
}
/**
......
......@@ -31,7 +31,7 @@
#include "kernel/error.h"
#include "interfaces/bsp.h"
#include "kernel/scheduler/scheduler.h"
#include "kernel/scheduler/tick_interrupt.h"
#include "kernel/scheduler/timer_interrupt.h"
#include "core/interrupts.h"
#include "kernel/process.h"
#include <algorithm>
......@@ -102,8 +102,7 @@ namespace miosix_private {
void ISR_preempt() __attribute__((noinline));
void ISR_preempt()
{
IRQstackOverflowCheck();
miosix::IRQtickInterrupt();
miosix::IRQtimerInterrupt();
}
/**
......
......@@ -31,7 +31,7 @@
#include "kernel/error.h"
#include "interfaces/bsp.h"
#include "kernel/scheduler/scheduler.h"
#include "kernel/scheduler/tick_interrupt.h"
#include "kernel/scheduler/timer_interrupt.h"
#include <algorithm>
/**
......@@ -97,8 +97,7 @@ namespace miosix_private {
void ISR_preempt() __attribute__((noinline));
void ISR_preempt()
{
IRQstackOverflowCheck();
miosix::IRQtickInterrupt();
miosix::IRQtimerInterrupt();
}
/**
......
......@@ -3,7 +3,7 @@
#include "interfaces/portability.h"
#include "kernel/kernel.h"
#include "kernel/logging.h"
#include "kernel/scheduler/tick_interrupt.h"
#include "kernel/scheduler/timer_interrupt.h"
#include <cstdlib>
using namespace miosix;
......@@ -80,7 +80,7 @@ void __attribute__((used)) cstirqhnd()
csRecord.wakeup_time += CST_QUANTUM;
IRQaddToSleepingList(&csRecord); //It would also set the next timer interrupt
}
IRQtickInterrupt();
IRQtimerInterrupt();
}
}
......
......@@ -31,7 +31,7 @@
#include "kernel/error.h"
#include "interfaces/bsp.h"
#include "kernel/scheduler/scheduler.h"
#include "kernel/scheduler/tick_interrupt.h"
#include "kernel/scheduler/timer_interrupt.h"
#include "core/interrupts.h"
#include "kernel/process.h"
#include <algorithm>
......@@ -106,8 +106,7 @@ namespace miosix_private {
void ISR_preempt() __attribute__((noinline));
void ISR_preempt()
{
IRQstackOverflowCheck();
miosix::IRQtickInterrupt();
miosix::IRQtimerInterrupt();
}
#endif //USE_CSTIMER
......
......@@ -25,8 +25,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/> *
***************************************************************************/
#ifndef TICK_INTERRUPT_H
#define TICK_INTERRUPT_H
#ifndef TIMER_INTERRUPT_H
#define TIMER_INTERRUPT_H
#include "config/miosix_settings.h"
#include "interfaces/portability.h"
......@@ -42,11 +42,9 @@ extern volatile bool tick_skew;///\internal Do not use outside the kernel
extern volatile Thread *cur;///\internal Do not use outside the kernel
extern bool IRQwakeThreads();///\internal Do not use outside the kernel
inline void IRQtickInterrupt()
inline void IRQtimerInterrupt()
{
#ifdef USE_CSTIMER
miosix_private::IRQstackOverflowCheck();
#endif //USE_CSTIMER
bool woken=IRQwakeThreads();//Increment tick and wake threads,if any
(void)woken; //Avoid unused variable warning.
......@@ -78,4 +76,4 @@ inline void IRQtickInterrupt()
}
#endif //TICK_INTERRUPT_H
#endif //TIMER_INTERRUPT_H
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment