projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the name of the module
[bertos.git]
/
bertos
/
drv
/
timer.h
diff --git
a/bertos/drv/timer.h
b/bertos/drv/timer.h
index 41f43f655d5cc191201fd0c7c8fa1736d334c965..e418cec7e15979cd2f721a4f6fbdd2a2ad81278e 100644
(file)
--- a/
bertos/drv/timer.h
+++ b/
bertos/drv/timer.h
@@
-30,10
+30,15
@@
* Copyright 2000, 2008 Bernie Innocenti <bernie@codewiz.org>
* -->
*
* Copyright 2000, 2008 Bernie Innocenti <bernie@codewiz.org>
* -->
*
- * \brief Hardware independent timer driver
(interface)
+ * \brief Hardware independent timer driver
.
*
* \version $Id$
* \author Bernie Innocenti <bernie@codewiz.org>
*
* \version $Id$
* \author Bernie Innocenti <bernie@codewiz.org>
+ *
+ * $WIZ$ module_name = "timer"
+ * $WIZ$ module_configuration = "bertos/cfg/cfg_timer.h"
+ * $WIZ$ module_depends = "event", "sysirq"
+ * $WIZ$ module_supports = "not atmega103 and not atmega8"
*/
#ifndef DRV_TIMER_H
*/
#ifndef DRV_TIMER_H
@@
-51,7
+56,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_HEADER(timer)
+ //#include OS_HEADER(timer)
+ #include <emul/timer_posix.h>
#else
#include CPU_HEADER(timer)
#endif
#else
#include CPU_HEADER(timer)
#endif
@@
-248,12
+254,9
@@
Timer *timer_abort(Timer *timer);
/** Set the timer so that it calls an user hook when it expires */
INLINE void timer_setSoftint(Timer *timer, Hook func, iptr_t user_data)
{
/** Set the timer so that it calls an user hook when it expires */
INLINE void timer_setSoftint(Timer *timer, Hook func, iptr_t user_data)
{
- event_initSoft
I
nt(&timer->expire, func, user_data);
+ event_initSoft
i
nt(&timer->expire, func, user_data);
}
}
-// OBSOLETE
-#define timer_set_event_softint timer_setSoftint
-
/** Set the timer delay (the time before the event will be triggered) */
INLINE void timer_setDelay(Timer *timer, ticks_t delay)
{
/** Set the timer delay (the time before the event will be triggered) */
INLINE void timer_setDelay(Timer *timer, ticks_t delay)
{