sugar/linux
1
0
Fork 0
Code Activity

Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git

Browse Source
This commit is contained in:
Linus Torvalds
2005-05-16 10:34:52 -07:00
parent 2a4a7e02e2 05ab301463
commit 768cbfbc52
12 changed files with 41 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/linux/serial_core.h
View File

@@ -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
*/