projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gfx_findRegion(): Only define when CONFIG_GFX_CLIPPING is enabled.
[bertos.git]
/
drv
/
timer.c
diff --git
a/drv/timer.c
b/drv/timer.c
index 8036816cf1d66e4dbbe31d221ce604e0de0c64a7..33188771e1e2711b046ebcf7a4db4e5a1fd09b06 100755
(executable)
--- a/
drv/timer.c
+++ b/
drv/timer.c
@@
-1,4
+1,4
@@
-/*
!
+/*
*
* \file
* <!--
* Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
* \file
* <!--
* Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
@@
-14,6
+14,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.31 2006/07/19 12:56:26 bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.30 2006/02/24 00:26:49 bernie
+ *#* Fixes for CONFIG_KERNEL.
+ *#*
*#* Revision 1.29 2006/02/17 22:24:07 bernie
*#* Add MOD_CHECK() checks.
*#*
*#* Revision 1.29 2006/02/17 22:24:07 bernie
*#* Add MOD_CHECK() checks.
*#*
@@
-76,12
+82,17
@@
#include <drv/wdt.h>
#endif
#include <drv/wdt.h>
#endif
-#if CONFIG_KERNEL && CONFIG_KERN_SIGNALS
- #include <kern/proc.h>
+#if CONFIG_KERNEL
+ #include <config_kern.h>
+ #if CONFIG_KERN_SIGNALS
+ #include <kern/signal.h> /* sig_wait(), sig_check() */
+ #include <kern/proc.h> /* proc_current() */
+ #include <cfg/macros.h> /* BV() */
+ #endif
#endif
#endif
-/*
!
+/*
*
* \def CONFIG_TIMER_STROBE
*
* This is a debug facility that can be used to
* \def CONFIG_TIMER_STROBE
*
* This is a debug facility that can be used to
@@
-98,19
+109,19
@@
#endif
#endif
-//
!
Master system clock (1 tick accuracy)
+//
/
Master system clock (1 tick accuracy)
volatile ticks_t _clock;
#ifndef CONFIG_TIMER_DISABLE_EVENTS
volatile ticks_t _clock;
#ifndef CONFIG_TIMER_DISABLE_EVENTS
-/*
!
+/*
*
* List of active asynchronous timers.
*/
REGISTER static List timers_queue;
* List of active asynchronous timers.
*/
REGISTER static List timers_queue;
-/*
!
+/*
*
* Add the specified timer to the software timer service queue.
* When the delay indicated by the timer expires, the timer
* device will execute the event associated with it.
* Add the specified timer to the software timer service queue.
* When the delay indicated by the timer expires, the timer
* device will execute the event associated with it.
@@
-151,13
+162,13
@@
void timer_add(Timer *timer)
}
/* Enqueue timer request into the list */
}
/* Enqueue timer request into the list */
- INSERTBEFORE(&timer->link, &node->link);
+ INSERT
_
BEFORE(&timer->link, &node->link);
IRQ_RESTORE(flags);
}
IRQ_RESTORE(flags);
}
-/*
!
+/*
*
* Remove a timer from the timer queue before it has expired.
*/
Timer *timer_abort(Timer *timer)
* Remove a timer from the timer queue before it has expired.
*/
Timer *timer_abort(Timer *timer)
@@
-171,8
+182,8
@@
Timer *timer_abort(Timer *timer)
#endif /* CONFIG_TIMER_DISABLE_EVENTS */
#endif /* CONFIG_TIMER_DISABLE_EVENTS */
-/*
!
- * Wait for the specified amount of time
(expressed in ms)
.
+/*
*
+ * Wait for the specified amount of time
r ticks
.
*/
void timer_delayTicks(ticks_t delay)
{
*/
void timer_delayTicks(ticks_t delay)
{
@@
-186,7
+197,7
@@
void timer_delayTicks(ticks_t delay)
ASSERT(!sig_check(SIG_SINGLE));
timer_set_event_signal(&t, proc_current(), SIG_SINGLE);
ASSERT(!sig_check(SIG_SINGLE));
timer_set_event_signal(&t, proc_current(), SIG_SINGLE);
- timer_set
_d
elay(&t, delay);
+ timer_set
D
elay(&t, delay);
timer_add(&t);
sig_wait(SIG_SINGLE);
timer_add(&t);
sig_wait(SIG_SINGLE);
@@
-208,7
+219,7
@@
void timer_delayTicks(ticks_t delay)
#ifndef CONFIG_TIMER_DISABLE_UDELAY
#ifndef CONFIG_TIMER_DISABLE_UDELAY
-/*
!
+/*
*
* Busy wait until the specified amount of high-precision ticks have elapsed.
*
* \note This function is interrupt safe, the only
* Busy wait until the specified amount of high-precision ticks have elapsed.
*
* \note This function is interrupt safe, the only
@@
-235,7
+246,7
@@
void timer_busyWait(hptime_t delay)
}
}
}
}
-/*
!
+/*
*
* Wait for the specified amount of time (expressed in microseconds).
*
* \bug In AVR arch the maximum amount of time that can be used as
* Wait for the specified amount of time (expressed in microseconds).
*
* \bug In AVR arch the maximum amount of time that can be used as
@@
-255,7
+266,7
@@
void timer_delayHp(hptime_t delay)
#endif /* CONFIG_TIMER_DISABLE_UDELAY */
#endif /* CONFIG_TIMER_DISABLE_UDELAY */
-/*
!
+/*
*
* Timer interrupt handler. Find soft timers expired and
* trigger corresponding events.
*/
* Timer interrupt handler. Find soft timers expired and
* trigger corresponding events.
*/
@@
-309,7
+320,7
@@
DEFINE_TIMER_ISR
MOD_DEFINE(timer)
MOD_DEFINE(timer)
-/*
!
+/*
*
* Initialize timer
*/
void timer_init(void)
* Initialize timer
*/
void timer_init(void)