diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-05-09 18:21:59 -0400 |
---|---|---|
committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-05-09 18:21:59 -0400 |
commit | 05ab3014636ff60a319d37cdf37dca594b015eec (patch) | |
tree | d9d948a5ecd5e10cd511ebca328df2ef08d5e076 /drivers/serial/amba-pl010.c | |
parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) |
[PATCH] Serial: Add uart_insert_char()
Add uart_insert_char(), which handles inserting characters into the
flip buffer. This helper function handles the correct semantics
for handling overrun in addition to inserting normal characters.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial/amba-pl010.c')
-rw-r--r-- | drivers/serial/amba-pl010.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index f2a5e2933c47..2884b310e54d 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
@@ -198,18 +198,8 @@ pl010_rx_chars(struct uart_port *port) | |||
198 | if (uart_handle_sysrq_char(port, ch, regs)) | 198 | if (uart_handle_sysrq_char(port, ch, regs)) |
199 | goto ignore_char; | 199 | goto ignore_char; |
200 | 200 | ||
201 | if ((rsr & port->ignore_status_mask) == 0) { | 201 | uart_insert_char(port, rsr, UART01x_RSR_OE, ch, flag); |
202 | tty_insert_flip_char(tty, ch, flag); | 202 | |
203 | } | ||
204 | if ((rsr & UART01x_RSR_OE) && | ||
205 | tty->flip.count < TTY_FLIPBUF_SIZE) { | ||
206 | /* | ||
207 | * Overrun is special, since it's reported | ||
208 | * immediately, and doesn't affect the current | ||
209 | * character | ||
210 | */ | ||
211 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | ||
212 | } | ||
213 | ignore_char: | 203 | ignore_char: |
214 | status = UART_GET_FR(port); | 204 | status = UART_GET_FR(port); |
215 | } | 205 | } |