andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AVR] Fix timer usage for ATmega128 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@9262 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Fabio Utzig 2016-04-09 13:55:23 +00:00
parent 221f692610
commit 3c1fa2816f
2 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
os/hal/ports/AVR/st_lld.c
View File

@ -62,20 +62,45 @@
/* Find the most suitable prescaler setting for the desired OSAL_ST_FREQUENCY */ /* Find the most suitable prescaler setting for the desired OSAL_ST_FREQUENCY */
#if ((F_CPU / OSAL_ST_FREQUENCY) <= AVR_TIMER_COUNTER_MAX) #if ((F_CPU / OSAL_ST_FREQUENCY) <= AVR_TIMER_COUNTER_MAX)
#define AVR_TIMER_PRESCALER 1 #define AVR_TIMER_PRESCALER 1
#define AVR_TIMER_PRESCALER_BITS (0<<CS02)|(0<<CS01)|(1<<CS00); /* CLK */ #define AVR_TIMER_PRESCALER_BITS ((0<<CS02)|(0<<CS01)|(1<<CS00)) /* CLK */
#elif ((F_CPU / OSAL_ST_FREQUENCY / 8) <= AVR_TIMER_COUNTER_MAX) #elif ((F_CPU / OSAL_ST_FREQUENCY / 8) <= AVR_TIMER_COUNTER_MAX)
#define AVR_TIMER_PRESCALER 8 #define AVR_TIMER_PRESCALER 8
#define AVR_TIMER_PRESCALER_BITS (0<<CS02)|(1<<CS01)|(0<<CS00); /* CLK/8 */ #define AVR_TIMER_PRESCALER_BITS ((0<<CS02)|(1<<CS01)|(0<<CS00)) /* CLK/8 */
#elif ((F_CPU / OSAL_ST_FREQUENCY / 64) <= AVR_TIMER_COUNTER_MAX) #elif ((F_CPU / OSAL_ST_FREQUENCY / 64) <= AVR_TIMER_COUNTER_MAX)
#define AVR_TIMER_PRESCALER 64 #define AVR_TIMER_PRESCALER 64
#define AVR_TIMER_PRESCALER_BITS (0<<CS02)|(1<<CS01)|(1<<CS00); /* CLK/64 */
#ifdef __AVR_ATmega128__
#define AVR_TIMER_PRESCALER_BITS ((1<<CS02)|(0<<CS01)|(0<<CS00)) /* CLK/64 */
#else
#define AVR_TIMER_PRESCALER_BITS ((0<<CS02)|(1<<CS01)|(1<<CS00)) /* CLK/64 */
#endif
#elif ((F_CPU / OSAL_ST_FREQUENCY / 256) <= AVR_TIMER_COUNTER_MAX) #elif ((F_CPU / OSAL_ST_FREQUENCY / 256) <= AVR_TIMER_COUNTER_MAX)
#define AVR_TIMER_PRESCALER 256 #define AVR_TIMER_PRESCALER 256
#define AVR_TIMER_PRESCALER_BITS (1<<CS02)|(0<<CS01)|(0<<CS00); /* CLK/256 */
#ifdef __AVR_ATmega128__
#define AVR_TIMER_PRESCALER_BITS ((1<<CS02)|(1<<CS01)|(0<<CS00)) /* CLK/256 */
#else
#define AVR_TIMER_PRESCALER_BITS ((1<<CS02)|(0<<CS01)|(0<<CS00)) /* CLK/256 */
#endif
#elif ((F_CPU / OSAL_ST_FREQUENCY / 1024) <= AVR_TIMER_COUNTER_MAX) #elif ((F_CPU / OSAL_ST_FREQUENCY / 1024) <= AVR_TIMER_COUNTER_MAX)
#define AVR_TIMER_PRESCALER 1024 #define AVR_TIMER_PRESCALER 1024
#define AVR_TIMER_PRESCALER_BITS (1<<CS02)|(0<<CS01)|(1<<CS00); /* CLK/1024 */
#ifdef __AVR_ATmega128__
#define AVR_TIMER_PRESCALER_BITS (1<<CS02)|(1<<CS01)|(1<<CS00); /* CLK/1024 */
#else
#define AVR_TIMER_PRESCALER_BITS (1<<CS02)|(0<<CS01)|(1<<CS00); /* CLK/1024 */
#endif
#else #else
#error "Frequency too low for timer, please set OSAL_ST_FREQUENCY to a higher value" #error "Frequency too low for timer, please set OSAL_ST_FREQUENCY to a higher value"
#endif #endif
@ -165,16 +190,16 @@ void st_lld_init(void) {
*/ */
/* CTC mode, no clock source */ /* CTC mode, no clock source */
TCCR1A = 0; TCCR1A = 0;
TCCR1B = _BV(WGM12); TCCR1B = _BV(WGM12);
/* start disabled */ /* start disabled */
TCCR1C = 0; TCCR1C = 0;
OCR1A = 0; OCR1A = 0;
TCNT1 = 0; TCNT1 = 0;
TIFR1 = _BV(OCF1A); /* Reset pending. */ TIFR_REG = _BV(OCF1A); /* Reset pending. */
TIMSK1 = 0; TIMSK_REG = 0;
TCCR1B = PRESCALER; TCCR1B = PRESCALER;
#endif /* OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING */ #endif /* OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING */

16
os/hal/ports/AVR/st_lld.h
View File

@ -68,6 +68,14 @@ extern "C" {
} }
#endif #endif
#ifdef __AVR_ATmega128__
#define TIFR_REG TIFR
#define TIMSK_REG TIMSK
#else
#define TIFR_REG TIFR1
#define TIMSK_REG TIMSK1
#endif
/*===========================================================================*/ /*===========================================================================*/
/* Driver inline functions. */ /* Driver inline functions. */
/*===========================================================================*/ /*===========================================================================*/
@ -98,10 +106,10 @@ static inline void st_lld_start_alarm(systime_t time) {
OCR1A = (uint16_t) time; OCR1A = (uint16_t) time;
/* Reset pending. */ /* Reset pending. */
TIFR1 = _BV(OCF1A); TIFR_REG = _BV(OCF1A);
/* enable interrupt */ /* enable interrupt */
TIMSK1 = _BV(OCIE1A); TIMSK_REG = _BV(OCIE1A);
} }
/** /**
@ -111,7 +119,7 @@ static inline void st_lld_start_alarm(systime_t time) {
*/ */
static inline void st_lld_stop_alarm(void) { static inline void st_lld_stop_alarm(void) {
TIMSK1 = 0; TIMSK_REG = 0;
} }
/** /**
@ -149,7 +157,7 @@ static inline systime_t st_lld_get_alarm(void) {
*/ */
static inline bool st_lld_is_alarm_active(void) { static inline bool st_lld_is_alarm_active(void) {
return (bool) ((TIMSK1 & _BV(OCIE1A)) != 0); return (bool) ((TIMSK_REG & _BV(OCIE1A)) != 0);
} }
#endif /* _ST_LLD_H_ */ #endif /* _ST_LLD_H_ */