github.com/rcornwell.sims
1
0
Fork 0
mirror of https://github.com/rcornwell/sims.git synced 2026-01-22 10:31:12 +00:00
Code Releases Activity

KA10: Terminal controller fixes.

Browse Source 
- Don't mess with txdone.
- Declare which unit lines are associated with.
- Don't set UNIT_DISABLE.
This commit is contained in:
Lars Brinkhoff 2019-09-03 20:31:12 +02:00
parent 5e4784be36
commit 4fb4ec6d0b
3 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PDP10/ka10_dpk.c
View File

@ -86,7 +86,7 @@ static int dpk_ird = 0;
static int dpk_iwr = 0;
UNIT dpk_unit[] = {
{UDATA(dpk_svc, TT_MODE_8B|UNIT_IDLE|UNIT_ATTABLE|UNIT_DISABLE, 0)}, /* 0 */
{UDATA(dpk_svc, TT_MODE_8B|UNIT_IDLE|UNIT_ATTABLE, 0)}, /* 0 */
};
DIB dpk_dib = {DPK_DEVNUM, 1, &dpk_devio, NULL};
@ -249,8 +249,10 @@ static int dpk_output (int port, TMLN *lp)
}
ch = ildb (&M[dpk_base + 2*port + 1]);
ch = sim_tt_outcvt(ch & 0377, TT_GET_MODE (dpk_unit[0].flags));
tmxr_putc_ln (lp, ch);
if (lp->conn) {
ch = sim_tt_outcvt(ch & 0377, TT_GET_MODE (dpk_unit[0].flags));
tmxr_putc_ln (lp, ch);
}
count = M[dpk_base + 2*port] - 1;
M[dpk_base + 2*port] = count & 0777777777777LL;
@ -308,6 +310,8 @@ static t_stat dpk_svc (UNIT *uptr)
static t_stat dpk_reset (DEVICE *dptr)
{
int i;
sim_debug(DEBUG_CMD, &dpk_dev, "Reset\n");
if (dpk_unit->flags & UNIT_ATT)
sim_activate (dpk_unit, tmxr_poll);
@ -321,6 +325,11 @@ static t_stat dpk_reset (DEVICE *dptr)
memset (dpk_port, 0, sizeof dpk_port);
clr_interrupt(DPK_DEVNUM);
for (i = 0; i < DPK_LINES; i++) {
tmxr_set_line_unit (&dpk_desc, i, dpk_unit);
tmxr_set_line_output_unit (&dpk_desc, i, dpk_unit);
}
return SCPE_OK;
}
@ -333,9 +342,6 @@ static t_stat dpk_attach (UNIT *uptr, CONST char *cptr)
for (i = 0; i < DPK_LINES; i++) {
dpk_ldsc[i].rcve = 0;
dpk_ldsc[i].xmte = 0;
/* Clear txdone so tmxr_txdone_ln will not return return true
on the first call. */
dpk_ldsc[i].txdone = 0;
}
if (stat == SCPE_OK)
sim_activate (uptr, tmxr_poll);

37
PDP10/ka10_mty.c
View File

