From 3b14a584b828e61a0e85c559384bad4d305b5e3f Mon Sep 17 00:00:00 2001
From: Bas Stottelaar <basstottelaar@gmail.com>
Date: Tue, 31 Jan 2017 19:38:41 +0100
Subject: [PATCH] boards: *: remove SPI_*_EN now rework is merged
---
boards/arduino-common/include/periph_conf.h | 1 -
boards/arduino-mega2560/include/periph_conf.h | 1 -
boards/avsextrem/include/periph_conf.h | 1 -
boards/msb-430/include/periph_conf.h | 1 -
boards/msb-430h/include/periph_conf.h | 1 -
boards/telosb/include/periph_conf.h | 1 -
boards/waspmote-pro/include/periph_conf.h | 3 +--
boards/wsn430-common/include/periph_conf.h | 1 -
boards/z1/include/periph_conf.h | 1 -
cpu/atmega_common/periph/spi.c | 2 +-
10 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/boards/arduino-common/include/periph_conf.h b/boards/arduino-common/include/periph_conf.h
index ea67ea05de..d19d20b914 100644
--- a/boards/arduino-common/include/periph_conf.h
+++ b/boards/arduino-common/include/periph_conf.h
@@ -79,7 +79,6 @@ extern "C" {
* @{
*/
#define SPI_NUMOF 1 /* set to 0 to disable SPI */
-#define SPI_0_EN 1 /* remove once SPI rework is done */
#define MEGA_PRR PRR /* Power Reduction Register is PRR */
/** @} */
diff --git a/boards/arduino-mega2560/include/periph_conf.h b/boards/arduino-mega2560/include/periph_conf.h
index cf3d898f02..45c1e89d3f 100644
--- a/boards/arduino-mega2560/include/periph_conf.h
+++ b/boards/arduino-mega2560/include/periph_conf.h
@@ -96,7 +96,6 @@ extern "C" {
* @{
*/
#define SPI_NUMOF 1 /* set to 0 to disable SPI */
-#define SPI_0_EN 1 /* remove once SPI rework is done */
#define MEGA_PRR PRR0 /* Power Reduction Register is PRR0 */
/** @} */
diff --git a/boards/avsextrem/include/periph_conf.h b/boards/avsextrem/include/periph_conf.h
index 9c107dde2a..15a7bccbb4 100644
--- a/boards/avsextrem/include/periph_conf.h
+++ b/boards/avsextrem/include/periph_conf.h
@@ -60,7 +60,6 @@ extern "C" {
* @{
*/
#define SPI_NUMOF (1U)
-#define SPI_0_EN (1)
/** @} */
#ifdef __cplusplus
diff --git a/boards/msb-430/include/periph_conf.h b/boards/msb-430/include/periph_conf.h
index 9a095761ee..1026d73e58 100644
--- a/boards/msb-430/include/periph_conf.h
+++ b/boards/msb-430/include/periph_conf.h
@@ -72,7 +72,6 @@ extern "C" {
* @{
*/
#define SPI_NUMOF (1U)
-#define SPI_0_EN (1U)
/* SPI configuration */
#define SPI_BASE (USART_0)
diff --git a/boards/msb-430h/include/periph_conf.h b/boards/msb-430h/include/periph_conf.h
index 90f900727d..69b52c709f 100644
--- a/boards/msb-430h/include/periph_conf.h
+++ b/boards/msb-430h/include/periph_conf.h
@@ -74,7 +74,6 @@ extern "C" {
* @{
*/
#define SPI_NUMOF (1U)
-#define SPI_0_EN (1U)
/* SPI configuration */
#define SPI_BASE (USART_0)
diff --git a/boards/telosb/include/periph_conf.h b/boards/telosb/include/periph_conf.h
index 9aed1ac207..39ecfcfe5f 100644
--- a/boards/telosb/include/periph_conf.h
+++ b/boards/telosb/include/periph_conf.h
@@ -72,7 +72,6 @@ extern "C" {
* @{
*/
#define SPI_NUMOF (1U)
-#define SPI_0_EN (1U)
/* SPI configuration */
#define SPI_BASE (USART_0)
diff --git a/boards/waspmote-pro/include/periph_conf.h b/boards/waspmote-pro/include/periph_conf.h
index a8b03d4afb..b7171a474c 100644
--- a/boards/waspmote-pro/include/periph_conf.h
+++ b/boards/waspmote-pro/include/periph_conf.h
@@ -103,8 +103,7 @@ extern "C" {
* @{
*/
#define SPI_NUMOF 1 /* set to 0 to disable SPI */
-#define SPI_0_EN 1 /* remove once SPI rework is done */
-#define MEGA_PRR PRR0 /* Power Reduction Resgister */
+#define MEGA_PRR PRR0 /* Power Reduction Register */
/** @} */
#ifdef __cplusplus
diff --git a/boards/wsn430-common/include/periph_conf.h b/boards/wsn430-common/include/periph_conf.h
index 0bcd94c1d1..2acd0553b7 100644
--- a/boards/wsn430-common/include/periph_conf.h
+++ b/boards/wsn430-common/include/periph_conf.h
@@ -72,7 +72,6 @@ extern "C" {
* @{
*/
#define SPI_NUMOF (1U)
-#define SPI_0_EN (1U)
/* SPI configuration */
#define SPI_BASE (USART_0)
diff --git a/boards/z1/include/periph_conf.h b/boards/z1/include/periph_conf.h
index e25c59e961..02bc391e3a 100644
--- a/boards/z1/include/periph_conf.h
+++ b/boards/z1/include/periph_conf.h
@@ -72,7 +72,6 @@ extern "C" {
* @{
*/
#define SPI_NUMOF (1U)
-#define SPI_0_EN (1U)
/* SPI configuration */
#define SPI_USE_USCI
diff --git a/cpu/atmega_common/periph/spi.c b/cpu/atmega_common/periph/spi.c
index 9464f68ac9..631d052c0b 100644
--- a/cpu/atmega_common/periph/spi.c
+++ b/cpu/atmega_common/periph/spi.c
@@ -41,7 +41,7 @@ void spi_init(spi_t bus)
/* power off the SPI peripheral */
MEGA_PRR |= (1 << PRSPI);
/* trigger the pin configuration */
- spi_init_pins(bus);;
+ spi_init_pins(bus);
}
void spi_init_pins(spi_t bus)
--
GitLab