diff --git a/boards/iotlab-m3/include/at86rf2xx_params.h b/boards/iotlab-m3/include/at86rf2xx_params.h deleted file mode 100644 index 55f272773..000000000 --- a/boards/iotlab-m3/include/at86rf2xx_params.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2015 Kaspar Schleiser - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup board_iotlab-m3 - * @{ - * - * @file - * @brief at86rf231 board specific configuration - * - * @author Kaspar Schleiser - */ - -#ifndef AT86RF2XX_PARAMS_H_ -#define AT86RF2XX_PARAMS_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @name AT86RF231 configuration - */ -static const at86rf2xx_params_t at86rf2xx_params[] = - { - { - .spi = AT86RF231_SPI, - .spi_speed = AT86RF231_SPI_CLK, - .cs_pin = AT86RF231_CS, - .int_pin = AT86RF231_INT, - .sleep_pin = AT86RF231_SLEEP, - .reset_pin = AT86RF231_RESET, - }, - }; -/** @} */ - -#ifdef __cplusplus -} -#endif -#endif /* AT86RF2XX_PARAMS_H_ */ -/** @} */ diff --git a/boards/iotlab-m3/include/board.h b/boards/iotlab-m3/include/board.h index 36aeed2b7..2e2ddf217 100644 --- a/boards/iotlab-m3/include/board.h +++ b/boards/iotlab-m3/include/board.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Freie Universität Berlin + * Copyright (C) 2014-2015 Freie Universität Berlin * * This file is subject to the terms and conditions of the GNU Lesser General * Public License v2.1. See the file LICENSE in the top level directory for more @@ -54,15 +54,15 @@ extern "C" { /** * @name Define the interface to the AT86RF231 radio - * @{ + * + * {spi bus, spi speed, cs pin, int pin, reset pin, sleep pin} */ -#define AT86RF231_SPI SPI_0 -#define AT86RF231_CS GPIO_PIN(PORT_A,4) -#define AT86RF231_INT GPIO_PIN(PORT_C,4) -#define AT86RF231_RESET GPIO_PIN(PORT_C,1) -#define AT86RF231_SLEEP GPIO_PIN(PORT_A,2) -#define AT86RF231_SPI_CLK SPI_SPEED_5MHZ -/** @} */ +#define AT86RF2XX_PARAMS_BOARD {.spi = SPI_0, \ + .spi_speed = SPI_SPEED_5MHZ, \ + .cs_pin = GPIO_PIN(PORT_A, 4), \ + .int_pin = GPIO_PIN(PORT_C, 4), \ + .sleep_pin = GPIO_PIN(PORT_A, 2), \ + .reset_pin = GPIO_PIN(PORT_C, 1)} /** * @name Define the interface for the connected flash memory