1
0
mirror of https://github.com/simh/simh.git synced 2026-04-14 07:50:15 +00:00

PDP10, PDP11, VAX: Fix DMC & DUP unit attach strings for multi-line device configurations.

This commit is contained in:
Mark Pizzolato
2014-04-02 08:47:35 -07:00
parent e63fbdce49
commit edb475fcc1
3 changed files with 31 additions and 23 deletions

View File

@@ -3772,6 +3772,7 @@ int32 dmc = (int32)(uptr-dptr->units);
TMXR *mp = (dptr == &dmc_dev) ? &dmc_desc : &dmp_desc;
TMLN *lp = &mp->ldsc[dmc];
int32 i, attached;
t_stat r;
if (!(uptr->flags & UNIT_ATT)) /* attached? */
return SCPE_OK;
@@ -3784,9 +3785,10 @@ if (!attached) {
sim_cancel (dptr->units+mp->lines); /* stop poll on last detach */
sim_cancel (dptr->units+(mp->lines+1)); /* stop timer on last detach */
}
r = tmxr_detach_ln (lp);
free (uptr->filename);
uptr->filename = NULL;
return tmxr_detach_ln (lp);
return r;
}
char *dmc_description (DEVICE *dptr)

View File

@@ -1275,6 +1275,7 @@ DEVICE *dptr = DUPDPTR;
int32 dup = (int32)(uptr-dptr->units);
TMLN *lp = &dup_ldsc[dup];
int32 i, attached;
t_stat r;
if (!(uptr->flags & UNIT_ATT)) /* attached? */
return SCPE_OK;
@@ -1285,6 +1286,7 @@ for (i=attached=0; i<dup_desc.lines; i++)
++attached;
if (!attached)
sim_cancel (dup_units+dup_desc.lines); /* stop poll on last detach */
r = tmxr_detach_ln (lp);
free (uptr->filename);
uptr->filename = NULL;
free (dup_rcvpacket[dup]);
@@ -1295,7 +1297,7 @@ free (dup_xmtpacket[dup]);
dup_xmtpacket[dup] = NULL;
dup_xmtpksize[dup] = 0;
dup_xmtpkoffset[dup] = 0;
return tmxr_detach_ln (lp);
return r;
}
/* SET/SHOW SPEED processor */