From ea179fb8d395943f33830f174e995cfe6f90303f Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Wed, 17 Feb 2016 16:46:42 +0100 Subject: [PATCH] boards/yunjia-nrf: adapted timer configuration --- boards/yunjia-nrf51822/include/periph_conf.h | 33 +++++--------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/boards/yunjia-nrf51822/include/periph_conf.h b/boards/yunjia-nrf51822/include/periph_conf.h index 46150300ab..ba5043c49d 100644 --- a/boards/yunjia-nrf51822/include/periph_conf.h +++ b/boards/yunjia-nrf51822/include/periph_conf.h @@ -19,6 +19,8 @@ #ifndef PERIPH_CONF_H_ #define PERIPH_CONF_H_ +#include "periph_cpu.h" + #ifdef __cplusplus extern "C" { #endif @@ -40,35 +42,14 @@ extern "C" { * @name Timer configuration * @{ */ -#define TIMER_NUMOF (1U) -#define TIMER_0_EN 1 -#define TIMER_1_EN 0 -#define TIMER_2_EN 0 -#define TIMER_IRQ_PRIO 1 +static const timer_conf_t timer_config[] = { + /* dev, channels, width */ + { NRF_TIMER0, 3, TIMER_BITMODE_BITMODE_24Bit, TIMER0_IRQn } +}; -/* Timer 0 configuration */ -#define TIMER_0_DEV NRF_TIMER0 -#define TIMER_0_CHANNELS 3 -#define TIMER_0_MAX_VALUE (0xffffff) -#define TIMER_0_BITMODE TIMER_BITMODE_BITMODE_24Bit /* only possible value for TIMER0 */ #define TIMER_0_ISR isr_timer0 -#define TIMER_0_IRQ TIMER0_IRQn -/* Timer 1 configuration */ -#define TIMER_1_DEV NRF_TIMER1 -#define TIMER_1_CHANNELS 3 -#define TIMER_1_MAX_VALUE (0xffff) -#define TIMER_1_BITMODE TIMER_BITMODE_BITMODE_16Bit -#define TIMER_1_ISR isr_timer1 -#define TIMER_1_IRQ TIMER1_IRQn - -/* Timer 2 configuration */ -#define TIMER_2_DEV NRF_TIMER2 -#define TIMER_2_CHANNELS 3 -#define TIMER_2_MAX_VALUE (0xffff) -#define TIMER_2_BITMODE TIMER_BITMODE_BITMODE_16Bit -#define TIMER_2_ISR isr_timer2 -#define TIMER_2_IRQ TIMER2_IRQn +#define TIMER_NUMOF (sizeof(timer_config) / sizeof(timer_config[0])) /** @} */ /**