From 6e51bb741f53ec6fcf80d2d99a8694699d0577bb Mon Sep 17 00:00:00 2001
From: test <cnkgndgn@gmail.com>
Date: Mon, 23 Nov 2015 15:37:56 +0100
Subject: [PATCH] boards: samr21-xpro: uart config cleanup
---
boards/samr21-xpro/include/board.h | 2 +-
boards/samr21-xpro/include/periph_conf.h | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h
index c4c3d56771..7aa529cd52 100644
--- a/boards/samr21-xpro/include/board.h
+++ b/boards/samr21-xpro/include/board.h
@@ -45,7 +45,7 @@ extern "C" {
* @name Define UART device and baudrate for stdio
* @{
*/
-#define STDIO UART_0
+#define STDIO UART_DEV(0)
#define STDIO_BAUDRATE (115200U)
#define STDIO_RX_BUFSIZE (64U)
/** @} */
diff --git a/boards/samr21-xpro/include/periph_conf.h b/boards/samr21-xpro/include/periph_conf.h
index da3d2b3095..a705b79399 100644
--- a/boards/samr21-xpro/include/periph_conf.h
+++ b/boards/samr21-xpro/include/periph_conf.h
@@ -103,12 +103,6 @@ extern "C" {
* @name UART configuration
* @{
*/
-/* deprecated UART enable defines (to be removed) */
-#define UART_NUMOF (2U)
-#define UART_0_EN 1
-#define UART_1_EN 1
-
-/* UART device configuration */
static const uart_conf_t uart_config[] = {
/* device, RX pin, TX pin, mux */
{&SERCOM0->USART, GPIO_PIN(PA,5), GPIO_PIN(PA,4), GPIO_MUX_D},
@@ -118,6 +112,8 @@ static const uart_conf_t uart_config[] = {
/* interrupt function name mapping */
#define UART_0_ISR isr_sercom0
#define UART_1_ISR isr_sercom5
+
+#define UART_NUMOF (sizeof(uart_config) / sizeof(uart_config[0]))
/** @} */
/**
--
GitLab