/*#*
*#* $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.
*#*
* 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 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
- return((us * TIMER_HW_HPTICKS_PER_SEC + 500000UL) / 1000000UL);
+ return (us * TIMER_HW_HPTICKS_PER_SEC + 500000UL) / 1000000UL;
#endif
}
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
- return((hpticks * 1000000UL) / TIMER_HW_HPTICKS_PER_SEC);
+ return (hpticks * 1000000UL) / TIMER_HW_HPTICKS_PER_SEC;
#endif /* TIMER_HW_HPTICKS_PER_SEC < 100000UL */
}