projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For at91sam7 family.
[bertos.git]
/
drv
/
timer.c
diff --git
a/drv/timer.c
b/drv/timer.c
index b25afba5cc53e75fb76777fa59f6f50f3afd6275..45ce64b44a892165bb5247c9d7b63c1b49fbdf58 100644
(file)
--- a/
drv/timer.c
+++ b/
drv/timer.c
@@
-38,7
+38,11
@@
*/
#include "timer.h"
*/
#include "timer.h"
-#include <cpu/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>
@@
-70,6
+74,7
@@
#if CONFIG_KERNEL
#include <config_kern.h>
#if CONFIG_KERNEL
#include <config_kern.h>
+ #include <hw/switch.h>
#if CONFIG_KERN_SIGNALS
#include <kern/signal.h> /* sig_wait(), sig_check() */
#include <kern/proc.h> /* proc_current() */
#if CONFIG_KERN_SIGNALS
#include <kern/signal.h> /* sig_wait(), sig_check() */
#include <kern/proc.h> /* proc_current() */
@@
-173,9
+178,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