X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer_avr.h;h=85219236061bbddf554258b9f44d5b8e6f40c191;hb=f78e7b82ce293dabb9695e3656c244b955fbb9d2;hp=b536c95393e4a6744e327a86387779c6c355b7ff;hpb=60c82e886f3901b6f4321c5bf6da7210fe01d280;p=bertos.git

diff --git a/drv/timer_avr.h b/drv/timer_avr.h
index b536c953..85219236 100755
--- a/drv/timer_avr.h
+++ b/drv/timer_avr.h
@@ -1,7 +1,7 @@
 /*!
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@develer.com>
  * This file is part of DevLib - See devlib/README for information.
  * -->
@@ -15,38 +15,28 @@
 
 /*
  * $Log$
- * Revision 1.9  2004/07/22 02:01:14  bernie
- * Use TIMER_PRESCALER consistently.
- *
- * Revision 1.8  2004/07/20 23:50:20  bernie
- * Also define TIMER_PRESCALER.
- *
- * Revision 1.7  2004/07/20 23:49:40  bernie
- * Compute value of OCR_DIVISOR from CLOCK_FREQ.
+ * Revision 1.14  2004/08/24 16:27:01  bernie
+ * Add missing headers.
  *
- * Revision 1.6  2004/07/20 23:48:16  bernie
- * Finally remove redundant protos.
+ * Revision 1.13  2004/08/24 14:30:11  bernie
+ * Use new-style config macros for drv/timer.c
  *
- * Revision 1.5  2004/07/18 22:16:35  bernie
- * Add missing header; Prevent warning for project_ks-specific code.
+ * Revision 1.12  2004/08/10 06:59:45  bernie
+ * CONFIG_TIMER_STROBE: Define no-op default macros.
  *
- * Revision 1.4  2004/06/27 15:22:15  aleph
+ * Revision 1.11  2004/08/03 15:53:17  aleph
  * Fix spacing
  *
- * Revision 1.3  2004/06/07 15:57:40  aleph
- * Update to latest AVR timer code
- *
- * Revision 1.2  2004/06/03 11:27:09  bernie
- * Add dual-license information.
- *
- * Revision 1.1  2004/05/23 18:23:30  bernie
- * Import drv/timer module.
+ * Revision 1.10  2004/08/02 20:20:29  aleph
+ * Merge from project_ks
  *
+ * Revision 1.9  2004/07/22 02:01:14  bernie
+ * Use TIMER_PRESCALER consistently.
  */
-
 #ifndef DRV_TIMER_AVR_H
 #define DRV_TIMER_AVR_H
 
+#include <arch_config.h> // ARCH_BOARD_KC
 #include <avr/wdt.h>
 #include <avr/signal.h>
 
@@ -55,6 +45,34 @@
 #endif
 
 
+/*!
+ * 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
+
+
+/*!
+ * \def CONFIG_TIMER_STROBE
+ *
+ * This is a debug facility that can be used to
+ * monitor timer interrupt activity on an external pin.
+ *
+ * To use strobes, redefine the macros TIMER_STROBE_ON,
+ * TIMER_STROBE_OFF and TIMER_STROBE_INIT and set
+ * CONFIG_TIMER_STROBE to 1.
+ */
+#ifndef CONFIG_TIMER_STROBE
+	#define TIMER_STROBE_ON    do {/*nop*/} while(0)
+	#define TIMER_STROBE_OFF   do {/*nop*/} while(0)
+	#define TIMER_STROBE_INIT  do {/*nop*/} while(0)
+#endif
+
+
 /* Not needed, IRQ timer flag cleared automatically */
 #define timer_hw_irq() do {} while (0)
 
@@ -67,7 +85,7 @@
 #define OCR_DIVISOR  (CLOCK_FREQ / TIMER_PRESCALER / TICKS_PER_SEC - 1) /* 191 */
 
 /*! HW dependent timer initialization  */
-#if defined(CONFIG_TIMER_ON_TIMER0)
+#if (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE0)
 
 	//! Type of time expressed in ticks of the hardware high-precision timer
 	typedef uint8_t hptime_t;
@@ -107,7 +125,7 @@
 		return TCNT0;
 	}
 
-#elif defined(CONFIG_TIMER_ON_TIMER1_OVERFLOW)
+#elif (CONFIG_TIMER == TIMER_ON_OVERFLOW1)
 
 	//! Type of time expressed in ticks of the hardware high precision timer
 	typedef uint16_t hptime_t;
@@ -143,7 +161,7 @@
 		return TCNT1;
 	}
 
-#elif defined(CONFIG_TIMER_ON_TIMER2)
+#elif (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE2)
 
 	//! Type of time expressed in ticks of the hardware high precision timer
 	typedef uint8_t hptime_t;
@@ -157,8 +175,13 @@
 		TIFR = BV(OCF2) | BV(TOV2);
 
 		/* Setup Timer/Counter interrupt */
-#warning Aleph, please use TIMER_PRESCALER here
-		TCCR2 = BV(WGM21) | BV(CS21) | BV(CS20);
+		TCCR2 = BV(WGM21)
+			#if TIMER_PRESCALER == 64
+				| BV(CS21) | BV(CS20)
+			#else
+				#error Unsupported value of TIMER_PRESCALER
+			#endif
+		;
 		/* 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 */
@@ -180,11 +203,11 @@
 	}
 
 #else
-	#error Choose witch timer to use with CONFIG_TIMER_ON_TIMERx
-#endif /* CONFIG_TIMER_ON_TIMERx */
+	#error Unimplemented value for CONFIG_TIMER
+#endif /* CONFIG_TIMER */
 
 
-#if defined(CONFIG_TIMER_ON_TIMER1_OVERFLOW)
+#if (CONFIG_TIMER == TIMER_ON_OVERFLOW1)
 
 	#define DEFINE_TIMER_ISR	\
 		static void timer_handler(void)
@@ -239,18 +262,18 @@
 	#endif
 	}
 
-#elif defined (CONFIG_TIMER_ON_TIMER0)
+#elif (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE0)
 
 	#define DEFINE_TIMER_ISR	\
 		SIGNAL(SIG_OUTPUT_COMPARE0)
 
-#elif defined(CONFIG_TIMER_ON_TIMER2)
+#elif (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE2)
 
 	#define DEFINE_TIMER_ISR	\
 		SIGNAL(SIG_OUTPUT_COMPARE2)
 
 #else
-	#error Choose witch timer to use with CONFIG_TIMER_ON_TIMERx
-#endif /* CONFIG_TIMER_ON_TIMERx */
+	#error Unimplemented value for CONFIG_TIMER
+#endif /* CONFIG_TIMER */
 
 #endif /* DRV_TIMER_AVR_H */