From ed4cb561bb340f0b8fc653c3a9a63765c86648bb Mon Sep 17 00:00:00 2001 From: Hauke Petersen <hauke.petersen@fu-berlin.de> Date: Fri, 20 Jan 2017 09:38:20 +0100 Subject: [PATCH] boards/remote: fixed includes --- boards/remote-common/include/periph_common.h | 1 - boards/remote-pa/include/board.h | 7 +++++-- boards/remote-pa/include/periph_conf.h | 2 -- boards/remote-reva/include/board.h | 8 +++++--- boards/remote-reva/include/periph_conf.h | 2 -- boards/remote-revb/include/board.h | 8 +++++--- cpu/cc2538/include/cpu_conf.h | 1 + cpu/cc2538/include/periph_cpu.h | 6 +++--- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/boards/remote-common/include/periph_common.h b/boards/remote-common/include/periph_common.h index 5a018d2519..51404de412 100644 --- a/boards/remote-common/include/periph_common.h +++ b/boards/remote-common/include/periph_common.h @@ -21,7 +21,6 @@ #ifndef PERIPH_COMMON_H #define PERIPH_COMMON_H -#include "cc2538_gpio.h" #include "periph_cpu.h" #ifdef __cplusplus diff --git a/boards/remote-pa/include/board.h b/boards/remote-pa/include/board.h index 59ff1d90d1..407957515b 100644 --- a/boards/remote-pa/include/board.h +++ b/boards/remote-pa/include/board.h @@ -24,8 +24,6 @@ #define BOARD_H #include "cpu.h" -#include "periph/gpio.h" -#include "board_common.h" #ifdef __cplusplus extern "C" { @@ -74,6 +72,11 @@ #define RF_SWITCH_TOGGLE (RF_SWITCH_PORT->DATA ^= (1 << RF_SWITCH_PIN)) /** @} */ +/** + * @brief Initialize board specific hardware, including clock, LEDs and std-IO + */ +void board_init(void); + #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 e9c07e58d3..d82249a62d 100644 --- a/boards/remote-pa/include/periph_conf.h +++ b/boards/remote-pa/include/periph_conf.h @@ -21,8 +21,6 @@ #ifndef PERIPH_CONF_H #define PERIPH_CONF_H -#include "cc2538_gpio.h" -#include "periph_cpu.h" #include "periph_common.h" #ifdef __cplusplus diff --git a/boards/remote-reva/include/board.h b/boards/remote-reva/include/board.h index b93dd9f8f5..637206258d 100644 --- a/boards/remote-reva/include/board.h +++ b/boards/remote-reva/include/board.h @@ -23,9 +23,6 @@ #define BOARD_H #include "cpu.h" -#include "periph/gpio.h" -#include "periph/spi.h" -#include "board_common.h" #ifdef __cplusplus extern "C" { @@ -111,6 +108,11 @@ #define CC1200_GPD2_GPIO GPIO_PB0 /** @} */ +/** + * @brief Initialize board specific hardware, including clock, LEDs and std-IO + */ +void board_init(void); + #ifdef __cplusplus } /* end extern "C" */ #endif diff --git a/boards/remote-reva/include/periph_conf.h b/boards/remote-reva/include/periph_conf.h index 287144df60..6ccb84f87f 100644 --- a/boards/remote-reva/include/periph_conf.h +++ b/boards/remote-reva/include/periph_conf.h @@ -21,8 +21,6 @@ #ifndef PERIPH_CONF_H #define PERIPH_CONF_H -#include "cc2538_gpio.h" -#include "periph_cpu.h" #include "periph_common.h" #ifdef __cplusplus diff --git a/boards/remote-revb/include/board.h b/boards/remote-revb/include/board.h index 9926c72903..6d1eb842a8 100644 --- a/boards/remote-revb/include/board.h +++ b/boards/remote-revb/include/board.h @@ -23,9 +23,6 @@ #define BOARD_H #include "cpu.h" -#include "periph/gpio.h" -#include "periph/spi.h" -#include "board_common.h" #ifdef __cplusplus extern "C" { @@ -123,6 +120,11 @@ #define SDCARD_SPI_PARAM_POWER_AH false /** @} */ +/** + * @brief Initialize board specific hardware, including clock, LEDs and std-IO + */ +void board_init(void); + #ifdef __cplusplus } /* end extern "C" */ #endif diff --git a/cpu/cc2538/include/cpu_conf.h b/cpu/cc2538/include/cpu_conf.h index 8c7695d46e..7376a90241 100644 --- a/cpu/cc2538/include/cpu_conf.h +++ b/cpu/cc2538/include/cpu_conf.h @@ -26,6 +26,7 @@ #include "cc2538_gptimer.h" #include "cc2538_ioc.h" #include "cc2538_soc_adc.h" +#include "cc2538_ssi.h" #include "cc2538_rfcore.h" #include "cc2538_sys_ctrl.h" diff --git a/cpu/cc2538/include/periph_cpu.h b/cpu/cc2538/include/periph_cpu.h index a38ca522e4..e57a73ac3e 100644 --- a/cpu/cc2538/include/periph_cpu.h +++ b/cpu/cc2538/include/periph_cpu.h @@ -21,9 +21,7 @@ #include <stdint.h> -#include "cc2538_gptimer.h" -#include "cc2538_ssi.h" -#include "cc2538_gpio.h" +#include "cpu.h" #ifdef __cplusplus extern "C" { @@ -50,6 +48,8 @@ typedef uint32_t gpio_t; */ #define GPIO_PIN(port, pin) (gpio_t)(((uint32_t)GPIO_A + (port << 12)) | pin) +#define GPIO_UNDEF 99 + /** * @brief I2C configuration options */ -- GitLab