From 04fdfe40ab43469be32abea92141617ff50db30c Mon Sep 17 00:00:00 2001
From: utzig <utzig@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 25 Jul 2014 14:09:15 +0000
Subject: [AVR] Use osal provided OSAL_ST_FREQUENCY instead of redefining it

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7092 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/ports/AVR/hal_lld.h | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/os/hal/ports/AVR/hal_lld.h b/os/hal/ports/AVR/hal_lld.h
index da16acce9..810e1614b 100644
--- a/os/hal/ports/AVR/hal_lld.h
+++ b/os/hal/ports/AVR/hal_lld.h
@@ -37,7 +37,7 @@
 /**
  * @brief   Platform name.
  */
-#define PLATFORM_NAME   "AVR"
+#define PLATFORM_NAME "AVR"
 
 /**
  * @brief  Timer maximum value 
@@ -63,38 +63,32 @@
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#ifdef _NIL_
-#define CFG_ST_FREQUENCY NIL_CFG_ST_FREQUENCY
-#else
-#define CFG_ST_FREQUENCY CH_CFG_ST_FREQUENCY
-#endif
-
-/* Find the most suitable prescaler setting for the desired CFG_ST_FREQUENCY */
-#if ((F_CPU / CFG_ST_FREQUENCY) <= AVR_TIMER_COUNTER_MAX)
+/* Find the most suitable prescaler setting for the desired OSAL_ST_FREQUENCY */
+#if ((F_CPU / OSAL_ST_FREQUENCY) <= AVR_TIMER_COUNTER_MAX)
   #define AVR_TIMER_PRESCALER 1
-  #define AVR_TIMER_PRESCALER_BITS (0 << CS02)  | (0 << CS01)  | (1 << CS00); /* CLK      */
-#elif ((F_CPU / CFG_ST_FREQUENCY / 8) <= AVR_TIMER_COUNTER_MAX)
+  #define AVR_TIMER_PRESCALER_BITS (0<<CS02)|(0<<CS01)|(1<<CS00); /* CLK      */
+#elif ((F_CPU / OSAL_ST_FREQUENCY / 8) <= AVR_TIMER_COUNTER_MAX)
   #define AVR_TIMER_PRESCALER 8
-  #define AVR_TIMER_PRESCALER_BITS (0 << CS02)  | (1 << CS01)  | (0 << CS00); /* CLK/8    */
-#elif ((F_CPU / CFG_ST_FREQUENCY / 64) <= AVR_TIMER_COUNTER_MAX)
+  #define AVR_TIMER_PRESCALER_BITS (0<<CS02)|(1<<CS01)|(0<<CS00); /* CLK/8    */
+#elif ((F_CPU / OSAL_ST_FREQUENCY / 64) <= AVR_TIMER_COUNTER_MAX)
   #define AVR_TIMER_PRESCALER 64
-  #define AVR_TIMER_PRESCALER_BITS (0 << CS02)  | (1 << CS01)  | (1 << CS00); /* CLK/64   */
-#elif ((F_CPU / CFG_ST_FREQUENCY / 256) <= AVR_TIMER_COUNTER_MAX)
+  #define AVR_TIMER_PRESCALER_BITS (0<<CS02)|(1<<CS01)|(1<<CS00); /* CLK/64   */
+#elif ((F_CPU / OSAL_ST_FREQUENCY / 256) <= AVR_TIMER_COUNTER_MAX)
   #define AVR_TIMER_PRESCALER 256
-  #define AVR_TIMER_PRESCALER_BITS (1 << CS02)  | (0 << CS01)  | (0 << CS00); /* CLK/256  */
-#elif ((F_CPU / CFG_ST_FREQUENCY / 1024) <= AVR_TIMER_COUNTER_MAX)
+  #define AVR_TIMER_PRESCALER_BITS (1<<CS02)|(0<<CS01)|(0<<CS00); /* CLK/256  */
+#elif ((F_CPU / OSAL_ST_FREQUENCY / 1024) <= AVR_TIMER_COUNTER_MAX)
   #define AVR_TIMER_PRESCALER 1024
-  #define AVR_TIMER_PRESCALER_BITS (1 << CS02)  | (0 << CS01)  | (1 << CS00); /* CLK/1024 */
+  #define AVR_TIMER_PRESCALER_BITS (1<<CS02)|(0<<CS01)|(1<<CS00); /* CLK/1024 */
 #else
-  #error "Frequency too low for timer, please set CFG_ST_FREQUENCY to a higher value"
+  #error "Frequency too low for timer, please set OSAL_ST_FREQUENCY to a higher value"
 #endif
 
-#define AVR_TIMER_COUNTER (F_CPU / CFG_ST_FREQUENCY / AVR_TIMER_PRESCALER)
+#define AVR_TIMER_COUNTER (F_CPU / OSAL_ST_FREQUENCY / AVR_TIMER_PRESCALER)
 
-/* Test if CFG_ST_FREQUENCY can be matched exactly using this timer */
-#define F_CPU_ (AVR_TIMER_COUNTER * AVR_TIMER_PRESCALER * CFG_ST_FREQUENCY)
+/* Test if OSAL_ST_FREQUENCY can be matched exactly using this timer */
+#define F_CPU_ (AVR_TIMER_COUNTER * AVR_TIMER_PRESCALER * OSAL_ST_FREQUENCY)
 #if (F_CPU_ != F_CPU)
-  #warning "CFG_ST_FREQUENCY cannot be generated exactly using timer"
+  #warning "OSAL_ST_FREQUENCY cannot be generated exactly using timer"
 #endif
 #undef F_CPU_
 
-- 
cgit v1.2.3