X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Ftimer_avr.h;h=ecabb9dbfa7794c1b70b1e0d508d5673edbfd70c;hb=485f68165577f92d04057771bd11e969be9a2c7c;hp=de46d1b7fb124f65b4fb2de15ee881a7541fe46e;hpb=d62963b4a64efe8d2917f489fefaf586a9a99126;p=bertos.git

diff --git a/bertos/cpu/avr/drv/timer_avr.h b/bertos/cpu/avr/drv/timer_avr.h
index de46d1b7..ecabb9db 100644
--- a/bertos/cpu/avr/drv/timer_avr.h
+++ b/bertos/cpu/avr/drv/timer_avr.h
@@ -26,120 +26,30 @@
  * 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>
+ * Copyright 2003, 2004, 2005, 2010 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
  * \brief Low-level timer module for AVR (interface).
  *
- * \version $Id$
- *
- * \author Bernardo Innocenti <bernie@develer.com>
- * \author Francesco Sacchi <batt@develer.com>
+ * \author Onno <developer@gorgoz.org>
  *
  */
 
-#ifndef DRV_TIMER_AVR_H
-#define DRV_TIMER_AVR_H
-
-#include "hw_cpu.h"        /* CLOCK_FREQ */
-
-#include <cfg/cfg_timer.h>     /* CONFIG_TIMER */
-#include <cfg/compiler.h>  /* uint8_t */
-#include <cfg/macros.h>    /* DIV_ROUND */
-
-
-/**
- * \name Values for CONFIG_TIMER.
- *
- * Select which hardware timer interrupt to use for system clock and softtimers.
- * \note The timer 1 overflow mode set the timer as a 24 kHz PWM.
- *
- * \{
- */
-#define TIMER_ON_OUTPUT_COMPARE0  1
-#define TIMER_ON_OVERFLOW1        2
-#define TIMER_ON_OUTPUT_COMPARE2  3
-#define TIMER_ON_OVERFLOW3        4
-
-#define TIMER_DEFAULT TIMER_ON_OUTPUT_COMPARE0 ///< Default system timer
-/* \} */
-
-/*
- * Hardware dependent timer initialization.
- */
-#if (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE0)
-
-	#define TIMER_PRESCALER      64
-	#define TIMER_HW_BITS        8
-	#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE0)
-	#define TIMER_TICKS_PER_SEC  1000
-	#define TIMER_HW_CNT         OCR_DIVISOR
-
-	/// Type of time expressed in ticks of the hardware high-precision timer
-	typedef uint8_t hptime_t;
-
-#elif (CONFIG_TIMER == TIMER_ON_OVERFLOW1)
+#ifndef TIMER_AVR_H_
+#define TIMER_AVR_H_
 
-	#define TIMER_PRESCALER      1
-	#define TIMER_HW_BITS        8
-	/** This value is the maximum in overflow based timers. */
-	#define TIMER_HW_CNT         (1 << TIMER_HW_BITS)
-	#define DEFINE_TIMER_ISR     SIGNAL(SIG_OVERFLOW1)
-	#define TIMER_TICKS_PER_SEC  DIV_ROUND(TIMER_HW_HPTICKS_PER_SEC, TIMER_HW_CNT)
+#include <cpu/detect.h>
 
-	/// Type of time expressed in ticks of the hardware high precision timer
-	typedef uint16_t hptime_t;
-
-#elif (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE2)
-
-	#define TIMER_PRESCALER      64
-	#define TIMER_HW_BITS        8
-	#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
-		#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE2A)
-	#else
-		#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE2)
-	#endif
-	#define TIMER_TICKS_PER_SEC  1000
-	/** 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;
-
-#elif (CONFIG_TIMER == TIMER_ON_OVERFLOW3)
-
-	#define TIMER_PRESCALER      1
-	#define TIMER_HW_BITS        8
-	/** This value is the maximum in overflow based timers. */
-	#define TIMER_HW_CNT         (1 << TIMER_HW_BITS)
-	#define DEFINE_TIMER_ISR     SIGNAL(SIG_OVERFLOW3)
-	#define TIMER_TICKS_PER_SEC  DIV_ROUND(TIMER_HW_HPTICKS_PER_SEC, TIMER_HW_CNT)
-
-	/// Type of time expressed in ticks of the hardware high precision timer
-	typedef uint16_t hptime_t;
+#if CPU_AVR_MEGA
+	#include "timer_mega.h"
+#elif CPU_AVR_XMEGA
+	#include "timer_xmega.h"
+/*#elif  Add other AVR families here */
 #else
-
-	#error Unimplemented value for CONFIG_TIMER
-#endif /* CONFIG_TIMER */
-
-
-/** Frequency of the hardware high precision timer. */
-#define TIMER_HW_HPTICKS_PER_SEC  DIV_ROUND(CLOCK_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)
-
-/** Not needed, IRQ timer flag cleared automatically */
-#define timer_hw_irq() do {} while (0)
-
-/** Not needed, timer IRQ handler called only for timer source */
-#define timer_hw_triggered() (true)
+	#error Unknown CPU
+#endif
 
 
-#endif /* DRV_TIMER_AVR_H */
+#endif /* TIMER_AVR_H_ */