From 3746305f12742399ec93a5096b28df9df2e33634 Mon Sep 17 00:00:00 2001 From: Dimitry Kloper Date: Tue, 29 Dec 2015 19:08:13 +0200 Subject: [PATCH] AVR: Minor adapt to a differnt TIMER IRQ notions for Atmega2560 --- arch/avr/src/atmega/atmega_timerisr.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/avr/src/atmega/atmega_timerisr.c b/arch/avr/src/atmega/atmega_timerisr.c index 04726ea9aa..6eadb667de 100644 --- a/arch/avr/src/atmega/atmega_timerisr.c +++ b/arch/avr/src/atmega/atmega_timerisr.c @@ -172,11 +172,17 @@ void up_timer_initialize(void) /* Attach the timer interrupt vector */ +#if defined(ATMEGA_IRQ_T1COMPA) (void)irq_attach(ATMEGA_IRQ_T1COMPA, (xcpt_t)up_timerisr); - +#elif defined(ATMEGA_IRQ_TIM1_COMPA) + (void)irq_attach(ATMEGA_IRQ_TIM1_COMPA, (xcpt_t)up_timerisr); +#else +# error "Unable to find IRQ for timer" +#endif + /* Enable the interrupt on compare match A */ -#ifdef CONFIG_ARCH_CHIP_ATMEGA1284P +#if defined(TIMSK1) TIMSK1 |= (1 << OCIE1A); #else TIMSK |= (1 << OCIE1A);