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/serial_txx9.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/serial_txx9.c')
-rw-r--r-- | drivers/serial/serial_txx9.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index 37b2ef297cbe..3f1051a4a13f 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c | |||
@@ -350,18 +350,9 @@ receive_chars(struct uart_txx9_port *up, unsigned int *status, struct pt_regs *r | |||
350 | } | 350 | } |
351 | if (uart_handle_sysrq_char(&up->port, ch, regs)) | 351 | if (uart_handle_sysrq_char(&up->port, ch, regs)) |
352 | goto ignore_char; | 352 | goto ignore_char; |
353 | if ((disr & up->port.ignore_status_mask) == 0) { | 353 | |
354 | tty_insert_flip_char(tty, ch, flag); | 354 | uart_insert_char(&up->port, disr, TXX9_SIDISR_UOER, ch, flag); |
355 | } | 355 | |
356 | if ((disr & TXX9_SIDISR_UOER) && | ||
357 | tty->flip.count < TTY_FLIPBUF_SIZE) { | ||
358 | /* | ||
359 | * Overrun is special, since it's reported | ||
360 | * immediately, and doesn't affect the current | ||
361 | * character. | ||
362 | */ | ||
363 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | ||
364 | } | ||
365 | ignore_char: | 356 | ignore_char: |
366 | disr = sio_in(up, TXX9_SIDISR); | 357 | disr = sio_in(up, TXX9_SIDISR); |
367 | } while (!(disr & TXX9_SIDISR_UVALID) && (max_count-- > 0)); | 358 | } while (!(disr & TXX9_SIDISR_UVALID) && (max_count-- > 0)); |