projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill MOC and use QT_MOC instead
[bertos.git]
/
bertos
/
drv
/
timer.c
diff --git
a/bertos/drv/timer.c
b/bertos/drv/timer.c
index bfc4feb2c1a02a619a3acb02ee25473353afa145..c0106d85bbe515a32747c977e1ced7e48016b5e8 100644
(file)
--- a/
bertos/drv/timer.c
+++ b/
bertos/drv/timer.c
@@
-54,7
+54,8
@@
* Try the CPU specific one for bare-metal environments.
*/
#if OS_HOSTED
* Try the CPU specific one for bare-metal environments.
*/
#if OS_HOSTED
- #include OS_CSOURCE(timer)
+ //#include OS_CSOURCE(timer)
+ #include <emul/timer_posix.c>
#else
#include CPU_CSOURCE(timer)
#endif
#else
#include CPU_CSOURCE(timer)
#endif
@@
-187,7
+188,7
@@
void timer_delayTicks(ticks_t delay)
Timer t;
ASSERT(!sig_check(SIG_SINGLE));
Timer t;
ASSERT(!sig_check(SIG_SINGLE));
- timer_set
_event_s
ignal(&t, proc_current(), SIG_SINGLE);
+ timer_set
S
ignal(&t, proc_current(), SIG_SINGLE);
timer_setDelay(&t, delay);
timer_add(&t);
sig_wait(SIG_SINGLE);
timer_setDelay(&t, delay);
timer_add(&t);
sig_wait(SIG_SINGLE);
@@
-324,11
+325,15
@@
MOD_DEFINE(timer)
*/
void timer_init(void)
{
*/
void timer_init(void)
{
- TIMER_STROBE_INIT;
+ #if CONFIG_KERN_IRQ
+ MOD_CHECK(irq);
+ #endif
-#if CONFIG_TIMER_EVENTS
- LIST_INIT(&timers_queue);
-#endif
+ #if CONFIG_TIMER_EVENTS
+ LIST_INIT(&timers_queue);
+ #endif
+
+ TIMER_STROBE_INIT;
_clock = 0;
_clock = 0;