X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.h;h=68fdc1dfe80a3d5a340957ac1ff4e8f4b428a500;hb=d4d9e245c5c9c8eb42787e4f59a7d74271e15f77;hp=1c361fffe580d20778bff2277ab9708912c67bd3;hpb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;p=bertos.git

diff --git a/drv/timer.h b/drv/timer.h
index 1c361fff..68fdc1df 100755
--- a/drv/timer.h
+++ b/drv/timer.h
@@ -15,6 +15,12 @@
 
 /*#*
  *#* $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.
  *#*
@@ -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.
  *
- * \sa timer_ticks
+ * \sa timer_clock
  */
 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
-	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
 }
 
@@ -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
-	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 */
 }