Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-20 03:05:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

dev/serial: Simplify some Zynq UART functions

Browse Source 
Make the initialization and polled functions independent of the Termios
context.  This helps to implement the kernel I/O support without a dependency
on the Termios framework.
This commit is contained in:
Sebastian Huber
2024-03-18 14:47:59 +01:00
parent 5b0e355ed7
commit 4c2da2c343
8 changed files with 62 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
bsps/shared/dev/serial/zynq-uart-polled.c
View File

@@ -124,10 +124,8 @@ int zynq_cal_baud_rate(uint32_t baudrate,
return 0;
}
void zynq_uart_initialize(rtems_termios_device_context *base)
void zynq_uart_initialize(volatile zynq_uart *regs)
{
zynq_uart_context *ctx = (zynq_uart_context *) base;
volatile zynq_uart *regs = ctx->regs;
uint32_t brgr = 0x3e;
uint32_t bauddiv = 0x6;
uint32_t mode_clks = regs->mode & ZYNQ_UART_MODE_CLKS;
@@ -154,18 +152,15 @@ void zynq_uart_initialize(rtems_termios_device_context *base)
| ZYNQ_UART_MODE_CHRL(ZYNQ_UART_MODE_CHRL_8)
| mode_clks;
while (zynq_uart_read_polled(base) >= 0) {
while (zynq_uart_read_char_polled(regs) >= 0) {
/* Drop */
}
zynq_uart_reset_tx_flush(ctx);
zynq_uart_reset_tx_flush(regs);
}
int zynq_uart_read_polled(rtems_termios_device_context *base)
int zynq_uart_read_char_polled(volatile zynq_uart *regs)
{
zynq_uart_context *ctx = (zynq_uart_context *) base;
volatile zynq_uart *regs = ctx->regs;
if ((regs->channel_sts & ZYNQ_UART_CHANNEL_STS_REMPTY) != 0) {
return -1;
} else {
@@ -173,14 +168,8 @@ int zynq_uart_read_polled(rtems_termios_device_context *base)
}
}
void zynq_uart_write_polled(
rtems_termios_device_context *base,
char c
)
void zynq_uart_write_char_polled(volatile zynq_uart *regs, char c)
{
zynq_uart_context *ctx = (zynq_uart_context *) base;
volatile zynq_uart *regs = ctx->regs;
while ((regs->channel_sts & ZYNQ_UART_CHANNEL_STS_TNFUL) != 0) {
/* Wait */
}
@@ -188,13 +177,12 @@ void zynq_uart_write_polled(
regs->tx_rx_fifo = ZYNQ_UART_TX_RX_FIFO_FIFO(c);
}
void zynq_uart_reset_tx_flush(zynq_uart_context *ctx)
void zynq_uart_reset_tx_flush(volatile zynq_uart *regs)
{
volatile zynq_uart *regs = ctx->regs;
int c = 4;
int c = 4;
while (c-- > 0)
zynq_uart_write_polled(&ctx->base, '\r');
zynq_uart_write_char_polled(regs, '\r');
while ((regs->channel_sts & ZYNQ_UART_CHANNEL_STS_TEMPTY) == 0 ||
(regs->channel_sts & ZYNQ_UART_CHANNEL_STS_TACTIVE) != 0) {

18
bsps/shared/dev/serial/zynq-uart.c
View File

@@ -67,14 +67,14 @@ static bool zynq_uart_first_open(
rtems_libio_open_close_args_t *args
)
{
#ifdef ZYNQ_CONSOLE_USE_INTERRUPTS
zynq_uart_context *ctx = (zynq_uart_context *) base;
volatile zynq_uart *regs = ctx->regs;
#ifdef ZYNQ_CONSOLE_USE_INTERRUPTS
rtems_status_code sc;
#endif
rtems_termios_set_initial_baud(tty, ZYNQ_UART_DEFAULT_BAUD);
zynq_uart_initialize(base);
zynq_uart_initialize(regs);
#ifdef ZYNQ_CONSOLE_USE_INTERRUPTS
regs->rx_fifo_trg_lvl = 1;
@@ -109,15 +109,23 @@ static void zynq_uart_last_close(
}
#endif
#ifndef ZYNQ_CONSOLE_USE_INTERRUPTS
static int zynq_uart_read_polled(rtems_termios_device_context *base)
{
zynq_uart_context *ctx = (zynq_uart_context *) base;
return zynq_uart_read_char_polled(ctx->regs);
}
#endif
static void zynq_uart_write_support(
rtems_termios_device_context *base,
const char *buf,
size_t len
)
{
#ifdef ZYNQ_CONSOLE_USE_INTERRUPTS
zynq_uart_context *ctx = (zynq_uart_context *) base;
volatile zynq_uart *regs = ctx->regs;
#ifdef ZYNQ_CONSOLE_USE_INTERRUPTS
regs->irq_dis = ZYNQ_UART_TEMPTY;
@@ -135,9 +143,9 @@ static void zynq_uart_write_support(
regs->irq_en = ZYNQ_UART_TEMPTY;
}
#else
ssize_t i;
size_t i;
for (i = 0; i < len; ++i) {
zynq_uart_write_polled(base, buf[i]);
zynq_uart_write_char_polled(regs, buf[i]);
}
#endif
}