folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PDP11, VAX: Fix VH output rate throttling as buffer fills

Browse source 
As reported in #588
This commit is contained in:
Mark Pizzolato 2018-06-14 00:31:01 -07:00
parent 0a7c9de1e1
commit 7cd9b89546
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
PDP11/pdp11_vh.c
View file

@ -1121,13 +1121,15 @@ static t_stat vh_wr ( int32 ldata,
(lp->txchar & ~0377) | (data & 0377); (lp->txchar & ~0377) | (data & 0377);
lp->txchar = data; /* TXCHAR */ lp->txchar = data; /* TXCHAR */
if (lp->txchar & TXCHAR_TX_DATA_VALID) { if (lp->txchar & TXCHAR_TX_DATA_VALID) {
if (lp->tbuf2 & TB2_TX_ENA) if (lp->tbuf2 & TB2_TX_ENA) {
vh_putc (vh, lp, if (vh_putc (vh, lp, CSR_GETCHAN (vh_csr[vh]),
CSR_GETCHAN (vh_csr[vh]), lp->txchar) != SCPE_STALL) {
lp->txchar); q_tx_report (vh, CSR_GETCHAN (vh_csr[vh]) << CSR_V_TX_LINE);
q_tx_report (vh, lp->txchar &= ~TXCHAR_TX_DATA_VALID;
CSR_GETCHAN (vh_csr[vh]) << CSR_V_TX_LINE); }
lp->txchar &= ~TXCHAR_TX_DATA_VALID; else
sim_activate_after_abs (vh_unit, lp->tmln->txdeltausecs);
}
} }
} }
break; break;
@ -1406,10 +1408,26 @@ static t_stat vh_svc ( UNIT *uptr )
((lp->lstat >> 8) & 0376)); ((lp->lstat >> 8) & 0376));
/* BUG: should check for overflow above */ /* BUG: should check for overflow above */
} }
/* scan all muxes, lines for DMA to complete; start every 3.12ms */ /* scan all muxes lines */
for (vh = 0; vh < vh_desc.lines/VH_LINES; vh++) { for (vh = 0; vh < vh_desc.lines/VH_LINES; vh++) {
for (i = 0; i < VH_LINES; i++) for (i = 0; i < VH_LINES; i++) {
int32 line = (vh * VH_LINES) + i;
TMLX *lp = &vh_parm[line];
/* process any pending programmed output */
if (lp->txchar & TXCHAR_TX_DATA_VALID) {
if (lp->tbuf2 & TB2_TX_ENA) {
if (vh_putc (vh, lp, CSR_GETCHAN (vh_csr[vh]),
lp->txchar) != SCPE_STALL) {
q_tx_report (vh,
CSR_GETCHAN (vh_csr[vh]) << CSR_V_TX_LINE);
lp->txchar &= ~TXCHAR_TX_DATA_VALID;
}
}
}
/* process pending DMA */
doDMA (vh, i); doDMA (vh, i);
}
} }
/* interrupt driven in a real DHQ */ /* interrupt driven in a real DHQ */
tmxr_poll_rx (&vh_desc); tmxr_poll_rx (&vh_desc);