n_tty: Split n_tty_receive_char()
Factor 'special' per-char processing into standalone fn, n_tty_receive_char_special(), which handles processing for chars marked in the char_map. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
855df3c089
commit
4b1f79c2d7
|
@ -1255,57 +1255,12 @@ n_tty_receive_signal_char(struct tty_struct *tty, int signal, unsigned char c)
|
|||
* otherwise, publishes read_head via put_tty_queue()
|
||||
*/
|
||||
|
||||
static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
|
||||
static void
|
||||
n_tty_receive_char_special(struct tty_struct *tty, unsigned char c)
|
||||
{
|
||||
struct n_tty_data *ldata = tty->disc_data;
|
||||
int parmrk;
|
||||
|
||||
if (I_ISTRIP(tty))
|
||||
c &= 0x7f;
|
||||
if (I_IUCLC(tty) && L_IEXTEN(tty))
|
||||
c = tolower(c);
|
||||
|
||||
if (L_EXTPROC(tty)) {
|
||||
put_tty_queue(c, ldata);
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* If the previous character was LNEXT, or we know that this
|
||||
* character is not one of the characters that we'll have to
|
||||
* handle specially, do shortcut processing to speed things
|
||||
* up.
|
||||
*/
|
||||
if (!test_bit(c, ldata->char_map) || ldata->lnext) {
|
||||
ldata->lnext = 0;
|
||||
|
||||
if (tty->stopped && !tty->flow_stopped && I_IXON(tty) &&
|
||||
I_IXANY(tty)) {
|
||||
start_tty(tty);
|
||||
process_echoes(tty);
|
||||
}
|
||||
|
||||
parmrk = (c == (unsigned char) '\377' && I_PARMRK(tty)) ? 1 : 0;
|
||||
if (read_cnt(ldata) >= (N_TTY_BUF_SIZE - parmrk - 1)) {
|
||||
/* beep if no space */
|
||||
if (L_ECHO(tty))
|
||||
process_output('\a', tty);
|
||||
return;
|
||||
}
|
||||
if (L_ECHO(tty)) {
|
||||
finish_erasing(ldata);
|
||||
/* Record the column of first canon char. */
|
||||
if (ldata->canon_head == ldata->read_head)
|
||||
echo_set_canon_col(ldata);
|
||||
echo_char(c, tty);
|
||||
commit_echoes(tty);
|
||||
}
|
||||
if (parmrk)
|
||||
put_tty_queue(c, ldata);
|
||||
put_tty_queue(c, ldata);
|
||||
return;
|
||||
}
|
||||
|
||||
if (I_IXON(tty)) {
|
||||
if (c == START_CHAR(tty)) {
|
||||
start_tty(tty);
|
||||
|
@ -1458,6 +1413,60 @@ handle_newline:
|
|||
put_tty_queue(c, ldata);
|
||||
}
|
||||
|
||||
static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
|
||||
{
|
||||
struct n_tty_data *ldata = tty->disc_data;
|
||||
int parmrk;
|
||||
|
||||
if (I_ISTRIP(tty))
|
||||
c &= 0x7f;
|
||||
if (I_IUCLC(tty) && L_IEXTEN(tty))
|
||||
c = tolower(c);
|
||||
|
||||
if (L_EXTPROC(tty)) {
|
||||
put_tty_queue(c, ldata);
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* If the previous character was LNEXT, or we know that this
|
||||
* character is not one of the characters that we'll have to
|
||||
* handle specially, do shortcut processing to speed things
|
||||
* up.
|
||||
*/
|
||||
if (!test_bit(c, ldata->char_map) || ldata->lnext) {
|
||||
ldata->lnext = 0;
|
||||
|
||||
if (tty->stopped && !tty->flow_stopped && I_IXON(tty) &&
|
||||
I_IXANY(tty)) {
|
||||
start_tty(tty);
|
||||
process_echoes(tty);
|
||||
}
|
||||
|
||||
parmrk = (c == (unsigned char) '\377' && I_PARMRK(tty)) ? 1 : 0;
|
||||
if (read_cnt(ldata) >= (N_TTY_BUF_SIZE - parmrk - 1)) {
|
||||
/* beep if no space */
|
||||
if (L_ECHO(tty))
|
||||
process_output('\a', tty);
|
||||
return;
|
||||
}
|
||||
if (L_ECHO(tty)) {
|
||||
finish_erasing(ldata);
|
||||
/* Record the column of first canon char. */
|
||||
if (ldata->canon_head == ldata->read_head)
|
||||
echo_set_canon_col(ldata);
|
||||
echo_char(c, tty);
|
||||
commit_echoes(tty);
|
||||
}
|
||||
if (parmrk)
|
||||
put_tty_queue(c, ldata);
|
||||
put_tty_queue(c, ldata);
|
||||
return;
|
||||
}
|
||||
|
||||
n_tty_receive_char_special(tty, c);
|
||||
}
|
||||
|
||||
static inline void
|
||||
n_tty_receive_char_closing(struct tty_struct *tty, unsigned char c)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue