OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drivers/serial: Make the 16550 rx trigger level configurable 

To avoid breaking other configs, the default value 2 is equal to the original
hard coded value.
This commit is contained in:
Lwazi Dube 2024-08-02 16:36:09 -04:00 committed by archer
parent cf0e832f2b
commit f3ddb3ffac
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/serial/Kconfig-16550
View File

@ -57,6 +57,11 @@ config 16550_UART0_2STOP
---help---
0=1 stop bit, 1=Two stop bits. Default: 1 stop bit
config 16550_UART0_RX_TRIGGER
int "16550 UART0 RX interrupt trigger level"
default 2
range 0 3
config 16550_UART0_RXBUFSIZE
int "16550 UART0 Rx buffer size"
default 256
@ -165,6 +170,11 @@ config 16550_UART1_2STOP
---help---
0=1 stop bit, 1=Two stop bits. Default: 1 stop bit
config 16550_UART1_RX_TRIGGER
int "16550 UART1 RX interrupt trigger level"
default 2
range 0 3
config 16550_UART1_RXBUFSIZE
int "16550 UART1 Rx buffer size"
default 256
@ -273,6 +283,11 @@ config 16550_UART2_2STOP
---help---
0=1 stop bit, 1=Two stop bits. Default: 1 stop bit
config 16550_UART2_RX_TRIGGER
int "16550 UART2 RX interrupt trigger level"
default 2
range 0 3
config 16550_UART2_RXBUFSIZE
int "16550 UART2 Rx buffer size"
default 256
@ -381,6 +396,11 @@ config 16550_UART3_2STOP
---help---
0=1 stop bit, 1=Two stop bits. Default: 1 stop bit
config 16550_UART3_RX_TRIGGER
int "16550 UART3 RX interrupt trigger level"
default 2
range 0 3
config 16550_UART3_RXBUFSIZE
int "16550 UART3 Rx buffer size"
default 256

13
drivers/serial/uart_16550.c
View File

@ -97,6 +97,7 @@ struct u16550_s
bool flow; /* flow control (RTS/CTS) enabled */
#endif
#endif
uart_datawidth_t rxtrigger; /* RX trigger level */
};
/****************************************************************************
@ -226,6 +227,7 @@ static struct u16550_s g_uart0priv =
.flow = true,
#endif
#endif
.rxtrigger = CONFIG_16550_UART0_RX_TRIGGER,
};
static uart_dev_t g_uart0port =
@ -279,6 +281,7 @@ static struct u16550_s g_uart1priv =
.flow = true,
#endif
#endif
.rxtrigger = CONFIG_16550_UART1_RX_TRIGGER,
};
static uart_dev_t g_uart1port =
@ -332,6 +335,7 @@ static struct u16550_s g_uart2priv =
.flow = true,
#endif
#endif
.rxtrigger = CONFIG_16550_UART2_RX_TRIGGER,
};
static uart_dev_t g_uart2port =
@ -385,6 +389,7 @@ static struct u16550_s g_uart3priv =
.flow = true,
#endif
#endif
.rxtrigger = CONFIG_16550_UART3_RX_TRIGGER,
};
static uart_dev_t g_uart3port =
@ -759,11 +764,6 @@ static int u16550_setup(FAR struct uart_dev_s *dev)
u16550_serialout(priv, UART_FCR_OFFSET,
(UART_FCR_RXRST | UART_FCR_TXRST));
/* Set trigger */
u16550_serialout(priv, UART_FCR_OFFSET,
(UART_FCR_FIFOEN | UART_FCR_RXTRIGGER_8));
/* Set up the IER */
priv->ier = u16550_serialin(priv, UART_IER_OFFSET);
@ -842,7 +842,8 @@ static int u16550_setup(FAR struct uart_dev_s *dev)
/* Configure the FIFOs */
u16550_serialout(priv, UART_FCR_OFFSET,
(UART_FCR_RXTRIGGER_8 | UART_FCR_TXRST | UART_FCR_RXRST |
(priv->rxtrigger << UART_FCR_RXTRIGGER_SHIFT |
UART_FCR_TXRST | UART_FCR_RXRST |
UART_FCR_FIFOEN));
/* Set up the auto flow control */