Rename CLOCK_FREQ macro to CPU_FREQ: now clock frequency has to be set in the makefile.

[bertos.git] / bertos / cpu / arm / drv / timer_at91.h

diff --git a/bertos/cpu/arm/drv/timer_at91.h b/bertos/cpu/arm/drv/timer_at91.h
index 87bccd1e5a79c57cecb924b3b52cc87fa481375f..eca205c504a22c43c2f95eb80de78142958847f8 100644 (file)
--- a/bertos/cpu/arm/drv/timer_at91.h
+++ b/bertos/cpu/arm/drv/timer_at91.h
@@ -40,21 +40,21 @@
 #ifndef DRV_AT91_TIMER_H
 #define DRV_AT91_TIMER_H
 
-#include <appconfig.h>     /* CONFIG_TIMER */
-#include <cfg/compiler.h>  /* uint8_t */
-#include <hw_cpu.h>        /* CLOCK_FREQ */
+#include <hw/hw_cpufreq.h>            /* CPU_FREQ */
+
+#include "cfg/cfg_timer.h"     /* CONFIG_TIMER */
+#include <cfg/compiler.h>      /* uint8_t */
 
 /**
  * \name Values for CONFIG_TIMER.
  *
  * Select which hardware timer interrupt to use for system clock and softtimers.
  *
- * \{
+ * $WIZ$ timer_select = "TIMER_ON_PIT", "TIMER_DEFAULT"
  */
 #define TIMER_ON_PIT 1  ///< System timer on Periodic interval timer
 
 #define TIMER_DEFAULT TIMER_ON_PIT  ///< Default system timer
-/* \} */
 
 /*
  * Hardware dependent timer initialization.
@@ -65,10 +65,10 @@
 
        #define DEFINE_TIMER_ISR     void timer_handler(void)
        #define TIMER_TICKS_PER_SEC  1000
-       #define TIMER_HW_CNT         (CLOCK_FREQ / (16 * TIMER_TICKS_PER_SEC) - 1)
+       #define TIMER_HW_CNT         (CPU_FREQ / (16 * TIMER_TICKS_PER_SEC) - 1)
 
        /** Frequency of the hardware high-precision timer. */
-       #define TIMER_HW_HPTICKS_PER_SEC (CLOCK_FREQ / 16)
+       #define TIMER_HW_HPTICKS_PER_SEC (CPU_FREQ / 16)
 
        /// Type of time expressed in ticks of the hardware high-precision timer
        typedef uint32_t hptime_t;