Add AT91 ARM CPU recognition.

[bertos.git] / drv / timer.h

diff --git a/drv/timer.h b/drv/timer.h
old mode 100755 (executable)
new mode 100644 (file)
index 1c361ff..c2648da
--- a/drv/timer.h
+++ b/drv/timer.h
@@ -1,9 +1,34 @@
 /**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \version $Id$
@@ -15,6 +40,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 +194,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 +253,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 +263,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 */
 }