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 1c361fffe580d20778bff2277ab9708912c67bd3..68fdc1dfe80a3d5a340957ac1ff4e8f4b428a500 100755
(executable)
--- a/
drv/timer.h
+++ b/
drv/timer.h
@@
-15,6
+15,12
@@
/*#*
*#* $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.31 2006/07/19 12:56:26 bernie
*#* Convert to new Doxygen style.
*#*
*#* Revision 1.31 2006/07/19 12:56:26 bernie
*#* Convert to new Doxygen style.
*#*
@@
-163,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)
{
@@
-222,9
+228,9
@@
INLINE utime_t ticks_to_us(ticks_t ticks)
INLINE hptime_t us_to_hptime(utime_t us)
{
#if TIMER_HW_HPTICKS_PER_SEC > 10000000UL
INLINE hptime_t us_to_hptime(utime_t us)
{
#if TIMER_HW_HPTICKS_PER_SEC > 10000000UL
- return
(us * ((TIMER_HW_HPTICKS_PER_SEC + 500000UL) / 1000000UL)
);
+ return
us * ((TIMER_HW_HPTICKS_PER_SEC + 500000UL) / 1000000UL
);
#else
#else
- return
((us * TIMER_HW_HPTICKS_PER_SEC + 500000UL) / 1000000UL)
;
+ return
(us * TIMER_HW_HPTICKS_PER_SEC + 500000UL) / 1000000UL
;
#endif
}
#endif
}
@@
-232,9
+238,9
@@
INLINE hptime_t us_to_hptime(utime_t us)
INLINE utime_t hptime_to_us(hptime_t hpticks)
{
#if TIMER_HW_HPTICKS_PER_SEC < 100000UL
INLINE utime_t hptime_to_us(hptime_t hpticks)
{
#if TIMER_HW_HPTICKS_PER_SEC < 100000UL
- return
(hpticks * (1000000UL / TIMER_HW_HPTICKS_PER_SEC)
);
+ return
hpticks * (1000000UL / TIMER_HW_HPTICKS_PER_SEC
);
#else
#else
- return
((hpticks * 1000000UL) / TIMER_HW_HPTICKS_PER_SEC)
;
+ return
(hpticks * 1000000UL) / TIMER_HW_HPTICKS_PER_SEC
;
#endif /* TIMER_HW_HPTICKS_PER_SEC < 100000UL */
}
#endif /* TIMER_HW_HPTICKS_PER_SEC < 100000UL */
}