FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-13 16:11:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

n_tty: Factor flagged char handling into separate fn

Browse Source 
Prepare for modal receive_buf() handling; factor handling for
TTY_BREAK, TTY_PARITY, TTY_FRAME and TTY_OVERRUN into
n_tty_receive_char_flagged().

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2013-06-15 10:21:24 -04:00 committed by Greg Kroah-Hartman
parent b0ac50be1f
commit d2f8d7abd1
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/tty/n_tty.c
View File

@ -1468,6 +1468,29 @@ handle_newline:
put_tty_queue(c, ldata); put_tty_queue(c, ldata);
} }
static void
n_tty_receive_char_flagged(struct tty_struct *tty, unsigned char c, char flag)
{
char buf[64];
switch (flag) {
case TTY_BREAK:
n_tty_receive_break(tty);
break;
case TTY_PARITY:
case TTY_FRAME:
n_tty_receive_parity_error(tty, c);
break;
case TTY_OVERRUN:
n_tty_receive_overrun(tty);
break;
default:
printk(KERN_ERR "%s: unknown flag %d\n",
tty_name(tty, buf), flag);
break;
}
}
/** /**
* n_tty_receive_buf - data receive * n_tty_receive_buf - data receive
* @tty: terminal device * @tty: terminal device
@ -1511,34 +1534,19 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count) char *fp, int count)
{ {
struct n_tty_data *ldata = tty->disc_data; struct n_tty_data *ldata = tty->disc_data;
char flags = TTY_NORMAL;
char buf[64];
if (ldata->real_raw) if (ldata->real_raw)
n_tty_receive_buf_real_raw(tty, cp, fp, count); n_tty_receive_buf_real_raw(tty, cp, fp, count);
else { else {
char flag = TTY_NORMAL;
while (count--) { while (count--) {
if (fp) if (fp)
flags = *fp++; flag = *fp++;
switch (flags) { if (likely(flag == TTY_NORMAL))
case TTY_NORMAL:
n_tty_receive_char(tty, *cp++); n_tty_receive_char(tty, *cp++);
break; else
case TTY_BREAK: n_tty_receive_char_flagged(tty, *cp++, flag);
n_tty_receive_break(tty);
break;
case TTY_PARITY:
case TTY_FRAME:
n_tty_receive_parity_error(tty, *cp++);
break;
case TTY_OVERRUN:
n_tty_receive_overrun(tty);
break;
default:
printk(KERN_ERR "%s: unknown flag %d\n",
tty_name(tty, buf), flags);
break;
}
} }
flush_echoes(tty); flush_echoes(tty);