diff options
| author | Kinsey Moore <kinsey.moore@oarcorp.com> | 2020-12-02 13:20:36 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2020-12-03 17:35:28 -0600 |
| commit | 5686b44d133223a57e2381237a1a601e32a5dc35 (patch) | |
| tree | 4a4c6d3bcdb82c7ccd0ac59a066fecf30072b265 /bsps/shared/dev/serial | |
| parent | samples/unlimited: Prevent compile error (diff) | |
| download | rtems-5686b44d133223a57e2381237a1a601e32a5dc35.tar.bz2 | |
zynq-uart: Fix set_attributes implementation
The zynq-uart set_attributes implementation was configured to always
return false which causes spconsole01 to fail. This restores the
disabled implementation which sets the baud rate registers
appropriately and allows spconsole01 to pass. This also expands the
set_attributes functionality to allow setting of the stop bits,
character width, and parity.
Diffstat (limited to 'bsps/shared/dev/serial')
| -rw-r--r-- | bsps/shared/dev/serial/zynq-uart-polled.c | 2 | ||||
| -rw-r--r-- | bsps/shared/dev/serial/zynq-uart.c | 56 |
2 files changed, 52 insertions, 6 deletions
diff --git a/bsps/shared/dev/serial/zynq-uart-polled.c b/bsps/shared/dev/serial/zynq-uart-polled.c index a1b51ea521..442431d502 100644 --- a/bsps/shared/dev/serial/zynq-uart-polled.c +++ b/bsps/shared/dev/serial/zynq-uart-polled.c @@ -40,7 +40,7 @@ uint32_t zynq_uart_input_clock(void) return ZYNQ_CLOCK_UART; } -static int zynq_cal_baud_rate(uint32_t baudrate, +int zynq_cal_baud_rate(uint32_t baudrate, uint32_t* brgr, uint32_t* bauddiv, uint32_t modereg) diff --git a/bsps/shared/dev/serial/zynq-uart.c b/bsps/shared/dev/serial/zynq-uart.c index 41adb196ab..8f17d3ca65 100644 --- a/bsps/shared/dev/serial/zynq-uart.c +++ b/bsps/shared/dev/serial/zynq-uart.c @@ -142,25 +142,71 @@ static bool zynq_uart_set_attributes( const struct termios *term ) { -#if 0 - volatile zynq_uart *regs = zynq_uart_get_regs(minor); + zynq_uart_context *ctx = (zynq_uart_context *) context; + volatile zynq_uart *regs = ctx->regs; 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; + /* + * Configure the mode register + */ + mode |= ZYNQ_UART_MODE_CHMODE(ZYNQ_UART_MODE_CHMODE_NORMAL); + + /* + * Parity + */ + mode |= ZYNQ_UART_MODE_PAR(ZYNQ_UART_MODE_PAR_NONE); + if (term->c_cflag & PARENB) { + if (!(term->c_cflag & PARODD)) { + mode |= ZYNQ_UART_MODE_PAR(ZYNQ_UART_MODE_PAR_ODD); + } else { + mode |= ZYNQ_UART_MODE_PAR(ZYNQ_UART_MODE_PAR_EVEN); + } + } + + /* + * Character Size + */ + switch (term->c_cflag & CSIZE) + { + case CS5: + return false; + case CS6: + mode |= ZYNQ_UART_MODE_CHRL(ZYNQ_UART_MODE_CHRL_6); + break; + case CS7: + mode |= ZYNQ_UART_MODE_CHRL(ZYNQ_UART_MODE_CHRL_7); + break; + case CS8: + default: + mode |= ZYNQ_UART_MODE_CHRL(ZYNQ_UART_MODE_CHRL_8); + break; + } + + /* + * Stop Bits + */ + if (term->c_cflag & CSTOPB) { + /* 2 stop bits */ + mode |= ZYNQ_UART_MODE_NBSTOP(ZYNQ_UART_MODE_NBSTOP_STOP_2); + } else { + /* 1 stop bit */ + mode |= ZYNQ_UART_MODE_NBSTOP(ZYNQ_UART_MODE_NBSTOP_STOP_1); + } + 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); regs->control |= ZYNQ_UART_CONTROL_RXEN | ZYNQ_UART_CONTROL_TXEN; return true; -#else - return false; -#endif } const rtems_termios_device_handler zynq_uart_handler = { |