X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer_avr.h;h=2cfb016aeb11c9bd2dc0d6efd9e05aba1804f604;hb=8d805e5800ebfc5c3f04ae18434e857f5e51f1c4;hp=15bf8730f476ce61dc7b11eb45bd1c94c5635fe7;hpb=d0c3b9f14ce6bcf214e6957b888183a30baae13d;p=bertos.git diff --git a/drv/timer_avr.h b/drv/timer_avr.h index 15bf8730..2cfb016a 100755 --- a/drv/timer_avr.h +++ b/drv/timer_avr.h @@ -1,7 +1,7 @@ /*! * \file * @@ -13,34 +13,36 @@ * \brief Low-level timer module for AVR */ -/* - * $Log$ - * Revision 1.7 2004/07/20 23:49:40 bernie - * Compute value of OCR_DIVISOR from CLOCK_FREQ. - * - * Revision 1.6 2004/07/20 23:48:16 bernie - * Finally remove redundant protos. - * - * Revision 1.5 2004/07/18 22:16:35 bernie - * Add missing header; Prevent warning for project_ks-specific code. - * - * Revision 1.4 2004/06/27 15:22:15 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. - * - */ - +/*#* + *#* $Log$ + *#* Revision 1.16 2004/09/06 21:49:26 bernie + *#* CONFIG_TIMER_STROBE: be tolerant with missing optional macro. + *#* + *#* Revision 1.15 2004/08/25 14:12:08 rasky + *#* Aggiornato il comment block dei log RCS + *#* + *#* Revision 1.14 2004/08/24 16:27:01 bernie + *#* Add missing headers. + *#* + *#* Revision 1.13 2004/08/24 14:30:11 bernie + *#* Use new-style config macros for drv/timer.c + *#* + *#* Revision 1.12 2004/08/10 06:59:45 bernie + *#* CONFIG_TIMER_STROBE: Define no-op default macros. + *#* + *#* Revision 1.11 2004/08/03 15:53:17 aleph + *#* Fix spacing + *#* + *#* 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_BOARD_KC #include #include @@ -49,7 +51,38 @@ #endif -#define timer_hw_irq() /* Not needed, IRQ timer flag cleared automatically */ +/*! + * 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. + */ +#if !defined(CONFIG_TIMER_STROBE) || !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) + +#define TIMER_PRESCALER 64 /*! * System timer: additional division after the prescaler @@ -58,7 +91,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; @@ -72,10 +105,15 @@ TIFR = BV(OCF0) | BV(TOV0); /* Setup Timer/Counter interrupt */ - ASSR = 0x00; /* internal system clock */ - TCCR0 = BV(WGM01) | BV(CS02); /* Clear on Compare match & prescaler = 64. When changing - prescaler change TIMER_HW_HPTICKS_PER_SEC too */ - TCNT0 = 0x00; /* initialization of Timer/Counter */ + ASSR = 0x00; /* Internal system clock */ + TCCR0 = BV(WGM01) /* Clear on Compare match */ + #if TIMER_PRESCALER == 64 + | BV(CS02) + #else + #error Unsupported value of TIMER_PRESCALER + #endif + ; + TCNT0 = 0x00; /* Initialization of Timer/Counter */ OCR0 = OCR_DIVISOR; /* Timer/Counter Output Compare Register */ /* Enable timer interrupts: Timer/Counter2 Output Compare (OCIE2) */ @@ -86,14 +124,14 @@ } //! Frequency of the hardware high precision timer - #define TIMER_HW_HPTICKS_PER_SEC (CLOCK_FREQ / 64) + #define TIMER_HW_HPTICKS_PER_SEC (CLOCK_FREQ / TIMER_PRESCALER) INLINE hptime_t timer_hw_hpread(void) { 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; @@ -129,7 +167,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; @@ -143,7 +181,13 @@ TIFR = BV(OCF2) | BV(TOV2); /* Setup Timer/Counter interrupt */ - 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 */ @@ -157,7 +201,7 @@ } //! Frequency of the hardware high precision timer - #define TIMER_HW_HPTICKS_PER_SEC (CLOCK_FREQ / 64) + #define TIMER_HW_HPTICKS_PER_SEC (CLOCK_FREQ / TIMER_PRESCALER) INLINE hptime_t timer_hw_hpread(void) { @@ -165,11 +209,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) @@ -224,18 +268,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 */