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

cpu/esp32: fixup after rebase

Browse Source
This commit is contained in:
Gunar Schorcht 2019-03-29 08:25:57 +01:00 committed by Schorcht
parent 008f1c5d55
commit 3cb08e9e99
1 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cpu/esp32/periph/uart.c
View File

@ -50,8 +50,7 @@
struct uart_hw_t { struct uart_hw_t {
uart_dev_t* regs; /* pointer to register data struct of the UART device */ uart_dev_t* regs; /* pointer to register data struct of the UART device */
uint8_t pin_txd; /* TxD pin */ uint8_t mod; /* peripheral hardware module of the UART interface */
uint8_t pin_rxd; /* RxD pin */
bool used; /* indicates whether UART is used */ bool used; /* indicates whether UART is used */
uint32_t baudrate; /* used baudrate */ uint32_t baudrate; /* used baudrate */
uart_data_bits_t data; /* used data bits */ uart_data_bits_t data; /* used data bits */
@ -67,55 +66,38 @@ struct uart_hw_t {
static struct uart_hw_t _uarts[] = { static struct uart_hw_t _uarts[] = {
{ {
.regs = &UART0, .regs = &UART0,
.pin_txd = GPIO1, .mod = PERIPH_UART0_MODULE,
.pin_rxd = GPIO3,
.used = false, .used = false,
.baudrate = STDIO_UART_BAUDRATE, .baudrate = STDIO_UART_BAUDRATE,
.data = UART_DATA_BITS_8, .data = UART_DATA_BITS_8,
.stop = UART_STOP_BITS_1, .stop = UART_STOP_BITS_1,
.parity = UART_PARITY_NONE, .parity = UART_PARITY_NONE,
.mod = PERIPH_UART0_MODULE,
.signal_txd = U0TXD_OUT_IDX, .signal_txd = U0TXD_OUT_IDX,
.signal_rxd = U0RXD_IN_IDX, .signal_rxd = U0RXD_IN_IDX,
.baudrate = STDIO_UART_BAUDRATE,
.used = false,
.int_src = ETS_UART0_INTR_SOURCE .int_src = ETS_UART0_INTR_SOURCE
}, },
#if defined(UART1_TXD) && defined(UART1_RXD)
{ .regs = &UART1,
.pin_txd = UART1_TXD,
.pin_rxd = UART1_RXD,
.used = false,
.baudrate = STDIO_UART_BAUDRATE,
.data = UART_DATA_BITS_8,
.stop = UART_STOP_BITS_1,
.parity = UART_PARITY_NONE,
{ {
.regs = &UART1, .regs = &UART1,
.mod = PERIPH_UART1_MODULE, .mod = PERIPH_UART1_MODULE,
.signal_txd = U1TXD_OUT_IDX,
.signal_rxd = U1RXD_IN_IDX,
.baudrate = STDIO_UART_BAUDRATE,
.used = false,
.int_src = ETS_UART1_INTR_SOURCE
},
#endif
#if defined(UART2_TXD) && defined(UART2_RXD)
{ .regs = &UART2,
.pin_txd = UART2_TXD,
.pin_rxd = UART2_RXD,
.used = false, .used = false,
.baudrate = STDIO_UART_BAUDRATE, .baudrate = STDIO_UART_BAUDRATE,
.data = UART_DATA_BITS_8, .data = UART_DATA_BITS_8,
.stop = UART_STOP_BITS_1, .stop = UART_STOP_BITS_1,
.parity = UART_PARITY_NONE, .parity = UART_PARITY_NONE,
.signal_txd = U1TXD_OUT_IDX,
.signal_rxd = U1RXD_IN_IDX,
.int_src = ETS_UART1_INTR_SOURCE
},
{ {
.regs = &UART2, .regs = &UART2,
.mod = PERIPH_UART2_MODULE, .mod = PERIPH_UART2_MODULE,
.used = false,
.baudrate = STDIO_UART_BAUDRATE,
.data = UART_DATA_BITS_8,
.stop = UART_STOP_BITS_1,
.parity = UART_PARITY_NONE,
.signal_txd = U2TXD_OUT_IDX, .signal_txd = U2TXD_OUT_IDX,
.signal_rxd = U2RXD_IN_IDX, .signal_rxd = U2RXD_IN_IDX,
.baudrate = STDIO_UART_BAUDRATE,
.used = false,
.int_src = ETS_UART2_INTR_SOURCE .int_src = ETS_UART2_INTR_SOURCE
} }
}; };