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-pl011.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-pl011.c')
-rw-r--r-- | drivers/serial/amba-pl011.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index d5cbef3fe8b6..7db88ee18f75 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c | |||
@@ -163,18 +163,8 @@ pl011_rx_chars(struct uart_amba_port *uap) | |||
163 | if (uart_handle_sysrq_char(&uap->port, ch, regs)) | 163 | if (uart_handle_sysrq_char(&uap->port, ch, regs)) |
164 | goto ignore_char; | 164 | goto ignore_char; |
165 | 165 | ||
166 | if ((rsr & uap->port.ignore_status_mask) == 0) { | 166 | uart_insert_char(&uap->port, rsr, UART01x_RSR_OE, ch, flag); |
167 | tty_insert_flip_char(tty, ch, flag); | 167 | |
168 | } | ||
169 | if ((rsr & UART01x_RSR_OE) && | ||
170 | tty->flip.count < TTY_FLIPBUF_SIZE) { | ||
171 | /* | ||
172 | * Overrun is special, since it's reported | ||
173 | * immediately, and doesn't affect the current | ||
174 | * character | ||
175 | */ | ||
176 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | ||
177 | } | ||
178 | ignore_char: | 168 | ignore_char: |
179 | status = readw(uap->port.membase + UART01x_FR); | 169 | status = readw(uap->port.membase + UART01x_FR); |
180 | } | 170 | } |