X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Ftimer_avr.h;h=20764a1b60658328913da827d6a081b4cf160570;hb=51157819d281eeca3d8afa8c27e22353c301e2ca;hp=89d0dd76d134c9d5ff8ebb595838e4e0fa9fa2b2;hpb=2c5f3d04467211d59b9387abe73c1f286ea74806;p=bertos.git

diff --git a/bertos/cpu/avr/drv/timer_avr.h b/bertos/cpu/avr/drv/timer_avr.h
index 89d0dd76..20764a1b 100644
--- a/bertos/cpu/avr/drv/timer_avr.h
+++ b/bertos/cpu/avr/drv/timer_avr.h
@@ -26,7 +26,7 @@
  * 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 2003, 2004, 2005, 2010 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
@@ -37,6 +37,7 @@
  *
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Francesco Sacchi <batt@develer.com>
+ * \author Luca Ottaviano <lottaviano@develer.com>
  *
  */
 
@@ -73,16 +74,17 @@
 
 	#define TIMER_PRESCALER      64
 	#define TIMER_HW_BITS        8
-	#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
-		#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE0A)
+	#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168 || CPU_AVR_ATMEGA328P
+		#define DEFINE_TIMER_ISR     DECLARE_ISR_CONTEXT_SWITCH(TIMER0_COMPA_vect)
 	#else
-		#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE0)
+		#define DEFINE_TIMER_ISR     DECLARE_ISR_CONTEXT_SWITCH(TIMER0_COMP_vect)
 	#endif
 	#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;
+	#define SIZEOF_HPTIME_T 1
 
 	INLINE hptime_t timer_hw_hpread(void)
 	{
@@ -95,11 +97,12 @@
 	#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 DEFINE_TIMER_ISR     DECLARE_ISR_CONTEXT_SWITCH(TIMER1_OVF_vect)
 	#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;
+	#define SIZEOF_HPTIME_T 2
 
 	INLINE hptime_t timer_hw_hpread(void)
 	{
@@ -110,10 +113,10 @@
 
 	#define TIMER_PRESCALER      64
 	#define TIMER_HW_BITS        8
-	#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
-		#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE2A)
+	#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168 || CPU_AVR_ATMEGA328P
+		#define DEFINE_TIMER_ISR     DECLARE_ISR_CONTEXT_SWITCH(TIMER2_COMPA_vect)
 	#else
-		#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE2)
+		#define DEFINE_TIMER_ISR     DECLARE_ISR_CONTEXT_SWITCH(TIMER2_COMP_vect)
 	#endif
 	#define TIMER_TICKS_PER_SEC  1000
 	/** Value for OCR register in output-compare based timers. */
@@ -121,6 +124,7 @@
 
 	/// Type of time expressed in ticks of the hardware high precision timer
 	typedef uint8_t hptime_t;
+	#define SIZEOF_HPTIME_T 1
 
 	INLINE hptime_t timer_hw_hpread(void)
 	{
@@ -133,11 +137,12 @@
 	#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 DEFINE_TIMER_ISR     DECLARE_ISR_CONTEXT_SWITCH(TIMER3_OVF_vect)
 	#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;
+	#define SIZEOF_HPTIME_T 2
 
 	INLINE hptime_t timer_hw_hpread(void)
 	{
@@ -165,6 +170,12 @@
 /** Not needed, timer IRQ handler called only for timer source */
 #define timer_hw_triggered() (true)
 
+
+INLINE hptime_t timer_hw_hpticks(ticks_t clock)
+{
+	return timer_hw_hpread() + clock * TIMER_HW_CNT;
+}
+
 void timer_hw_init(void);
 
 #endif /* DRV_TIMER_AVR_H */