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

PDP11, VAX780, VAX8600, VAX750, VAX730: Fix second DEUNA/DELUA device which would crash the simulator when detaching. Problem reported by Jordi Guillaumes Pons.

Browse source
This commit is contained in:
Mark Pizzolato 2014-05-26 04:47:57 -07:00
parent 27a8a14927
commit 340e7eb40b
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
PDP11/pdp11_xu.c
View file

@ -235,7 +235,8 @@ DIB xub_dib = { IOBA_AUTO, IOLN_XU, &xu_rd, &xu_wr,
1, IVCL (XU), 0, { &xu_int }, IOLN_XU }; 1, IVCL (XU), 0, { &xu_int }, IOLN_XU };
UNIT xub_unit[] = { UNIT xub_unit[] = {
{ UDATA (&xu_svc, UNIT_IDLE|UNIT_ATTABLE|UNIT_DISABLE, 0) } /* receive timer */ { UDATA (&xu_svc, UNIT_IDLE|UNIT_ATTABLE|UNIT_DISABLE, 0) }, /* receive timer */
{ UDATA (&xu_tmrsvc, UNIT_IDLE|UNIT_DIS, 0) }
}; };
struct xu_device xub = { struct xu_device xub = {
@ -282,7 +283,7 @@ REG xub_reg[] = {
DEVICE xub_dev = { DEVICE xub_dev = {
"XUB", xub_unit, xub_reg, xu_mod, "XUB", xub_unit, xub_reg, xu_mod,
1, XU_RDX, 8, 1, XU_RDX, 8, 2, XU_RDX, 8, 1, XU_RDX, 8,
&xu_ex, &xu_dep, &xu_reset, &xu_ex, &xu_dep, &xu_reset,
NULL, &xu_attach, &xu_detach, NULL, &xu_attach, &xu_detach,
&xub_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_DEBUG | DEV_ETHER, &xub_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_DEBUG | DEV_ETHER,
@ -1702,14 +1703,15 @@ t_stat xu_detach(UNIT* uptr)
sim_debug(DBG_TRC, xu->dev, "xu_detach()\n"); sim_debug(DBG_TRC, xu->dev, "xu_detach()\n");
if (uptr->flags & UNIT_ATT) { if (uptr->flags & UNIT_ATT) {
sim_cancel (uptr); /* stop the receiver */
sim_cancel (uptr+1); /* stop the timer services */
eth_close (xu->var->etherface); eth_close (xu->var->etherface);
free(xu->var->etherface); free(xu->var->etherface);
xu->var->etherface = 0; xu->var->etherface = NULL;
free(uptr->filename); free(uptr->filename);
uptr->filename = NULL; uptr->filename = NULL;
uptr->flags &= ~UNIT_ATT; uptr->flags &= ~UNIT_ATT;
/* cancel service timers */
sim_cancel (uptr); /* stop the receiver */
sim_cancel (uptr+1); /* stop the timer services */
} }
return SCPE_OK; return SCPE_OK;
} }