From 452920f6e3d34db10bd96a6e3bd8f9f78ad9250f Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 28 Feb 2018 17:41:15 +0100 Subject: [PATCH] drivers/soft_spi: use new driver params scheme --- drivers/soft_spi/include/soft_spi_params.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/soft_spi/include/soft_spi_params.h b/drivers/soft_spi/include/soft_spi_params.h index d5f79691e0..fd3d7bb55e 100644 --- a/drivers/soft_spi/include/soft_spi_params.h +++ b/drivers/soft_spi/include/soft_spi_params.h @@ -35,21 +35,17 @@ extern "C" { #define SOFT_SPI_PARAM_CLK (GPIO_PIN(0, 1)) #endif -#define SOFT_SPI_PARAMS_DEFAULT {\ - .miso_pin = SOFT_SPI_PARAM_MISO,\ - .mosi_pin = SOFT_SPI_PARAM_MOSI,\ - .clk_pin = SOFT_SPI_PARAM_CLK,\ - } +#ifndef SOFT_SPI_PARAMS +#define SOFT_SPI_PARAMS { .miso_pin = SOFT_SPI_PARAM_MISO, \ + .mosi_pin = SOFT_SPI_PARAM_MOSI, \ + .clk_pin = SOFT_SPI_PARAM_CLK } +#endif /** * @brief Sotware SPI port descriptor array */ static soft_spi_conf_t soft_spi_config[] = { -#ifdef SOFT_SPI_PARAMS_CUSTOM - SOFT_SPI_PARAMS_CUSTOM, -#else - SOFT_SPI_PARAMS_DEFAULT, -#endif + SOFT_SPI_PARAMS, }; #ifdef __cplusplus