projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move IRQ_ENTRY and IRQ_EXIT macros to cpu/irq.h.
[bertos.git]
/
drv
/
timer.c
diff --git
a/drv/timer.c
b/drv/timer.c
index bb1e5cfba3bc6cfdb1aaa6813b57b717e9109dbb..a71352676ba789cd7e07696e1985c34c19e4b619 100644
(file)
--- a/
drv/timer.c
+++ b/
drv/timer.c
@@
-38,7
+38,11
@@
*/
#include "timer.h"
*/
#include "timer.h"
-#include <cfg/cpu.h>
+
+#include <cpu/attr.h>
+#include <cpu/types.h>
+#include <cpu/irq.h>
+
#include <cfg/os.h>
#include <cfg/debug.h>
#include <cfg/module.h>
#include <cfg/os.h>
#include <cfg/debug.h>
#include <cfg/module.h>
@@
-173,9
+177,9
@@
Timer *timer_abort(Timer *timer)
*/
void timer_delayTicks(ticks_t delay)
{
*/
void timer_delayTicks(ticks_t delay)
{
-#if defined(IRQ_
GETSTATE
)
+#if defined(IRQ_
ENABLED
)
/* We shouldn't sleep with interrupts disabled */
/* We shouldn't sleep with interrupts disabled */
- ASSERT(IRQ_
GETSTATE
());
+ ASSERT(IRQ_
ENABLED
());
#endif
#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
#endif
#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS