projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor KFileFlash25 to Flash25KFile. Tested.
[bertos.git]
/
bertos
/
drv
/
timer.c
diff --git
a/bertos/drv/timer.c
b/bertos/drv/timer.c
index ca0605a792f8f9d92624ff403809943dabbca984..fbe7c695c9ee3455cd6cdde428c4ca860b6426a8 100644
(file)
--- a/
bertos/drv/timer.c
+++ b/
bertos/drv/timer.c
@@
-27,21
+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_kern.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>
@@
-181,11
+181,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;