X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Ftimer_avr.h;h=89d0dd76d134c9d5ff8ebb595838e4e0fa9fa2b2;hb=bb26872e115380a4354346bce26a0e1ec94f7628;hp=1eccd0efcd501abc7f6e256b635aa2ad0711c3b7;hpb=720b15af51d68f0c0dfd328437d10de20769c5ae;p=bertos.git

diff --git a/bertos/cpu/avr/drv/timer_avr.h b/bertos/cpu/avr/drv/timer_avr.h
index 1eccd0ef..89d0dd76 100644
--- a/bertos/cpu/avr/drv/timer_avr.h
+++ b/bertos/cpu/avr/drv/timer_avr.h
@@ -43,12 +43,14 @@
 #ifndef DRV_TIMER_AVR_H
 #define DRV_TIMER_AVR_H
 
-#include "hw/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 */
-#include <cfg/macros.h>    /* DIV_ROUND */
+#include "cfg/cfg_timer.h"   /* CONFIG_TIMER */
+#include <cfg/compiler.h>    /* uint8_t */
+#include <cfg/macros.h>      /* DIV_ROUND */
 
+#include <avr/io.h>
+#include <avr/interrupt.h>
 
 /**
  * \name Values for CONFIG_TIMER.
@@ -82,6 +84,11 @@
 	/// Type of time expressed in ticks of the hardware high-precision timer
 	typedef uint8_t hptime_t;
 
+	INLINE hptime_t timer_hw_hpread(void)
+	{
+		return TCNT0;
+	}
+
 #elif (CONFIG_TIMER == TIMER_ON_OVERFLOW1)
 
 	#define TIMER_PRESCALER      1
@@ -94,6 +101,11 @@
 	/// Type of time expressed in ticks of the hardware high precision timer
 	typedef uint16_t hptime_t;
 
+	INLINE hptime_t timer_hw_hpread(void)
+	{
+		return TCNT1;
+	}
+
 #elif (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE2)
 
 	#define TIMER_PRESCALER      64
@@ -107,10 +119,14 @@
 	/** Value for OCR register in output-compare based timers. */
 	#define TIMER_HW_CNT         OCR_DIVISOR
 
-
 	/// Type of time expressed in ticks of the hardware high precision timer
 	typedef uint8_t hptime_t;
 
+	INLINE hptime_t timer_hw_hpread(void)
+	{
+		return TCNT2;
+	}
+
 #elif (CONFIG_TIMER == TIMER_ON_OVERFLOW3)
 
 	#define TIMER_PRESCALER      1
@@ -122,6 +138,12 @@
 
 	/// Type of time expressed in ticks of the hardware high precision timer
 	typedef uint16_t hptime_t;
+
+	INLINE hptime_t timer_hw_hpread(void)
+	{
+		return TCNT3;
+	}
+
 #else
 
 	#error Unimplemented value for CONFIG_TIMER
@@ -129,13 +151,13 @@
 
 
 /** Frequency of the hardware high precision timer. */
-#define TIMER_HW_HPTICKS_PER_SEC  DIV_ROUND(CLOCK_FREQ, TIMER_PRESCALER)
+#define TIMER_HW_HPTICKS_PER_SEC  DIV_ROUND(CPU_FREQ, TIMER_PRESCALER)
 
 /**
  * System timer: additional division after the prescaler
  * 12288000 / 64 / 192 (0..191) = 1 ms
  */
-#define OCR_DIVISOR  (DIV_ROUND(DIV_ROUND(CLOCK_FREQ, TIMER_PRESCALER), TIMER_TICKS_PER_SEC) - 1)
+#define OCR_DIVISOR  (DIV_ROUND(DIV_ROUND(CPU_FREQ, TIMER_PRESCALER), TIMER_TICKS_PER_SEC) - 1)
 
 /** Not needed, IRQ timer flag cleared automatically */
 #define timer_hw_irq() do {} while (0)
@@ -143,5 +165,6 @@
 /** Not needed, timer IRQ handler called only for timer source */
 #define timer_hw_triggered() (true)
 
+void timer_hw_init(void);
 
 #endif /* DRV_TIMER_AVR_H */