d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reset h/w fifos (if any) in siostop(). Now ttyflush() works fairly well

Browse Source 
with sio devices (not perfectly, since there is no way to flush the tx
holding register on 8250-16450's.  I'm not sure if resetting the fifos
flushes the tx shift register).

Reminded by:	NIST-PCTS
This commit is contained in:
Bruce Evans 1996-11-30 15:29:31 +00:00
parent 4670f800ec
commit eea9b0845f
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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.151 1996/11/30 15:03:05 bde Exp $
* $Id: sio.c,v 1.152 1996/11/30 15:19:19 bde Exp $
*/
#include "opt_comconsole.h"
@ -2123,6 +2123,10 @@ siostop(tp, rw)
return;
disable_intr();
if (rw & FWRITE) {
if (com->hasfifo)
/* XXX does this flush everything? */
outb(com->iobase + com_fifo,
FIFO_XMT_RST | com->fifo_image);
com->obufs[0].l_queued = FALSE;
com->obufs[1].l_queued = FALSE;
if (com->state & CS_ODONE)
@ -2131,13 +2135,15 @@ siostop(tp, rw)
com->tp->t_state &= ~TS_BUSY;
}
if (rw & FREAD) {
if (com->hasfifo)
/* XXX does this flush everything? */
outb(com->iobase + com_fifo,
FIFO_RCV_RST | com->fifo_image);
com_events -= (com->iptr - com->ibuf);
com->iptr = com->ibuf;
}
enable_intr();
comstart(tp);
/* XXX should clear h/w fifos too. */
}
static struct tty *

12
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.151 1996/11/30 15:03:05 bde Exp $
* $Id: sio.c,v 1.152 1996/11/30 15:19:19 bde Exp $
*/
#include "opt_comconsole.h"
@ -2123,6 +2123,10 @@ siostop(tp, rw)
return;
disable_intr();
if (rw & FWRITE) {
if (com->hasfifo)
/* XXX does this flush everything? */
outb(com->iobase + com_fifo,
FIFO_XMT_RST | com->fifo_image);
com->obufs[0].l_queued = FALSE;
com->obufs[1].l_queued = FALSE;
if (com->state & CS_ODONE)
@ -2131,13 +2135,15 @@ siostop(tp, rw)
com->tp->t_state &= ~TS_BUSY;
}
if (rw & FREAD) {
if (com->hasfifo)
/* XXX does this flush everything? */
outb(com->iobase + com_fifo,
FIFO_RCV_RST | com->fifo_image);
com_events -= (com->iptr - com->ibuf);
com->iptr = com->ibuf;
}
enable_intr();
comstart(tp);
/* XXX should clear h/w fifos too. */
}
static struct tty *

12
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.151 1996/11/30 15:03:05 bde Exp $
* $Id: sio.c,v 1.152 1996/11/30 15:19:19 bde Exp $
*/
#include "opt_comconsole.h"
@ -2123,6 +2123,10 @@ siostop(tp, rw)
return;
disable_intr();
if (rw & FWRITE) {
if (com->hasfifo)
/* XXX does this flush everything? */
outb(com->iobase + com_fifo,
FIFO_XMT_RST | com->fifo_image);
com->obufs[0].l_queued = FALSE;
com->obufs[1].l_queued = FALSE;
if (com->state & CS_ODONE)
@ -2131,13 +2135,15 @@ siostop(tp, rw)
com->tp->t_state &= ~TS_BUSY;
}
if (rw & FREAD) {
if (com->hasfifo)
/* XXX does this flush everything? */
outb(com->iobase + com_fifo,
FIFO_RCV_RST | com->fifo_image);
com_events -= (com->iptr - com->ibuf);
com->iptr = com->ibuf;
}
enable_intr();
comstart(tp);
/* XXX should clear h/w fifos too. */
}
static struct tty *