@ -65,7 +65,7 @@ TMXR mty_desc = { MTY_LINES, 0, 0, mty_ldsc };
static uint64 status = 0;
UNIT mty_unit[] = {
{UDATA(mty_svc, TT_MODE_7B|UNIT_IDLE|UNIT_ATTABLE|UNIT_DISABLE, 0)}, /* 0 */
{UDATA(mty_svc, TT_MODE_7B|UNIT_IDLE|UNIT_ATTABLE, 0)}, /* 0 */
};
DIB mty_dib = {MTY_DEVNUM, 1, &mty_devio, NULL};
@ -107,9 +107,6 @@ static t_stat mty_devio(uint32 dev, uint64 *data)
line = (status & MTY_LINE) >> 12;
if (*data & MTY_STOP) {
status &= ~MTY_ODONE;
/* Set txdone so future calls to tmxr_txdone_ln will
return -1 rather than 1. */
mty_ldsc[line].txdone = 1;
sim_debug(DEBUG_CMD, &mty_dev, "Clear output done line %d\n",
line);
}
@ -132,18 +129,15 @@ static t_stat mty_devio(uint32 dev, uint64 *data)
sim_debug(DEBUG_DATAIO, &mty_dev, "DATAO line %d -> %012llo\n",
line, *data);
lp = &mty_ldsc[line];
if (!mty_ldsc[line].conn)
/* If the line isn't connected, clear txdone to force
tmxr_txdone_ln to return 1 rather than -1. */
mty_ldsc[line].txdone = 0;
/* Write up to five characters extracted from a word. NUL can
only be in the first character. */
ch = (word >> 29) & 0177;
tmxr_putc_ln (lp, sim_tt_outcvt(ch, TT_GET_MODE (mty_unit[0].flags)));
while ((ch = (word >> 22) & 0177) != 0) {
if (mty_ldsc[line].conn) {
/* Write up to five characters extracted from a word. NUL can
only be in the first character. */
ch = (word >> 29) & 0177;
tmxr_putc_ln (lp, sim_tt_outcvt(ch, TT_GET_MODE (mty_unit[0].flags)));
word <<= 7;
while ((ch = (word >> 22) & 0177) != 0) {
tmxr_putc_ln (lp, sim_tt_outcvt(ch, TT_GET_MODE (mty_unit[0].flags)));
word <<= 7;
}
}
status &= ~MTY_ODONE;
break;
@ -178,9 +172,6 @@ static t_stat mty_svc (UNIT *uptr)
mty_ldsc[i].conn = 1;
mty_ldsc[i].rcve = 1;
mty_ldsc[i].xmte = 1;
/* Set txdone so tmxr_txdone_ln will not return return 1 on
the first call after a new connection. */
mty_ldsc[i].txdone = 1;
sim_debug(DEBUG_CMD, &mty_dev, "Connect %d\n", i);
}
@ -220,6 +211,8 @@ static t_stat mty_svc (UNIT *uptr)
static t_stat mty_reset (DEVICE *dptr)
{
int i;
sim_debug(DEBUG_CMD, &mty_dev, "Reset\n");
if (mty_unit->flags & UNIT_ATT)
sim_activate (mty_unit, tmxr_poll);
@ -229,6 +222,11 @@ static t_stat mty_reset (DEVICE *dptr)
status = 0;
clr_interrupt(MTY_DEVNUM);
for (i = 0; i < MTY_LINES; i++) {
tmxr_set_line_unit (&mty_desc, i, mty_unit);
tmxr_set_line_output_unit (&mty_desc, i, mty_unit);
}
return SCPE_OK;
}
@ -241,9 +239,6 @@ static t_stat mty_attach (UNIT *uptr, CONST char *cptr)
for (i = 0; i < MTY_LINES; i++) {
mty_ldsc[i].rcve = 0;
mty_ldsc[i].xmte = 0;
/* Set txdone so tmxr_txdone_ln will not return return 1 on
the first call. */
mty_ldsc[i].txdone = 1;
}
if (stat == SCPE_OK) {
status = 0;

30
PDP10/ka10_tk10.c
View File

@ -69,7 +69,7 @@ TMXR tk10_desc = { TK10_LINES, 0, 0, tk10_ldsc };
static uint64 status = 0;
UNIT tk10_unit[] = {
{UDATA(tk10_svc, TT_MODE_7B|UNIT_IDLE|UNIT_ATTABLE|UNIT_DISABLE, 0)}, /* 0 */
{UDATA(tk10_svc, TT_MODE_7B|UNIT_IDLE|UNIT_ATTABLE, 0)}, /* 0 */
};
DIB tk10_dib = {TK10_DEVNUM, 1, &tk10_devio, NULL};
@ -115,9 +115,6 @@ static t_stat tk10_devio(uint32 dev, uint64 *data)
status &= ~TK10_ODONE;
if (!(status & TK10_IDONE))
status &= ~TK10_INT;
/* Set txdone so future calls to tmxr_txdone_ln will
return -1 rather than 1. */
tk10_ldsc[(status & TK10_TYO) >> 12].txdone = 1;
sim_debug(DEBUG_CMD, &tk10_dev, "Clear output done port %lld\n",
(status & TK10_TYO) >> 12);
}
@ -144,13 +141,11 @@ static t_stat tk10_devio(uint32 dev, uint64 *data)
port = (status & TK10_TYO) >> 12;
sim_debug(DEBUG_DATAIO, &tk10_dev, "DATAO port %d -> %012llo\n",
port, *data);
lp = &tk10_ldsc[port];
ch = sim_tt_outcvt(*data & 0377, TT_GET_MODE (tk10_unit[0].flags));
if (!tk10_ldsc[port].conn)
/* If the port isn't connected, clear txdone to force
tmxr_txdone_ln to return 1 rather than -1. */
tk10_ldsc[port].txdone = 0;
tmxr_putc_ln (lp, ch);
if (tk10_ldsc[port].conn) {
lp = &tk10_ldsc[port];
ch = sim_tt_outcvt(*data & 0377, TT_GET_MODE (tk10_unit[0].flags));
tmxr_putc_ln (lp, ch);
}
status &= ~TK10_ODONE;
if (!(status & TK10_IDONE)) {
status &= ~TK10_INT;
@ -192,9 +187,6 @@ static t_stat tk10_svc (UNIT *uptr)
tk10_ldsc[i].conn = 1;
tk10_ldsc[i].rcve = 1;
tk10_ldsc[i].xmte = 1;
/* Set txdone so tmxr_txdone_ln will not return return 1 on
the first call after a new connection. */
tk10_ldsc[i].txdone = 1;
sim_debug(DEBUG_CMD, &tk10_dev, "Connect %d\n", i);
}
@ -244,6 +236,8 @@ static t_stat tk10_svc (UNIT *uptr)
static t_stat tk10_reset (DEVICE *dptr)
{
int i;
sim_debug(DEBUG_CMD, &tk10_dev, "Reset\n");
if (tk10_unit->flags & UNIT_ATT)
sim_activate (tk10_unit, tmxr_poll);
@ -253,6 +247,11 @@ static t_stat tk10_reset (DEVICE *dptr)
status = 0;
clr_interrupt(TK10_DEVNUM);
for (i = 0; i < TK10_LINES; i++) {
tmxr_set_line_unit (&tk10_desc, i, tk10_unit);
tmxr_set_line_output_unit (&tk10_desc, i, tk10_unit);
}
return SCPE_OK;
}
@ -265,9 +264,6 @@ static t_stat tk10_attach (UNIT *uptr, CONST char *cptr)
for (i = 0; i < TK10_LINES; i++) {
tk10_ldsc[i].rcve = 0;
tk10_ldsc[i].xmte = 0;
/* Set txdone so tmxr_txdone_ln will not return return 1 on
the first call. */
tk10_ldsc[i].txdone = 1;
}
if (stat == SCPE_OK) {
status = TK10_GO;