projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set to const col_address; add static assert check on array dimension.
[bertos.git]
/
drv
/
timer.h
diff --git
a/drv/timer.h
b/drv/timer.h
index 5c1d9001402c60353d4a3358972efe0cb2b7a911..68fdc1dfe80a3d5a340957ac1ff4e8f4b428a500 100755
(executable)
--- a/
drv/timer.h
+++ b/
drv/timer.h
@@
-15,6
+15,9
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.33 2007/06/07 14:35:12 batt
+ *#* Merge from project_ks.
+ *#*
*#* Revision 1.32 2007/01/09 08:57:19 bernie
*#* Remove excess parentheses.
*#*
*#* Revision 1.32 2007/01/09 08:57:19 bernie
*#* Remove excess parentheses.
*#*
@@
-166,7
+169,7
@@
INLINE ticks_t timer_clock(void)
* interrupt is disabled (DISABLE_INTS) or overridden by a
* higher-priority or non-nesting interrupt.
*
* interrupt is disabled (DISABLE_INTS) or overridden by a
* higher-priority or non-nesting interrupt.
*
- * \sa timer_
ticks
+ * \sa timer_
clock
*/
INLINE ticks_t timer_clock_unlocked(void)
{
*/
INLINE ticks_t timer_clock_unlocked(void)
{