Several fixes to help "raw" tty mode work correctly with
BREAK/parity/framing errors. Term "correctly" assumes POSIX spec. and 4.4 ttyinput() behaviour. 1) Discard BREAK/parity at interrupt level when apropriate IGN* is set in iflag. It helps "raw" mode works even IGN* is set. 2) Zero parity (if INPCK) and framing directly in buffer before passing it to b_to_q() in "raw" mode. Efficency: interrupt level: if no error occurse, only two "test" commands added "raw" mode: buf scan incc times for parity/framing added Reviewed by: Submitted by: Obtained from: CVS:
This commit is contained in:
Andrey A. Chernov
parent
e36fea798c
commit
2cad35d11b
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
|
||||
* $Id: sio.c,v 1.72 1995/03/28 05:39:53 ache Exp $
|
||||
* $Id: sio.c,v 1.73 1995/03/28 06:15:44 ache Exp $
|
||||
*/
|
||||
|
||||
#include "sio.h"
|
||||
@ -1121,9 +1121,20 @@ siointr1(com)
|
||||
if (com->iptr - com->ibuf == 8)
|
||||
setsofttty();
|
||||
#endif
|
||||
ioptr[0] = recv_data;
|
||||
ioptr[CE_INPUT_OFFSET] = line_status;
|
||||
com->iptr = ++ioptr;
|
||||
/*
|
||||
Don't store PE if IGNPAR and BI if IGNBRK,
|
||||
this hack allows "raw" tty optimization
|
||||
works even if IGN* is set.
|
||||
Assume TTY_OE mapped to TTY_PE
|
||||
*/
|
||||
if ( (!(line_status & (LSR_PE|LSR_OE))
|
||||
|| !(com->tp->t_iflag & IGNPAR))
|
||||
&& (!(line_status & LSR_BI)
|
||||
|| !(com->tp->t_iflag & IGNBRK))) {
|
||||
ioptr[0] = recv_data;
|
||||
ioptr[CE_INPUT_OFFSET] = line_status;
|
||||
com->iptr = ++ioptr;
|
||||
}
|
||||
if (ioptr == com->ihighwater
|
||||
&& com->state & CS_RTS_IFLOW)
|
||||
outb(com->modem_ctl_port,
|
||||
@ -1550,11 +1561,27 @@ repeat:
|
||||
* call overhead).
|
||||
*/
|
||||
if (!(tp->t_iflag & (ICRNL | IGNCR | IMAXBEL | INLCR | ISTRIP
|
||||
| IXOFF | IXON | IGNBRK | BRKINT | PARMRK))
|
||||
| IXOFF | IXON))
|
||||
&& (!(tp->t_iflag & BRKINT) || (tp->t_iflag & IGNBRK))
|
||||
&& (!(tp->t_iflag & PARMRK) ||
|
||||
(tp->t_iflag & (IGNPAR|IGNBRK)) == (IGNPAR|IGNBRK))
|
||||
&& !(tp->t_lflag & (ECHO | ECHONL | ICANON | IEXTEN | ISIG
|
||||
| PENDIN))
|
||||
&& !(tp->t_state & (TS_CNTTB | TS_LNCH))
|
||||
&& linesw[tp->t_line].l_rint == ttyinput) {
|
||||
u_char *scan = buf;
|
||||
int cnt = incc;
|
||||
|
||||
/* Zero PE & FE chars per POSIX spec. and 4.4 ttyinput() */
|
||||
while (cnt--) {
|
||||
if ( (scan[CE_INPUT_OFFSET] & LSR_FE)
|
||||
/* Assume TTY_OE mapped to TTY_PE */
|
||||
|| (scan[CE_INPUT_OFFSET] & (LSR_PE|LSR_OE))
|
||||
&& (tp->t_iflag & INPCK))
|
||||
scan[0] = 0;
|
||||
scan++;
|
||||
}
|
||||
|
||||
tk_nin += incc;
|
||||
tk_rawcc += incc;
|
||||
tp->t_rawcc += incc;
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
|
||||
* $Id: sio.c,v 1.72 1995/03/28 05:39:53 ache Exp $
|
||||
* $Id: sio.c,v 1.73 1995/03/28 06:15:44 ache Exp $
|
||||
*/
|
||||
|
||||
#include "sio.h"
|
||||
@ -1121,9 +1121,20 @@ siointr1(com)
|
||||
if (com->iptr - com->ibuf == 8)
|
||||
setsofttty();
|
||||
#endif
|
||||
ioptr[0] = recv_data;
|
||||
ioptr[CE_INPUT_OFFSET] = line_status;
|
||||
com->iptr = ++ioptr;
|
||||
/*
|
||||
Don't store PE if IGNPAR and BI if IGNBRK,
|
||||
this hack allows "raw" tty optimization
|
||||
works even if IGN* is set.
|
||||
Assume TTY_OE mapped to TTY_PE
|
||||
*/
|
||||
if ( (!(line_status & (LSR_PE|LSR_OE))
|
||||
|| !(com->tp->t_iflag & IGNPAR))
|
||||
&& (!(line_status & LSR_BI)
|
||||
|| !(com->tp->t_iflag & IGNBRK))) {
|
||||
ioptr[0] = recv_data;
|
||||
ioptr[CE_INPUT_OFFSET] = line_status;
|
||||
com->iptr = ++ioptr;
|
||||
}
|
||||
if (ioptr == com->ihighwater
|
||||
&& com->state & CS_RTS_IFLOW)
|
||||
outb(com->modem_ctl_port,
|
||||
@ -1550,11 +1561,27 @@ repeat:
|
||||
* call overhead).
|
||||
*/
|
||||
if (!(tp->t_iflag & (ICRNL | IGNCR | IMAXBEL | INLCR | ISTRIP
|
||||
| IXOFF | IXON | IGNBRK | BRKINT | PARMRK))
|
||||
| IXOFF | IXON))
|
||||
&& (!(tp->t_iflag & BRKINT) || (tp->t_iflag & IGNBRK))
|
||||
&& (!(tp->t_iflag & PARMRK) ||
|
||||
(tp->t_iflag & (IGNPAR|IGNBRK)) == (IGNPAR|IGNBRK))
|
||||
&& !(tp->t_lflag & (ECHO | ECHONL | ICANON | IEXTEN | ISIG
|
||||
| PENDIN))
|
||||
&& !(tp->t_state & (TS_CNTTB | TS_LNCH))
|
||||
&& linesw[tp->t_line].l_rint == ttyinput) {
|
||||
u_char *scan = buf;
|
||||
int cnt = incc;
|
||||
|
||||
/* Zero PE & FE chars per POSIX spec. and 4.4 ttyinput() */
|
||||
while (cnt--) {
|
||||
if ( (scan[CE_INPUT_OFFSET] & LSR_FE)
|
||||
/* Assume TTY_OE mapped to TTY_PE */
|
||||
|| (scan[CE_INPUT_OFFSET] & (LSR_PE|LSR_OE))
|
||||
&& (tp->t_iflag & INPCK))
|
||||
scan[0] = 0;
|
||||
scan++;
|
||||
}
|
||||
|
||||
tk_nin += incc;
|
||||
tk_rawcc += incc;
|
||||
tp->t_rawcc += incc;
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
|
||||
* $Id: sio.c,v 1.72 1995/03/28 05:39:53 ache Exp $
|
||||
* $Id: sio.c,v 1.73 1995/03/28 06:15:44 ache Exp $
|
||||
*/
|
||||
|
||||
#include "sio.h"
|
||||
@ -1121,9 +1121,20 @@ siointr1(com)
|
||||
if (com->iptr - com->ibuf == 8)
|
||||
setsofttty();
|
||||
#endif
|
||||
ioptr[0] = recv_data;
|
||||
ioptr[CE_INPUT_OFFSET] = line_status;
|
||||
com->iptr = ++ioptr;
|
||||
/*
|
||||
Don't store PE if IGNPAR and BI if IGNBRK,
|
||||
this hack allows "raw" tty optimization
|
||||
works even if IGN* is set.
|
||||
Assume TTY_OE mapped to TTY_PE
|
||||
*/
|
||||
if ( (!(line_status & (LSR_PE|LSR_OE))
|
||||
|| !(com->tp->t_iflag & IGNPAR))
|
||||
&& (!(line_status & LSR_BI)
|
||||
|| !(com->tp->t_iflag & IGNBRK))) {
|
||||
ioptr[0] = recv_data;
|
||||
ioptr[CE_INPUT_OFFSET] = line_status;
|
||||
com->iptr = ++ioptr;
|
||||
}
|
||||
if (ioptr == com->ihighwater
|
||||
&& com->state & CS_RTS_IFLOW)
|
||||
outb(com->modem_ctl_port,
|
||||
@ -1550,11 +1561,27 @@ repeat:
|
||||
* call overhead).
|
||||
*/
|
||||
if (!(tp->t_iflag & (ICRNL | IGNCR | IMAXBEL | INLCR | ISTRIP
|
||||
| IXOFF | IXON | IGNBRK | BRKINT | PARMRK))
|
||||
| IXOFF | IXON))
|
||||
&& (!(tp->t_iflag & BRKINT) || (tp->t_iflag & IGNBRK))
|
||||
&& (!(tp->t_iflag & PARMRK) ||
|
||||
(tp->t_iflag & (IGNPAR|IGNBRK)) == (IGNPAR|IGNBRK))
|
||||
&& !(tp->t_lflag & (ECHO | ECHONL | ICANON | IEXTEN | ISIG
|
||||
| PENDIN))
|
||||
&& !(tp->t_state & (TS_CNTTB | TS_LNCH))
|
||||
&& linesw[tp->t_line].l_rint == ttyinput) {
|
||||
u_char *scan = buf;
|
||||
int cnt = incc;
|
||||
|
||||
/* Zero PE & FE chars per POSIX spec. and 4.4 ttyinput() */
|
||||
while (cnt--) {
|
||||
if ( (scan[CE_INPUT_OFFSET] & LSR_FE)
|
||||
/* Assume TTY_OE mapped to TTY_PE */
|
||||
|| (scan[CE_INPUT_OFFSET] & (LSR_PE|LSR_OE))
|
||||
&& (tp->t_iflag & INPCK))
|
||||
scan[0] = 0;
|
||||
scan++;
|
||||
}
|
||||
|
||||
tk_nin += incc;
|
||||
tk_rawcc += incc;
|
||||
tp->t_rawcc += incc;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user