X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Favr%2Fdrv%2Ftimer_avr.c;h=54b4f0b728f91d9e08962fb84dfc8e1f585c826d;hb=effd2220f9670fa2dcb722f11441b0e645ea1f86;hp=291f205d9115b27ad72e9152ab3de713c725cb46;hpb=2645fcfb9f3126ea7a63dfdcc5810135d11cfd0b;p=bertos.git

diff --git a/bertos/cpu/avr/drv/timer_avr.c b/bertos/cpu/avr/drv/timer_avr.c
index 291f205d..54b4f0b7 100644
--- a/bertos/cpu/avr/drv/timer_avr.c
+++ b/bertos/cpu/avr/drv/timer_avr.c
@@ -26,14 +26,13 @@
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
  *
- * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2005, 2010 Develer S.r.l. (http://www.develer.com/)
  *
  * -->
  *
- * \version $Id$
- *
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Francesco Sacchi <batt@develer.com>
+ * \author Luca Ottaviano <lottaviano@develer.com>
  *
  * \brief Low-level timer module for AVR (implementation).
  *
@@ -48,15 +47,22 @@
 #include <cpu/types.h>
 #include <cpu/irq.h>
 
-#include <avr/interrupt.h>
 #include <avr/io.h>
 
-#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
+#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168 || CPU_AVR_ATMEGA328P
 	#define REG_TIFR0 TIFR0
+	#define REG_TIFR1 TIFR1
 	#define REG_TIFR2 TIFR2
+	#if CPU_AVR_ATMEGA1281
+		#define REG_TIFR3 TIFR3
+	#endif
 
 	#define REG_TIMSK0 TIMSK0
+	#define REG_TIMSK1 TIMSK1
 	#define REG_TIMSK2 TIMSK2
+	#if CPU_AVR_ATMEGA1281
+		#define REG_TIMSK3 TIMSK3
+	#endif
 
 	#define REG_TCCR0A TCCR0A
 	#define REG_TCCR0B TCCR0B
@@ -74,10 +80,13 @@
 	#define BIT_OCIE2A OCIE2A
 #else
 	#define REG_TIFR0 TIFR
+	#define REG_TIFR1 TIFR
 	#define REG_TIFR2 TIFR
 
 	#define REG_TIMSK0 TIMSK
+	#define REG_TIMSK1 TIMSK
 	#define REG_TIMSK2 TIMSK
+	#define REG_TIMSK3 ETIMSK
 
 	#define REG_TCCR0A TCCR0
 	#define REG_TCCR0B TCCR0
@@ -107,7 +116,7 @@
 /** HW dependent timer initialization  */
 #if (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE0)
 
-	static void timer_hw_init(void)
+	void timer_hw_init(void)
 	{
 		cpu_flags_t flags;
 		IRQ_SAVE_DISABLE(flags);
@@ -127,7 +136,7 @@
 			#else
 				#error Unsupported value of TIMER_PRESCALER
 			#endif
-		;
+
 		TCNT0 = 0x00;                 /* Initialization of Timer/Counter */
 		REG_OCR0A = OCR_DIVISOR;           /* Timer/Counter Output Compare Register */
 
@@ -138,20 +147,15 @@
 		IRQ_RESTORE(flags);
 	}
 
-	INLINE hptime_t timer_hw_hpread(void)
-	{
-		return TCNT0;
-	}
-
 #elif (CONFIG_TIMER == TIMER_ON_OVERFLOW1)
 
-	static void timer_hw_init(void)
+	void timer_hw_init(void)
 	{
 		cpu_flags_t flags;
 		IRQ_SAVE_DISABLE(flags);
 
 		/* Reset Timer overflow flag */
-		REG_TIFR0 |= BV(TOV1);
+		REG_TIFR1 |= BV(TOV1);
 
 		/* Fast PWM mode, 9 bit, 24 kHz, no prescaling. */
 		#if (TIMER_PRESCALER == 1) && (TIMER_HW_BITS == 9)
@@ -172,18 +176,13 @@
 		TCNT1 = 0x00;         /* initialization of Timer/Counter */
 
 		/* Enable timer interrupt: Timer/Counter1 Overflow */
-		REG_TIMSK0 |= BV(TOIE1);
+		REG_TIMSK1 |= BV(TOIE1);
 
 		IRQ_RESTORE(flags);
 	}
 
-	INLINE hptime_t timer_hw_hpread(void)
-	{
-		return TCNT1;
-	}
-
 #elif (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE2)
-	static void timer_hw_init(void)
+	void timer_hw_init(void)
 	{
 		cpu_flags_t flags;
 		IRQ_SAVE_DISABLE(flags);
@@ -205,7 +204,7 @@
 		/* Clear on Compare match & prescaler = 64, internal sys clock.
 		   When changing prescaler change TIMER_HW_HPTICKS_PER_SEC too */
 		TCNT2 = 0x00;         /* initialization of Timer/Counter */
-		REG_OCR2A = OCR_DIVISOR;   /* Timer/Counter Output Compare Register */
+		REG_OCR2A = (uint8_t)OCR_DIVISOR;   /* Timer/Counter Output Compare Register */
 
 		/* Enable timer interrupts: Timer/Counter2 Output Compare (OCIE2) */
 		REG_TIMSK2 &= ~BV(TOIE2);
@@ -214,19 +213,15 @@
 		IRQ_RESTORE(flags);
 	}
 
-	INLINE hptime_t timer_hw_hpread(void)
-	{
-		return TCNT2;
-	}
 #elif (CONFIG_TIMER == TIMER_ON_OVERFLOW3)
 
-	static void timer_hw_init(void)
+	void timer_hw_init(void)
 	{
 		cpu_flags_t flags;
 		IRQ_SAVE_DISABLE(flags);
 
 		/* Reset Timer overflow flag */
-		TIFR |= BV(TOV3);
+		REG_TIFR3 |= BV(TOV3);
 
 		/* Fast PWM mode, 9 bit, 24 kHz, no prescaling. */
 		#if (TIMER_PRESCALER == 1) && (TIMER_HW_BITS == 9)
@@ -244,20 +239,15 @@
 			#error Unsupported value of TIMER_PRESCALER or TIMER_HW_BITS
 		#endif
 
-		TCNT3 = 0x00;         /* initialization of Timer/Counter */
+		/* initialization of Timer/Counter */
+		TCNT3 = 0x00;
 
 		/* Enable timer interrupt: Timer/Counter3 Overflow */
-		/* ATTENTION! TOIE3 is only on ETIMSK, not TIMSK */
-		ETIMSK |= BV(TOIE3);
+		REG_TIMSK3 |= BV(TOIE3);
 
 		IRQ_RESTORE(flags);
 	}
 
-	INLINE hptime_t timer_hw_hpread(void)
-	{
-		return TCNT3;
-	}
-
 #else
 	#error Unimplemented value for CONFIG_TIMER
 #endif /* CONFIG_TIMER */