From c70a14ff89e3fce339a1589e6aea04703f31757e Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 8 Jan 2020 14:40:20 +0100 Subject: [PATCH] boards/remote*,firefly: use common config headers --- boards/firefly/include/periph_conf.h | 47 ++-------------- boards/remote-pa/include/periph_conf.h | 5 +- boards/remote-reva/include/periph_conf.h | 68 +++--------------------- boards/remote-revb/include/periph_conf.h | 67 +++-------------------- 4 files changed, 23 insertions(+), 164 deletions(-) diff --git a/boards/firefly/include/periph_conf.h b/boards/firefly/include/periph_conf.h index 9e46ca6aec..56e984d7c2 100644 --- a/boards/firefly/include/periph_conf.h +++ b/boards/firefly/include/periph_conf.h @@ -19,36 +19,16 @@ #ifndef PERIPH_CONF_H #define PERIPH_CONF_H -#include "periph_common.h" +#include "cfg_adc_default.h" +#include "cfg_clk_default.h" +#include "cfg_i2c_default.h" +#include "cfg_timer_default.h" +#include "cfg_uart_default.h" #ifdef __cplusplus extern "C" { #endif -/** - * @name I2C configuration - * @{ - */ -#define I2C_NUMOF 1 -#define I2C_0_EN 1 -#define I2C_IRQ_PRIO 1 - -/* I2C 0 device configuration */ -#define I2C_0_DEV 0 -#define I2C_0_IRQ I2C_IRQn -#define I2C_0_IRQ_HANDLER isr_i2c -#define I2C_0_SCL_PIN GPIO_PIN(PORT_C, 3) -#define I2C_0_SDA_PIN GPIO_PIN(PORT_C, 2) - -static const i2c_conf_t i2c_config[I2C_NUMOF] = { - { - .speed = I2C_SPEED_FAST, /**< bus speed */ - .scl_pin = I2C_0_SCL_PIN, - .sda_pin = I2C_0_SDA_PIN, - }, -}; -/** @} */ - /** * @name SPI configuration * @{ @@ -73,23 +53,6 @@ static const spi_conf_t spi_config[] = { #define SPI_NUMOF ARRAY_SIZE(spi_config) /** @} */ -/** - * @name ADC configuration - * @{ - */ -#define SOC_ADC_ADCCON3_EREF SOC_ADC_ADCCON3_EREF_AVDD5 - -static const adc_conf_t adc_config[] = { - GPIO_PIN(PORT_A, 5), /**< GPIO_PA5 = ADC1_PIN */ - GPIO_PIN(PORT_A, 4), /**< GPIO_PA4 = ADC2_PIN */ - /* voltage divider with 5/3 relationship to allow 5V sensors */ - GPIO_PIN(PORT_A, 2), /**< GPIO_PA2 = ADC3_PIN */ -}; - -#define ADC_NUMOF ARRAY_SIZE(adc_config) -/** @} */ - - #ifdef __cplusplus } /* end extern "C" */ #endif diff --git a/boards/remote-pa/include/periph_conf.h b/boards/remote-pa/include/periph_conf.h index 26178c2400..8fd0e54014 100644 --- a/boards/remote-pa/include/periph_conf.h +++ b/boards/remote-pa/include/periph_conf.h @@ -22,7 +22,10 @@ #ifndef PERIPH_CONF_H #define PERIPH_CONF_H -#include "periph_common.h" +#include "periph_cpu.h" +#include "cfg_clk_default.h" +#include "cfg_timer_default.h" +#include "cfg_uart_default.h" #ifdef __cplusplus extern "C" { diff --git a/boards/remote-reva/include/periph_conf.h b/boards/remote-reva/include/periph_conf.h index 29e322be11..b409b3b3f7 100644 --- a/boards/remote-reva/include/periph_conf.h +++ b/boards/remote-reva/include/periph_conf.h @@ -22,71 +22,17 @@ #ifndef PERIPH_CONF_H #define PERIPH_CONF_H -#include "periph_common.h" +#include "cfg_adc_default.h" +#include "cfg_clk_default.h" +#include "cfg_i2c_default.h" +#include "cfg_spi_default.h" +#include "cfg_timer_default.h" +#include "cfg_uart_default.h" #ifdef __cplusplus - extern "C" { +extern "C" { #endif -/** - * @name I2C configuration - * @{ - */ -#define I2C_IRQ_PRIO 1 - -static const i2c_conf_t i2c_config[] = { - { - .speed = I2C_SPEED_FAST, /**< bus speed */ - .scl_pin = GPIO_PIN(2, 3), /**< GPIO_PC3 */ - .sda_pin = GPIO_PIN(2, 2) /**< GPIO_PC2 */ - }, -}; - -#define I2C_NUMOF ARRAY_SIZE(i2c_config) -/** @} */ - -/** - * @name SPI configuration - * @{ - */ -static const spi_conf_t spi_config[] = { - { - .num = 0, - .mosi_pin = GPIO_PIN(1, 1), - .miso_pin = GPIO_PIN(1, 3), - .sck_pin = GPIO_PIN(1, 2), - .cs_pin = GPIO_PIN(1, 5) - }, - { - .num = 1, - .mosi_pin = GPIO_PIN(2, 5), - .miso_pin = GPIO_PIN(2, 6), - .sck_pin = GPIO_PIN(2, 4), - .cs_pin = GPIO_PIN(0, 7) - } -}; - -#define SPI_NUMOF ARRAY_SIZE(spi_config) -/** @} */ - -/** - * @name ADC configuration - * @{ - */ -#define SOC_ADC_ADCCON3_EREF SOC_ADC_ADCCON3_EREF_AVDD5 - -static const adc_conf_t adc_config[] = { - GPIO_PIN(0, 5), /**< GPIO_PA5 = ADC1_PIN */ - GPIO_PIN(0, 4), /**< GPIO_PA4 = ADC2_PIN */ - /* voltage divider with 5/3 relationship to allow 5V sensors */ - GPIO_PIN(0, 2), /**< GPIO_PA2 = ADC3_PIN */ -}; - -#define ADC_NUMOF ARRAY_SIZE(adc_config) -/** @} */ - - - #ifdef __cplusplus } /* end extern "C" */ #endif diff --git a/boards/remote-revb/include/periph_conf.h b/boards/remote-revb/include/periph_conf.h index 340d1f8abe..64ae9c7bc5 100644 --- a/boards/remote-revb/include/periph_conf.h +++ b/boards/remote-revb/include/periph_conf.h @@ -23,70 +23,17 @@ #ifndef PERIPH_CONF_H #define PERIPH_CONF_H -#include "cc2538_gpio.h" -#include "periph_cpu.h" -#include "periph_common.h" +#include "cfg_adc_default.h" +#include "cfg_clk_default.h" +#include "cfg_i2c_default.h" +#include "cfg_spi_default.h" +#include "cfg_timer_default.h" +#include "cfg_uart_default.h" #ifdef __cplusplus - extern "C" { +extern "C" { #endif -/** - * @name I2C configuration - * @{ - */ -#define I2C_IRQ_PRIO 1 - -static const i2c_conf_t i2c_config[] = { - { - .speed = I2C_SPEED_FAST, /**< bus speed */ - .scl_pin = GPIO_PIN(2, 3), /**< GPIO_PC3 */ - .sda_pin = GPIO_PIN(2, 2) /**< GPIO_PC2 */ - }, -}; - -#define I2C_NUMOF ARRAY_SIZE(i2c_config) -/** @} */ - -/** - * @name SPI configuration - * @{ - */ -static const spi_conf_t spi_config[] = { - { - .num = 0, - .mosi_pin = GPIO_PIN(1, 1), - .miso_pin = GPIO_PIN(1, 3), - .sck_pin = GPIO_PIN(1, 2), - .cs_pin = GPIO_PIN(1, 5) - }, - { - .num = 1, - .mosi_pin = GPIO_PIN(2, 5), - .miso_pin = GPIO_PIN(2, 6), - .sck_pin = GPIO_PIN(2, 4), - .cs_pin = GPIO_PIN(0, 7) - } -}; -#define SPI_NUMOF ARRAY_SIZE(spi_config) -/** @} */ - -/** - * @name ADC configuration - * @{ - */ -#define SOC_ADC_ADCCON3_EREF SOC_ADC_ADCCON3_EREF_AVDD5 - -static const adc_conf_t adc_config[] = { - GPIO_PIN(0, 5), /**< GPIO_PA5 = ADC1_PIN */ - GPIO_PIN(0, 4), /**< GPIO_PA4 = ADC2_PIN */ - /* voltage divider with 5/3 relationship to allow 5V sensors */ - GPIO_PIN(0, 2), /**< GPIO_PA2 = ADC3_PIN */ -}; - -#define ADC_NUMOF ARRAY_SIZE(adc_config) -/** @} */ - #ifdef __cplusplus } /* end extern "C" */ #endif