RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #7549 from haukepetersen/fix_sam0_uartquick

Browse Source 
cpu/sam0_common: fixed UART for samd21
This commit is contained in:
Hauke Petersen 2017-08-31 12:06:19 +02:00 committed by GitHub
commit b3d497b577
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
cpu/sam0_common/periph/uart.c
View File

@ -8,7 +8,8 @@
*/ */
/** /**
* @ingroup driver_periph * @ingroup cpu_sam0_common
* @ingroup drivers_periph_uart
* @{ * @{
* *
* @file * @file
@ -30,6 +31,9 @@
#define ENABLE_DEBUG (0) #define ENABLE_DEBUG (0)
#include "debug.h" #include "debug.h"
/* do not build the file in case no UART is defined */
#ifdef UART_NUMOF
/** /**
* @brief Allocate memory to store the callback functions * @brief Allocate memory to store the callback functions
*/ */
@ -64,30 +68,9 @@ static uint8_t sercom_gclk_id[] =
#endif #endif
static int init_base(uart_t uart, uint32_t baudrate);
int uart_init(uart_t uart, uint32_t baudrate, uart_rx_cb_t rx_cb, void *arg) int uart_init(uart_t uart, uint32_t baudrate, uart_rx_cb_t rx_cb, void *arg)
{ {
/* initialize basic functionality */ if (uart >= UART_NUMOF) {
int res = init_base(uart, baudrate);
if (res != UART_OK) {
return res;
}
/* register callbacks */
uart_ctx[uart].rx_cb = rx_cb;
uart_ctx[uart].arg = arg;
/* configure interrupts and enable RX interrupt */
NVIC_EnableIRQ(SERCOM0_IRQn + sercom_id(_uart(uart)));
_uart(uart)->INTENSET.reg |= SERCOM_USART_INTENSET_RXC;
return UART_OK;
}
static int init_base(uart_t uart, uint32_t baudrate)
{
if ((unsigned int)uart >= UART_NUMOF) {
return UART_NODEV; return UART_NODEV;
} }
@ -151,6 +134,19 @@ static int init_base(uart_t uart, uint32_t baudrate)
while(_uart(uart)->SYNCBUSY.bit.CTRLB) {} while(_uart(uart)->SYNCBUSY.bit.CTRLB) {}
uart_poweron(uart); uart_poweron(uart);
#endif #endif
/* finally, enable the device */
_uart(uart)->CTRLA.reg |= SERCOM_USART_CTRLA_ENABLE;
/* register callbacks */
if (rx_cb) {
uart_ctx[uart].rx_cb = rx_cb;
uart_ctx[uart].arg = arg;
/* configure interrupts and enable RX interrupt */
NVIC_EnableIRQ(SERCOM0_IRQn + sercom_id(_uart(uart)));
_uart(uart)->INTENSET.reg |= SERCOM_USART_INTENSET_RXC;
}
return UART_OK; return UART_OK;
} }
@ -304,3 +300,5 @@ static uint64_t _long_division(uint64_t n, uint64_t d)
return q; return q;
} }
#endif #endif
#endif /* UART_NUMOF */