projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trac#29: Cleanup timer on demo exit
[bertos.git]
/
bertos
/
drv
/
timer.c
diff --git
a/bertos/drv/timer.c
b/bertos/drv/timer.c
index 4ddf06057503ff1370c59a7907810566a898a780..aa671dc4d9423e8f50c0008ffc237212ec58a9e5 100644
(file)
--- a/
bertos/drv/timer.c
+++ b/
bertos/drv/timer.c
@@
-27,20
+27,21
@@
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bern
ardo Innocenti <bernie@develer.com
>
+ * Copyright 2000 Bern
ie Innocenti <bernie@codewiz.org
>
*
* -->
*
* \brief Hardware independent timer driver (implementation)
*
* \version $Id$
*
* -->
*
* \brief Hardware independent timer driver (implementation)
*
* \version $Id$
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
*/
#include "timer.h"
*/
#include "timer.h"
-#include <cfg/cfg_timer.h>
-#include <cfg/cfg_wdt.h>
+#include "cfg/cfg_timer.h"
+#include "cfg/cfg_wdt.h"
+#include "cfg/cfg_kern.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>
@@
-74,7
+75,6
@@
#endif
#if CONFIG_KERNEL
#endif
#if CONFIG_KERNEL
- #include <config_kern.h>
#if CONFIG_KERN_PREEMPTIVE
#include <hw/switch.h>
#endif
#if CONFIG_KERN_PREEMPTIVE
#include <hw/switch.h>
#endif
@@
-163,7
+163,9
@@
void timer_add(Timer *timer)
/**
/**
- * Remove a timer from the timer queue before it has expired.
+ * Remove a timer from the timers queue before it has expired.
+ * \note Attempting to remove a timer already expired cause
+ * undefined behaviour.
*/
Timer *timer_abort(Timer *timer)
{
*/
Timer *timer_abort(Timer *timer)
{
@@
-181,11
+183,12
@@
Timer *timer_abort(Timer *timer)
*/
void timer_delayTicks(ticks_t delay)
{
*/
void timer_delayTicks(ticks_t delay)
{
-#if defined(IRQ_ENABLED)
+#if defined(IRQ_ENABLED)
&& (!(ARCH & ARCH_EMUL))
/* We shouldn't sleep with interrupts disabled */
ASSERT(IRQ_ENABLED());
#endif
/* We shouldn't sleep with interrupts disabled */
ASSERT(IRQ_ENABLED());
#endif
+
#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
Timer t;
#if defined(CONFIG_KERN_SIGNALS) && CONFIG_KERN_SIGNALS
Timer t;