From 357eebce38ae0d54b2361e35ebbe113db8cd2ba4 Mon Sep 17 00:00:00 2001 From: David Greenman Date: Tue, 12 Oct 1993 06:32:28 +0000 Subject: [PATCH] incorporated patches from Marc Frajola (marc@escargot.rain.com) to unset TS_TBLOCK when the RBLEN falls below the low water mark. --- sys/dev/sio/sio.c | 6 ++++-- sys/i386/isa/sio.c | 6 ++++-- sys/isa/sio.c | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 0dbb43989199..9dd5840b961e 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -41,7 +41,7 @@ * into the patch kit. Added in sioselect * from com.c. Added port 4 support. */ -static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.8 1993/09/10 16:59:16 rgrimes Exp $"; +static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.9 1993/09/28 00:01:10 jkh Exp $"; #include "sio.h" #if NSIO > 0 @@ -1430,8 +1430,10 @@ comstart(tp) outb(com->modem_ctl_port, com->mcr_image &= ~MCR_RTS); } else { - if (!(com->mcr_image & MCR_RTS) && com->iptr < com->ihighwater) + if (!(com->mcr_image & MCR_RTS) && com->iptr < com->ihighwater) { + tp->t_state &= ~TS_RTSBLOCK; outb(com->modem_ctl_port, com->mcr_image |= MCR_RTS); + } } enable_intr(); if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 0dbb43989199..9dd5840b961e 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -41,7 +41,7 @@ * into the patch kit. Added in sioselect * from com.c. Added port 4 support. */ -static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.8 1993/09/10 16:59:16 rgrimes Exp $"; +static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.9 1993/09/28 00:01:10 jkh Exp $"; #include "sio.h" #if NSIO > 0 @@ -1430,8 +1430,10 @@ comstart(tp) outb(com->modem_ctl_port, com->mcr_image &= ~MCR_RTS); } else { - if (!(com->mcr_image & MCR_RTS) && com->iptr < com->ihighwater) + if (!(com->mcr_image & MCR_RTS) && com->iptr < com->ihighwater) { + tp->t_state &= ~TS_RTSBLOCK; outb(com->modem_ctl_port, com->mcr_image |= MCR_RTS); + } } enable_intr(); if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 0dbb43989199..9dd5840b961e 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -41,7 +41,7 @@ * into the patch kit. Added in sioselect * from com.c. Added port 4 support. */ -static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.8 1993/09/10 16:59:16 rgrimes Exp $"; +static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.9 1993/09/28 00:01:10 jkh Exp $"; #include "sio.h" #if NSIO > 0 @@ -1430,8 +1430,10 @@ comstart(tp) outb(com->modem_ctl_port, com->mcr_image &= ~MCR_RTS); } else { - if (!(com->mcr_image & MCR_RTS) && com->iptr < com->ihighwater) + if (!(com->mcr_image & MCR_RTS) && com->iptr < com->ihighwater) { + tp->t_state &= ~TS_RTSBLOCK; outb(com->modem_ctl_port, com->mcr_image |= MCR_RTS); + } } enable_intr(); if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP))