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

Another try: fixed bogus change of the fifo settings for the non-speed of 0.

Browse Source 
rev.1.30 incorrectly changed the behaviour from always disabling the fifo
to always enabling it.
This commit is contained in:
Bruce Evans 1996-04-13 14:55:18 +00:00
parent 01a95d942e
commit aef18d6ed7
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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.138 1996/04/10 18:09:58 scrappy Exp $
* $Id: sio.c,v 1.139 1996/04/11 21:18:49 bde Exp $
*/
#include "opt_comconsole.h"
@ -2015,7 +2015,7 @@ comparam(tp, t)
if (cflag & CSTOPB)
cfcr |= CFCR_STOPB;
if (com->hasfifo) {
if (com->hasfifo && divisor != 0) {
/*
* Use a fifo trigger level low enough so that the input
* latency from the fifo is less than about 16 msec and
@ -2024,7 +2024,7 @@ comparam(tp, t)
* protocols shouldn't expect anything better since modem
* latencies are larger.
*/
com->fifo_image = t->c_ospeed != 0 && t->c_ospeed <= 4800
com->fifo_image = t->c_ospeed <= 4800
? FIFO_ENABLE : FIFO_ENABLE | FIFO_RX_HIGH;
outb(iobase + com_fifo, com->fifo_image);
}

6
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.138 1996/04/10 18:09:58 scrappy Exp $
* $Id: sio.c,v 1.139 1996/04/11 21:18:49 bde Exp $
*/
#include "opt_comconsole.h"
@ -2015,7 +2015,7 @@ comparam(tp, t)
if (cflag & CSTOPB)
cfcr |= CFCR_STOPB;
if (com->hasfifo) {
if (com->hasfifo && divisor != 0) {
/*
* Use a fifo trigger level low enough so that the input
* latency from the fifo is less than about 16 msec and
@ -2024,7 +2024,7 @@ comparam(tp, t)
* protocols shouldn't expect anything better since modem
* latencies are larger.
*/
com->fifo_image = t->c_ospeed != 0 && t->c_ospeed <= 4800
com->fifo_image = t->c_ospeed <= 4800
? FIFO_ENABLE : FIFO_ENABLE | FIFO_RX_HIGH;
outb(iobase + com_fifo, com->fifo_image);
}

6
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.138 1996/04/10 18:09:58 scrappy Exp $
* $Id: sio.c,v 1.139 1996/04/11 21:18:49 bde Exp $
*/
#include "opt_comconsole.h"
@ -2015,7 +2015,7 @@ comparam(tp, t)
if (cflag & CSTOPB)
cfcr |= CFCR_STOPB;
if (com->hasfifo) {
if (com->hasfifo && divisor != 0) {
/*
* Use a fifo trigger level low enough so that the input
* latency from the fifo is less than about 16 msec and
@ -2024,7 +2024,7 @@ comparam(tp, t)
* protocols shouldn't expect anything better since modem
* latencies are larger.
*/
com->fifo_image = t->c_ospeed != 0 && t->c_ospeed <= 4800
com->fifo_image = t->c_ospeed <= 4800
? FIFO_ENABLE : FIFO_ENABLE | FIFO_RX_HIGH;
outb(iobase + com_fifo, com->fifo_image);
}