Merge pull request #8692 from aabadie/pr/drivers/params/soft_spi

drivers/soft_spi: use new driver params scheme
RIOT-OS · Mar 7, 2018 · dc989cb · dc989cb
2 parents 0da273d + 452920f
commit dc989cb
Showing 1 changed file with 6 additions and 10 deletions.
diff --git 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