mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00
Code Issues Releases Activity

Revive input flow control, some ideas from iverson@leonheart.com

Browse Source 
Get rid of TS_RTS_IFLOW, all kinds of input flow control handled
by only one flag now: TS_TBLOCK
Add missing put(VSTOP) when IXOFF control is active.
This commit is contained in:
Andrey A. Chernov 1995-02-24 00:11:01 +00:00
parent e6c16d383f
commit 838dadc476
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=6676
3 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/sio/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.64 1995/01/06 15:03:41 bde Exp $
* $Id: sio.c,v 1.65 1995/01/20 07:34:15 wpaul Exp $
*/
#include "sio.h"
@ -71,7 +71,6 @@
/*
* XXX temporary kludges for 2.0 (XXX TK2.0).
*/
#define TS_RTS_IFLOW 0
#define TSA_CARR_ON(tp) ((void *)&(tp)->t_rawq)
#define TSA_OCOMPLETE(tp) ((void *)&(tp)->t_outq)
#define TSA_OLOWAT(tp) ((void *)&(tp)->t_outq)
@ -1488,7 +1487,7 @@ siopoll()
*/
if ((com->state & CS_RTS_IFLOW)
&& !(com->mcr_image & MCR_RTS)
&& !(tp->t_state & TS_RTS_IFLOW))
&& !(tp->t_state & TS_TBLOCK))
outb(com->modem_ctl_port,
com->mcr_image |= MCR_RTS);
enable_intr();
@ -1519,16 +1518,21 @@ siopoll()
}
if (incc <= 0 || !(tp->t_state & TS_ISOPEN))
continue;
if (com->state & CS_RTS_IFLOW
if (((com->state & CS_RTS_IFLOW) || (tp->t_iflag & IXOFF))
&& !(tp->t_state & TS_TBLOCK)
&& tp->t_rawq.c_cc + incc >= RB_I_HIGH_WATER
&& !(tp->t_state & TS_RTS_IFLOW)
/*
* XXX - need RTS flow control for all line disciplines.
* XXX - need flow control for all line disciplines.
* Only have it in standard one now.
*/
&& linesw[tp->t_line].l_rint == ttyinput) {
tp->t_state |= TS_RTS_IFLOW;
ttstart(tp);
if ((tp->t_iflag & IXOFF) &&
tp->t_cc[VSTOP] != _POSIX_VDISABLE &&
putc(tp->t_cc[VSTOP], &tp->t_outq) == 0 ||
(com->state & CS_RTS_IFLOW)) {
tp->t_state |= TS_TBLOCK;
ttstart(tp);
}
}
/*
* Avoid the grotesquely inefficient lineswitch routine
@ -1747,7 +1751,7 @@ comstart(tp)
com->state &= ~CS_TTGO;
else
com->state |= CS_TTGO;
if (tp->t_state & TS_RTS_IFLOW) {
if (tp->t_state & TS_TBLOCK) {
if (com->mcr_image & MCR_RTS && com->state & CS_RTS_IFLOW)
outb(com->modem_ctl_port, com->mcr_image &= ~MCR_RTS);
} else {

22
sys/i386/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.64 1995/01/06 15:03:41 bde Exp $
* $Id: sio.c,v 1.65 1995/01/20 07:34:15 wpaul Exp $
*/
#include "sio.h"
@ -71,7 +71,6 @@
/*
* XXX temporary kludges for 2.0 (XXX TK2.0).
*/
#define TS_RTS_IFLOW 0
#define TSA_CARR_ON(tp) ((void *)&(tp)->t_rawq)
#define TSA_OCOMPLETE(tp) ((void *)&(tp)->t_outq)
#define TSA_OLOWAT(tp) ((void *)&(tp)->t_outq)
@ -1488,7 +1487,7 @@ siopoll()
*/
if ((com->state & CS_RTS_IFLOW)
&& !(com->mcr_image & MCR_RTS)
&& !(tp->t_state & TS_RTS_IFLOW))
&& !(tp->t_state & TS_TBLOCK))
outb(com->modem_ctl_port,
com->mcr_image |= MCR_RTS);
enable_intr();
@ -1519,16 +1518,21 @@ siopoll()
}
if (incc <= 0 || !(tp->t_state & TS_ISOPEN))
continue;
if (com->state & CS_RTS_IFLOW
if (((com->state & CS_RTS_IFLOW) || (tp->t_iflag & IXOFF))
&& !(tp->t_state & TS_TBLOCK)
&& tp->t_rawq.c_cc + incc >= RB_I_HIGH_WATER
&& !(tp->t_state & TS_RTS_IFLOW)
/*
* XXX - need RTS flow control for all line disciplines.
* XXX - need flow control for all line disciplines.
* Only have it in standard one now.
*/
&& linesw[tp->t_line].l_rint == ttyinput) {
tp->t_state |= TS_RTS_IFLOW;
ttstart(tp);
if ((tp->t_iflag & IXOFF) &&
tp->t_cc[VSTOP] != _POSIX_VDISABLE &&
putc(tp->t_cc[VSTOP], &tp->t_outq) == 0 ||
(com->state & CS_RTS_IFLOW)) {
tp->t_state |= TS_TBLOCK;
ttstart(tp);
}
}
/*
* Avoid the grotesquely inefficient lineswitch routine
@ -1747,7 +1751,7 @@ comstart(tp)
com->state &= ~CS_TTGO;
else
com->state |= CS_TTGO;
if (tp->t_state & TS_RTS_IFLOW) {
if (tp->t_state & TS_TBLOCK) {
if (com->mcr_image & MCR_RTS && com->state & CS_RTS_IFLOW)
outb(com->modem_ctl_port, com->mcr_image &= ~MCR_RTS);
} else {

22
sys/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.64 1995/01/06 15:03:41 bde Exp $
* $Id: sio.c,v 1.65 1995/01/20 07:34:15 wpaul Exp $
*/
#include "sio.h"
@ -71,7 +71,6 @@
/*
* XXX temporary kludges for 2.0 (XXX TK2.0).
*/
#define TS_RTS_IFLOW 0
#define TSA_CARR_ON(tp) ((void *)&(tp)->t_rawq)
#define TSA_OCOMPLETE(tp) ((void *)&(tp)->t_outq)
#define TSA_OLOWAT(tp) ((void *)&(tp)->t_outq)
@ -1488,7 +1487,7 @@ siopoll()
*/
if ((com->state & CS_RTS_IFLOW)
&& !(com->mcr_image & MCR_RTS)
&& !(tp->t_state & TS_RTS_IFLOW))
&& !(tp->t_state & TS_TBLOCK))
outb(com->modem_ctl_port,
com->mcr_image |= MCR_RTS);
enable_intr();
@ -1519,16 +1518,21 @@ siopoll()
}
if (incc <= 0 || !(tp->t_state & TS_ISOPEN))
continue;
if (com->state & CS_RTS_IFLOW
if (((com->state & CS_RTS_IFLOW) || (tp->t_iflag & IXOFF))
&& !(tp->t_state & TS_TBLOCK)
&& tp->t_rawq.c_cc + incc >= RB_I_HIGH_WATER
&& !(tp->t_state & TS_RTS_IFLOW)
/*
* XXX - need RTS flow control for all line disciplines.
* XXX - need flow control for all line disciplines.
* Only have it in standard one now.
*/
&& linesw[tp->t_line].l_rint == ttyinput) {
tp->t_state |= TS_RTS_IFLOW;
ttstart(tp);
if ((tp->t_iflag & IXOFF) &&
tp->t_cc[VSTOP] != _POSIX_VDISABLE &&
putc(tp->t_cc[VSTOP], &tp->t_outq) == 0 ||
(com->state & CS_RTS_IFLOW)) {
tp->t_state |= TS_TBLOCK;
ttstart(tp);
}
}
/*
* Avoid the grotesquely inefficient lineswitch routine
@ -1747,7 +1751,7 @@ comstart(tp)
com->state &= ~CS_TTGO;
else
com->state |= CS_TTGO;
if (tp->t_state & TS_RTS_IFLOW) {
if (tp->t_state & TS_TBLOCK) {
if (com->mcr_image & MCR_RTS && com->state & CS_RTS_IFLOW)
outb(com->modem_ctl_port, com->mcr_image &= ~MCR_RTS);
} else {