removed duplicate inISR prototype
This commit is contained in:
parent
f481e4a5c5
commit
24f5ec929c
@ -27,6 +27,7 @@
|
|||||||
#include "thread.h"
|
#include "thread.h"
|
||||||
#include "lifo.h"
|
#include "lifo.h"
|
||||||
#include "mutex.h"
|
#include "mutex.h"
|
||||||
|
#include "irq.h"
|
||||||
|
|
||||||
#define ENABLE_DEBUG (0)
|
#define ENABLE_DEBUG (0)
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|||||||
@ -52,8 +52,8 @@ unsigned enableIRQ(void);
|
|||||||
void restoreIRQ(unsigned state);
|
void restoreIRQ(unsigned state);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Checks if the mcu is currently processing an interrupt.
|
* @brief Check whether called from interrupt service routine
|
||||||
* @return true, if in interrupt service routine
|
* @return true, if in interrupt service routine, false if not
|
||||||
*/
|
*/
|
||||||
int inISR(void);
|
int inISR(void);
|
||||||
|
|
||||||
|
|||||||
@ -75,14 +75,6 @@
|
|||||||
#define PRIORITY_IDLE PRIORITY_MIN
|
#define PRIORITY_IDLE PRIORITY_MIN
|
||||||
#define PRIORITY_MAIN (PRIORITY_MIN - (SCHED_PRIO_LEVELS/2))
|
#define PRIORITY_MAIN (PRIORITY_MIN - (SCHED_PRIO_LEVELS/2))
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Check whether called from interrupt service routine
|
|
||||||
*
|
|
||||||
* @return true if called from within interrupt
|
|
||||||
* @return false if not.
|
|
||||||
*/
|
|
||||||
int inISR(void);
|
|
||||||
|
|
||||||
#define LPM_PREVENT_SLEEP_UART BIT2
|
#define LPM_PREVENT_SLEEP_UART BIT2
|
||||||
#define LPM_PREVENT_SLEEP_HWTIMER BIT1
|
#define LPM_PREVENT_SLEEP_HWTIMER BIT1
|
||||||
|
|
||||||
|
|||||||
@ -28,6 +28,7 @@
|
|||||||
#include "clist.h"
|
#include "clist.h"
|
||||||
#include "bitarithm.h"
|
#include "bitarithm.h"
|
||||||
#include "thread.h"
|
#include "thread.h"
|
||||||
|
#include "irq.h"
|
||||||
|
|
||||||
#if SCHEDSTATISTICS
|
#if SCHEDSTATISTICS
|
||||||
#include "hwtimer.h"
|
#include "hwtimer.h"
|
||||||
|
|||||||
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
#include "thread.h"
|
#include "thread.h"
|
||||||
#include "kernel.h"
|
#include "kernel.h"
|
||||||
|
#include "irq.h"
|
||||||
|
|
||||||
#define ENABLE_DEBUG (0)
|
#define ENABLE_DEBUG (0)
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user