From 3120ff33684027845231d95207cdacec98409578 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Wed, 27 May 2015 13:18:53 +0200 Subject: [PATCH 1/2] board/samr21-xpro: fixed LED initialization --- boards/samr21-xpro/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards/samr21-xpro/board.c b/boards/samr21-xpro/board.c index 26ba0411d7..148807adac 100644 --- a/boards/samr21-xpro/board.c +++ b/boards/samr21-xpro/board.c @@ -48,7 +48,7 @@ void board_init(void) */ void led_init(void) { - LED_PORT.DIRSET.reg = 1 << LED_PIN; - LED_PORT.OUTSET.reg = LED_PIN; + LED_PORT.DIRSET.reg = (1 << LED_PIN); + LED_PORT.OUTSET.reg = (1 << LED_PIN); LED_PORT.PINCFG[LED_PIN].bit.PULLEN = false; } From d1050a274fde06d31db21d740b0a3aca53309a46 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Wed, 27 May 2015 13:20:31 +0200 Subject: [PATCH 2/2] board/samr21-xpro: style fixes and simplified code - fixed line length issue in doxygen headers - compressed LED init code in board.c - fixed whitespace issues in board.h --- boards/samr21-xpro/board.c | 26 ++++---------------------- boards/samr21-xpro/include/board.h | 9 +++++---- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/boards/samr21-xpro/board.c b/boards/samr21-xpro/board.c index 148807adac..1be170768d 100644 --- a/boards/samr21-xpro/board.c +++ b/boards/samr21-xpro/board.c @@ -11,9 +11,11 @@ * @{ * * @file - * @brief Board specific implementations for the Atem SAM R21 Xplained Pro board + * @brief Board specific implementations for the Atmel SAM R21 Xplained + * Pro board * * @author Thomas Eichinger + * @author Hauke Petersen * * @} */ @@ -23,31 +25,11 @@ #include "board.h" #include "cpu.h" - -void led_init(void); - - void board_init(void) { /* initialize the CPU */ cpu_init(); - - /* initialize the boards LEDs */ - led_init(); -} - - -/** - * @brief Initialize the boards on-board LED - * - * The LED initialization is hard-coded in this function. As the LED is soldered - * onto the board it is fixed to its CPU pins. - * - * The LED is connected to the following pin: - * - LED: PA19 - */ -void led_init(void) -{ + /* initialize the boards LED at pin PA19 */ LED_PORT.DIRSET.reg = (1 << LED_PIN); LED_PORT.OUTSET.reg = (1 << LED_PIN); LED_PORT.PINCFG[LED_PIN].bit.PULLEN = false; diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h index 7143c6452a..f90eddb237 100644 --- a/boards/samr21-xpro/include/board.h +++ b/boards/samr21-xpro/include/board.h @@ -13,7 +13,8 @@ * @{ * * @file - * @brief Board specific definitions for the Atmel SAM R21 Xplained Pro board. + * @brief Board specific definitions for the Atmel SAM R21 Xplained Pro + * board * * @author Thomas Eichinger */ @@ -83,9 +84,9 @@ extern "C" { * @name Macros for controlling the on-board LEDs. * @{ */ -#define LED_ON (LED_PORT.OUTCLR.reg = 1<