mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-27 16:39:08 +00:00
Code Issues Releases Activity

Fixed sloppy clearing of TS_BUSY. Don't clear it until the transmitter

Browse Source 
is completely empty.  There is an interrupt for output completion.  It
is painful to use, but polling method used in the corresponding fix in
sio.c (rev.1.152) can't be used because there is no status bit for
transmitter-empty.  Now ttywait() works right.

Reminded by:	NIST-PCTS
This commit is contained in:
Bruce Evans 1998-11-28 15:48:09 +00:00
parent 4635f7acc0
commit d21c930ccb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=41388
3 changed files with 213 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
sys/dev/cy/cy.c
View File

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cy.c,v 1.74 1998/11/23 13:58:55 bde Exp $
* $Id: cy.c,v 1.75 1998/11/28 13:18:16 bde Exp $
*/
#include "opt_compat.h"
@ -200,6 +200,7 @@
#define CS_DTR_OFF 0x10 /* DTR held off */
#define CS_ODONE 4 /* output completed */
#define CS_RTS_IFLOW 8 /* use RTS input flow control */
#define CSE_ODONE 1 /* output transmitted */
static char const * const error_desc[] = {
#define CE_OVERRUN 0
@ -231,6 +232,9 @@ struct com_s {
bool_t active_out; /* nonzero if the callout device is open */
#if 0
u_char cfcr_image; /* copy of value written to CFCR */
#endif
u_char extra_state; /* more flag bits, separate for order trick */
#if 0
u_char fifo_image; /* copy of value written to FIFO */
#endif
u_char gfrcr_image; /* copy of value read from GFRCR */
@ -1280,7 +1284,9 @@ siointr(unit)
cd_outb(iobase, CD1400_SRER,
cy_align,
com->intr_enable
|= CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
} else {
com->state &= ~CS_ODEVREADY;
if (com->intr_enable
@ -1288,7 +1294,9 @@ siointr(unit)
cd_outb(iobase, CD1400_SRER,
cy_align,
com->intr_enable
&= ~CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
}
}
#endif
@ -1331,6 +1339,17 @@ siointr(unit)
& CD1400_xIVR_CHAN));
#endif
if (com->intr_enable & CD1400_SRER_TXMPTY) {
if (!(com->extra_state & CSE_ODONE)) {
com_events += LOTS_OF_EVENTS;
com->extra_state |= CSE_ODONE;
setsofttty();
}
cd_outb(iobase, CD1400_SRER, cy_align,
com->intr_enable
&= ~CD1400_SRER_TXMPTY);
goto terminate_tx_service;
}
if (com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)) {
u_char *ioptr;
u_int ocount;
@ -1358,9 +1377,24 @@ siointr(unit)
} else {
/* output just completed */
com->state &= ~CS_BUSY;
/*
* The setting of CSE_ODONE may be
* stale here. We currently only
* use it when CS_BUSY is set, and
* fixing it when we clear CS_BUSY
* is easiest.
*/
if (com->extra_state & CSE_ODONE) {
com_events -= LOTS_OF_EVENTS;
com->extra_state &= ~CSE_ODONE;
}
cd_outb(iobase, CD1400_SRER, cy_align,
com->intr_enable
&= ~CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
}
if (!(com->state & CS_ODONE)) {
com_events += LOTS_OF_EVENTS;
@ -1373,6 +1407,7 @@ siointr(unit)
}
/* terminate service context */
terminate_tx_service:
#ifdef PollMode
cd_outb(iobase, CD1400_TIR, cy_align,
save_tir
@ -1651,11 +1686,19 @@ siopoll()
disable_intr();
com_events -= LOTS_OF_EVENTS;
com->state &= ~CS_ODONE;
if (!(com->state & CS_BUSY))
com->tp->t_state &= ~TS_BUSY;
enable_intr();
(*linesw[tp->t_line].l_start)(tp);
}
if (com->extra_state & CSE_ODONE) {
disable_intr();
com_events -= LOTS_OF_EVENTS;
com->extra_state &= ~CSE_ODONE;
enable_intr();
if (!(com->state & CS_BUSY)) {
tp->t_state &= ~TS_BUSY;
ttwwakeup(com->tp);
}
}
if (incc <= 0 || !(tp->t_state & TS_ISOPEN))
continue;
/*
@ -2049,11 +2092,15 @@ comparam(tp, t)
if (com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)) {
if (!(com->intr_enable & CD1400_SRER_TXRDY))
cd_setreg(com, CD1400_SRER,
com->intr_enable |= CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
} else {
if (com->intr_enable & CD1400_SRER_TXRDY)
cd_setreg(com, CD1400_SRER,
com->intr_enable &= ~CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
}
enable_intr();
@ -2087,13 +2134,17 @@ comstart(tp)
com->state &= ~CS_TTGO;
if (com->intr_enable & CD1400_SRER_TXRDY)
cd_setreg(com, CD1400_SRER,
com->intr_enable &= ~CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
} else {
com->state |= CS_TTGO;
if (com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)
&& !(com->intr_enable & CD1400_SRER_TXRDY))
cd_setreg(com, CD1400_SRER,
com->intr_enable |= CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
}
if (tp->t_state & TS_TBLOCK) {
if (com->mcr_image & com->mcr_rts && com->state & CS_RTS_IFLOW)
@ -2148,7 +2199,9 @@ comstart(tp)
| CS_ODEVREADY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
|= CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
}
enable_intr();
}
@ -2176,7 +2229,9 @@ comstart(tp)
| CS_ODEVREADY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
|= CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
}
enable_intr();
}
@ -2211,6 +2266,10 @@ siostop(tp, rw)
if (com->state & CS_ODONE)
com_events -= LOTS_OF_EVENTS;
com->state &= ~(CS_ODONE | CS_BUSY);
if (com->extra_state & CSE_ODONE) {
com_events -= LOTS_OF_EVENTS;
com->extra_state &= ~CSE_ODONE;
}
com->tp->t_state &= ~TS_BUSY;
}
if (rw & FREAD) {

83
sys/dev/cy/cy_isa.c
View File

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cy.c,v 1.74 1998/11/23 13:58:55 bde Exp $
* $Id: cy.c,v 1.75 1998/11/28 13:18:16 bde Exp $
*/
#include "opt_compat.h"
@ -200,6 +200,7 @@
#define CS_DTR_OFF 0x10 /* DTR held off */
#define CS_ODONE 4 /* output completed */
#define CS_RTS_IFLOW 8 /* use RTS input flow control */
#define CSE_ODONE 1 /* output transmitted */
static char const * const error_desc[] = {
#define CE_OVERRUN 0
@ -231,6 +232,9 @@ struct com_s {
bool_t active_out; /* nonzero if the callout device is open */
#if 0
u_char cfcr_image; /* copy of value written to CFCR */
#endif
u_char extra_state; /* more flag bits, separate for order trick */
#if 0
u_char fifo_image; /* copy of value written to FIFO */
#endif
u_char gfrcr_image; /* copy of value read from GFRCR */
@ -1280,7 +1284,9 @@ siointr(unit)
cd_outb(iobase, CD1400_SRER,
cy_align,
com->intr_enable
|= CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
} else {
com->state &= ~CS_ODEVREADY;
if (com->intr_enable
@ -1288,7 +1294,9 @@ siointr(unit)
cd_outb(iobase, CD1400_SRER,
cy_align,
com->intr_enable
&= ~CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
}
}
#endif
@ -1331,6 +1339,17 @@ siointr(unit)
& CD1400_xIVR_CHAN));
#endif
if (com->intr_enable & CD1400_SRER_TXMPTY) {
if (!(com->extra_state & CSE_ODONE)) {
com_events += LOTS_OF_EVENTS;
com->extra_state |= CSE_ODONE;
setsofttty();
}
cd_outb(iobase, CD1400_SRER, cy_align,
com->intr_enable
&= ~CD1400_SRER_TXMPTY);
goto terminate_tx_service;
}
if (com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)) {
u_char *ioptr;
u_int ocount;
@ -1358,9 +1377,24 @@ siointr(unit)
} else {
/* output just completed */
com->state &= ~CS_BUSY;
/*
* The setting of CSE_ODONE may be
* stale here. We currently only
* use it when CS_BUSY is set, and
* fixing it when we clear CS_BUSY
* is easiest.
*/
if (com->extra_state & CSE_ODONE) {
com_events -= LOTS_OF_EVENTS;
com->extra_state &= ~CSE_ODONE;
}
cd_outb(iobase, CD1400_SRER, cy_align,
com->intr_enable
&= ~CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
}
if (!(com->state & CS_ODONE)) {
com_events += LOTS_OF_EVENTS;
@ -1373,6 +1407,7 @@ siointr(unit)
}
/* terminate service context */
terminate_tx_service:
#ifdef PollMode
cd_outb(iobase, CD1400_TIR, cy_align,
save_tir
@ -1651,11 +1686,19 @@ siopoll()
disable_intr();
com_events -= LOTS_OF_EVENTS;
com->state &= ~CS_ODONE;
if (!(com->state & CS_BUSY))
com->tp->t_state &= ~TS_BUSY;
enable_intr();
(*linesw[tp->t_line].l_start)(tp);
}
if (com->extra_state & CSE_ODONE) {
disable_intr();
com_events -= LOTS_OF_EVENTS;
com->extra_state &= ~CSE_ODONE;
enable_intr();
if (!(com->state & CS_BUSY)) {
tp->t_state &= ~TS_BUSY;
ttwwakeup(com->tp);
}
}
if (incc <= 0 || !(tp->t_state & TS_ISOPEN))
continue;
/*
@ -2049,11 +2092,15 @@ comparam(tp, t)
if (com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)) {
if (!(com->intr_enable & CD1400_SRER_TXRDY))
cd_setreg(com, CD1400_SRER,
com->intr_enable |= CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
} else {
if (com->intr_enable & CD1400_SRER_TXRDY)
cd_setreg(com, CD1400_SRER,
com->intr_enable &= ~CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
}
enable_intr();
@ -2087,13 +2134,17 @@ comstart(tp)
com->state &= ~CS_TTGO;
if (com->intr_enable & CD1400_SRER_TXRDY)
cd_setreg(com, CD1400_SRER,
com->intr_enable &= ~CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
} else {
com->state |= CS_TTGO;
if (com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)
&& !(com->intr_enable & CD1400_SRER_TXRDY))
cd_setreg(com, CD1400_SRER,
com->intr_enable |= CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
}
if (tp->t_state & TS_TBLOCK) {
if (com->mcr_image & com->mcr_rts && com->state & CS_RTS_IFLOW)
@ -2148,7 +2199,9 @@ comstart(tp)
| CS_ODEVREADY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
|= CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
}
enable_intr();
}
@ -2176,7 +2229,9 @@ comstart(tp)
| CS_ODEVREADY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
|= CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
}
enable_intr();
}
@ -2211,6 +2266,10 @@ siostop(tp, rw)
if (com->state & CS_ODONE)
com_events -= LOTS_OF_EVENTS;
com->state &= ~(CS_ODONE | CS_BUSY);
if (com->extra_state & CSE_ODONE) {
com_events -= LOTS_OF_EVENTS;
com->extra_state &= ~CSE_ODONE;
}
com->tp->t_state &= ~TS_BUSY;
}
if (rw & FREAD) {

83
sys/i386/isa/cy.c
View File

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cy.c,v 1.74 1998/11/23 13:58:55 bde Exp $
* $Id: cy.c,v 1.75 1998/11/28 13:18:16 bde Exp $
*/
#include "opt_compat.h"
@ -200,6 +200,7 @@
#define CS_DTR_OFF 0x10 /* DTR held off */
#define CS_ODONE 4 /* output completed */
#define CS_RTS_IFLOW 8 /* use RTS input flow control */
#define CSE_ODONE 1 /* output transmitted */
static char const * const error_desc[] = {
#define CE_OVERRUN 0
@ -231,6 +232,9 @@ struct com_s {
bool_t active_out; /* nonzero if the callout device is open */
#if 0
u_char cfcr_image; /* copy of value written to CFCR */
#endif
u_char extra_state; /* more flag bits, separate for order trick */
#if 0
u_char fifo_image; /* copy of value written to FIFO */
#endif
u_char gfrcr_image; /* copy of value read from GFRCR */
@ -1280,7 +1284,9 @@ siointr(unit)
cd_outb(iobase, CD1400_SRER,
cy_align,
com->intr_enable
|= CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
} else {
com->state &= ~CS_ODEVREADY;
if (com->intr_enable
@ -1288,7 +1294,9 @@ siointr(unit)
cd_outb(iobase, CD1400_SRER,
cy_align,
com->intr_enable
&= ~CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
}
}
#endif
@ -1331,6 +1339,17 @@ siointr(unit)
& CD1400_xIVR_CHAN));
#endif
if (com->intr_enable & CD1400_SRER_TXMPTY) {
if (!(com->extra_state & CSE_ODONE)) {
com_events += LOTS_OF_EVENTS;
com->extra_state |= CSE_ODONE;
setsofttty();
}
cd_outb(iobase, CD1400_SRER, cy_align,
com->intr_enable
&= ~CD1400_SRER_TXMPTY);
goto terminate_tx_service;
}
if (com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)) {
u_char *ioptr;
u_int ocount;
@ -1358,9 +1377,24 @@ siointr(unit)
} else {
/* output just completed */
com->state &= ~CS_BUSY;
/*
* The setting of CSE_ODONE may be
* stale here. We currently only
* use it when CS_BUSY is set, and
* fixing it when we clear CS_BUSY
* is easiest.
*/
if (com->extra_state & CSE_ODONE) {
com_events -= LOTS_OF_EVENTS;
com->extra_state &= ~CSE_ODONE;
}
cd_outb(iobase, CD1400_SRER, cy_align,
com->intr_enable
&= ~CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
}
if (!(com->state & CS_ODONE)) {
com_events += LOTS_OF_EVENTS;
@ -1373,6 +1407,7 @@ siointr(unit)
}
/* terminate service context */
terminate_tx_service:
#ifdef PollMode
cd_outb(iobase, CD1400_TIR, cy_align,
save_tir
@ -1651,11 +1686,19 @@ siopoll()
disable_intr();
com_events -= LOTS_OF_EVENTS;
com->state &= ~CS_ODONE;
if (!(com->state & CS_BUSY))
com->tp->t_state &= ~TS_BUSY;
enable_intr();
(*linesw[tp->t_line].l_start)(tp);
}
if (com->extra_state & CSE_ODONE) {
disable_intr();
com_events -= LOTS_OF_EVENTS;
com->extra_state &= ~CSE_ODONE;
enable_intr();
if (!(com->state & CS_BUSY)) {
tp->t_state &= ~TS_BUSY;
ttwwakeup(com->tp);
}
}
if (incc <= 0 || !(tp->t_state & TS_ISOPEN))
continue;
/*
@ -2049,11 +2092,15 @@ comparam(tp, t)
if (com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)) {
if (!(com->intr_enable & CD1400_SRER_TXRDY))
cd_setreg(com, CD1400_SRER,
com->intr_enable |= CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
} else {
if (com->intr_enable & CD1400_SRER_TXRDY)
cd_setreg(com, CD1400_SRER,
com->intr_enable &= ~CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
}
enable_intr();
@ -2087,13 +2134,17 @@ comstart(tp)
com->state &= ~CS_TTGO;
if (com->intr_enable & CD1400_SRER_TXRDY)
cd_setreg(com, CD1400_SRER,
com->intr_enable &= ~CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXRDY
| CD1400_SRER_TXMPTY);
} else {
com->state |= CS_TTGO;
if (com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)
&& !(com->intr_enable & CD1400_SRER_TXRDY))
cd_setreg(com, CD1400_SRER,
com->intr_enable |= CD1400_SRER_TXRDY);
com->intr_enable
= com->intr_enable & ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
}
if (tp->t_state & TS_TBLOCK) {
if (com->mcr_image & com->mcr_rts && com->state & CS_RTS_IFLOW)
@ -2148,7 +2199,9 @@ comstart(tp)
| CS_ODEVREADY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
|= CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
}
enable_intr();
}
@ -2176,7 +2229,9 @@ comstart(tp)
| CS_ODEVREADY))
cd_setreg(com, CD1400_SRER,
com->intr_enable
|= CD1400_SRER_TXRDY);
= com->intr_enable
& ~CD1400_SRER_TXMPTY
| CD1400_SRER_TXRDY);
}
enable_intr();
}
@ -2211,6 +2266,10 @@ siostop(tp, rw)
if (com->state & CS_ODONE)
com_events -= LOTS_OF_EVENTS;
com->state &= ~(CS_ODONE | CS_BUSY);
if (com->extra_state & CSE_ODONE) {
com_events -= LOTS_OF_EVENTS;
com->extra_state &= ~CSE_ODONE;
}
com->tp->t_state &= ~TS_BUSY;
}
if (rw & FREAD) {