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

PDP11: Fix DLI(DL11) and TDC(TU58) devices to be limited to a total of 16 devices between them

Browse source
This commit is contained in:
Mark Pizzolato 2016-01-06 08:09:50 -08:00
parent 3e3c05523c
commit 4ff1e317ac
2 changed files with 51 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
PDP11/pdp11_dl.c
View file

@ -591,6 +591,18 @@ sim_cancel (uptr); /* stop poll */
return r; return r;
} }
/* Number of DL devices used by TU58 */
t_value dlx_tu58_count (void)
{
DEVICE *td_dptr = find_dev ("TDC");
if ((td_dptr == NULL) ||
(td_dptr->flags & DEV_DIS))
return 0;
return (t_value)((DIB *)td_dptr->ctxt)->numc;
}
/* Enable/disable device */ /* Enable/disable device */
void dlx_enbdis (int32 dis) void dlx_enbdis (int32 dis)
@ -600,8 +612,17 @@ if (dis) {
dlo_dev.flags = dlo_dev.flags | DEV_DIS; dlo_dev.flags = dlo_dev.flags | DEV_DIS;
} }
else { else {
dli_dev.flags = dli_dev.flags & ~DEV_DIS; if (((dli_dev.flags & DEV_DIS) || (dlo_dev.flags & DEV_DIS)) &&
dlo_dev.flags = dlo_dev.flags & ~DEV_DIS; (dlx_tu58_count() < 16)) {
if ((dlx_desc.lines + dlx_tu58_count()) > 16)
dlx_desc.lines = 16 - dlx_tu58_count();
dli_dev.flags = dli_dev.flags & ~DEV_DIS;
dlo_dev.flags = dlo_dev.flags & ~DEV_DIS;
}
else {
dli_dev.flags = dli_dev.flags | DEV_DIS;
dlo_dev.flags = dlo_dev.flags | DEV_DIS;
}
} }
return; return;
} }
@ -615,7 +636,7 @@ t_stat r;
if (cptr == NULL) if (cptr == NULL)
return SCPE_ARG; return SCPE_ARG;
newln = get_uint (cptr, 10, DLX_LINES, &r); newln = get_uint (cptr, 10, DLX_LINES - dlx_tu58_count(), &r);
if ((r != SCPE_OK) || (newln == dlx_desc.lines)) if ((r != SCPE_OK) || (newln == dlx_desc.lines))
return r; return r;
if (newln == 0) if (newln == 0)

28
PDP11/pdp11_td.c
View file

@ -1358,6 +1358,21 @@ static t_stat td_reset (DEVICE *dptr)
{ {
CTLR *ctlr; CTLR *ctlr;
int ctl; int ctl;
static t_bool td_enabled_reset = FALSE;
if (dptr->flags & DEV_DIS)
td_enabled_reset = FALSE;
else {
/* When the TDC device is just being enabled, */
if (!td_enabled_reset) {
char num[16];
td_enabled_reset = TRUE;
/* make sure to bound the number of DLI devices */
sprintf (num, "%d", td_ctrls);
td_set_ctrls (dptr->units, 0, num, NULL);
}
}
sim_debug (TDDEB_INT, dptr, "td_reset()\n"); sim_debug (TDDEB_INT, dptr, "td_reset()\n");
for (ctl=0; ctl<TD_NUMCTLR; ctl++) { for (ctl=0; ctl<TD_NUMCTLR; ctl++) {
@ -1396,11 +1411,12 @@ static t_stat td_set_ctrls (UNIT *uptr, int32 val, char *cptr, void *desc)
{ {
int32 newln, i; int32 newln, i;
t_stat r; t_stat r;
DEVICE *dli_dptr = find_dev ("DLI");
if (cptr == NULL) if (cptr == NULL)
return SCPE_ARG; return SCPE_ARG;
newln = (int32)get_uint (cptr, 10, TD_NUMCTLR, &r); newln = (int32)get_uint (cptr, 10, TD_NUMCTLR, &r);
if ((r != SCPE_OK) || (newln == td_ctrls)) if (r != SCPE_OK)
return r; return r;
if (newln == 0) if (newln == 0)
return SCPE_ARG; return SCPE_ARG;
@ -1412,6 +1428,16 @@ if (newln < td_ctrls) {
} }
td_ctrls = newln; td_ctrls = newln;
td_dib.lnt = td_ctrls * td_dib.ulnt; /* upd IO page lnt */ td_dib.lnt = td_ctrls * td_dib.ulnt; /* upd IO page lnt */
/* Make sure that the number of TU58 controllers plus DL devices is 16 or less */
if ((dli_dptr != NULL) && !(dli_dptr->flags & DEV_DIS) &&
((((DIB *)dli_dptr->ctxt)->numc + td_ctrls) > 16)) {
dli_dptr->flags |= DEV_DIS;
dli_dptr->reset (dli_dptr);
if (td_ctrls < 16) {
dli_dptr->flags &= ~DEV_DIS;
dli_dptr->reset (dli_dptr);
}
}
return td_reset (&tdc_dev); return td_reset (&tdc_dev);
} }