diff options
| author | Jan Sommer <jan.sommer@dlr.de> | 2021-02-22 16:39:59 +0100 |
|---|---|---|
| committer | Jan Sommer <jan.sommer@dlr.de> | 2021-03-09 09:28:43 +0100 |
| commit | 645dbc5fccd8b73e12ca17ab35962fe751854913 (patch) | |
| tree | ff46a8e0cc75a4e4e93426755700ded31289ace7 | |
| parent | zynq-uart: Fix set_attributes implementation (diff) | |
| download | rtems-645dbc5fccd8b73e12ca17ab35962fe751854913.tar.bz2 | |
bsps/shared: Allow setting baud rate for zynq uart
Closes #4236
| -rw-r--r-- | bsps/arm/shared/serial/zynq-uart.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/bsps/arm/shared/serial/zynq-uart.c b/bsps/arm/shared/serial/zynq-uart.c index a0dfc0c929..f298719fde 100644 --- a/bsps/arm/shared/serial/zynq-uart.c +++ b/bsps/arm/shared/serial/zynq-uart.c @@ -144,14 +144,22 @@ static bool zynq_uart_set_attributes( { zynq_uart_context *ctx = (zynq_uart_context *) context; volatile zynq_uart *regs = ctx->regs; + int32_t baud; uint32_t brgr = 0; uint32_t bauddiv = 0; uint32_t mode = 0; int rc; - rc = zynq_cal_baud_rate(115200, &brgr, &bauddiv, regs->mode); - if (rc != 0) - return rc; + /* + * Determine the baud rate + */ + baud = rtems_termios_baud_to_number(term->c_ospeed); + + if (baud > 0) { + rc = zynq_cal_baud_rate(baud, &brgr, &bauddiv, regs->mode); + if (rc != 0) + return rc; + } /* * Configure the mode register @@ -202,8 +210,11 @@ static bool zynq_uart_set_attributes( regs->control &= ~(ZYNQ_UART_CONTROL_RXEN | ZYNQ_UART_CONTROL_TXEN); regs->mode = mode; - regs->baud_rate_gen = ZYNQ_UART_BAUD_RATE_GEN_CD(brgr); - regs->baud_rate_div = ZYNQ_UART_BAUD_RATE_DIV_BDIV(bauddiv); + /* Ignore baud rate of B0. There are no modem control lines to de-assert */ + if (baud > 0) { + regs->baud_rate_gen = ZYNQ_UART_BAUD_RATE_GEN_CD(brgr); + regs->baud_rate_div = ZYNQ_UART_BAUD_RATE_DIV_BDIV(bauddiv); + } regs->control |= ZYNQ_UART_CONTROL_RXEN | ZYNQ_UART_CONTROL_TXEN; return true; |