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

PDP10, PDP11, VAX: Fix DUP and DMC devices which couldn't be disabled after having been enabled.

Browse source
This commit is contained in:
Mark Pizzolato 2014-03-19 02:06:10 -07:00
parent 4db30c13dd
commit fe005f7d36
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
PDP11/pdp11_dmc.c
View file

@ -3714,7 +3714,6 @@ if (!(dptr->flags & DEV_DIS)) {
dmc_process_master_clear(controller); dmc_process_master_clear(controller);
} }
} }
sim_activate_after (dptr->units+dptr->numunits-2, DMC_CONNECT_POLL*1000000);/* start poll */
} }
return ans; return ans;
@ -3767,8 +3766,10 @@ uptr->flags &= ~UNIT_ATT;
for (i=attached=0; i<mp->lines; i++) for (i=attached=0; i<mp->lines; i++)
if (dptr->units[i].flags & UNIT_ATT) if (dptr->units[i].flags & UNIT_ATT)
++attached; ++attached;
if (!attached) if (!attached) {
sim_cancel (dptr->units+mp->lines); /* stop poll on last detach */ sim_cancel (dptr->units+mp->lines); /* stop poll on last detach */
sim_cancel (dptr->units+(mp->lines+1)); /* stop timer on last detach */
}
free (uptr->filename); free (uptr->filename);
uptr->filename = NULL; uptr->filename = NULL;
return tmxr_detach_ln (lp); return tmxr_detach_ln (lp);

2
PDP11/pdp11_dup.c
View file

@ -1237,8 +1237,6 @@ dup_desc.dptr = DUPDPTR; /* Connect appropriate d
dup_desc.uptr = dup_units+dup_desc.lines; /* Identify polling unit */ dup_desc.uptr = dup_units+dup_desc.lines; /* Identify polling unit */
sim_cancel (dup_units+dup_desc.lines); /* stop poll */ sim_cancel (dup_units+dup_desc.lines); /* stop poll */
ndev = ((dptr->flags & DEV_DIS)? 0: dup_desc.lines ); ndev = ((dptr->flags & DEV_DIS)? 0: dup_desc.lines );
if (ndev)
sim_activate_after (dup_units+dup_desc.lines, DUP_CONNECT_POLL*1000000);
return auto_config (dptr->name, ndev); /* auto config */ return auto_config (dptr->name, ndev); /* auto config */
} }