diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 12:04:46 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 12:04:46 +0100 |
commit | 69887ac1dcb79dfc773dabac2dd081fa6d6e2573 (patch) | |
tree | 23a4f685c71ff8666548b0a01b221928e46a9287 /include/linux/serial_core.h | |
parent | 5e014b10ef8477c32a939a48fa02aedcad35a226 (diff) | |
parent | 118326e940bdecef6c459d42ccf05256ba86daa7 (diff) | |
download | talos-obmc-linux-69887ac1dcb79dfc773dabac2dd081fa6d6e2573.tar.gz talos-obmc-linux-69887ac1dcb79dfc773dabac2dd081fa6d6e2573.zip |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/serial_core.h')
-rw-r--r-- | include/linux/serial_core.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index c3fb5984f250..d6025af7efac 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -479,6 +479,25 @@ uart_handle_cts_change(struct uart_port *port, unsigned int status) } } +#include <linux/tty_flip.h> + +static inline void +uart_insert_char(struct uart_port *port, unsigned int status, + unsigned int overrun, unsigned int ch, unsigned int flag) +{ + struct tty_struct *tty = port->info->tty; + + if ((status & port->ignore_status_mask & ~overrun) == 0) + tty_insert_flip_char(tty, ch, flag); + + /* + * Overrun is special. Since it's reported immediately, + * it doesn't affect the current character. + */ + if (status & ~port->ignore_status_mask & overrun) + tty_insert_flip_char(tty, 0, TTY_OVERRUN); +} + /* * UART_ENABLE_MS - determine if port should enable modem status irqs */ |