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

Fixed bug in pdp11_xu which inhibited it from being disabled after it was ever enabled (reported by Rob Jarratt)

Browse source
This commit is contained in:
Mark Pizzolato 2012-12-08 07:13:05 -08:00
parent 42b7bed6f5
commit badde9b852
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
PDP11/pdp11_xu.c
View file

@ -674,17 +674,15 @@ t_stat xu_sw_reset (CTLR* xu)
for (i=0; i<6; i++) for (i=0; i<6; i++)
xu->var->setup.macs[1][i] = 0xff; /* Broadcast Address */ xu->var->setup.macs[1][i] = 0xff; /* Broadcast Address */
xu->var->setup.mac_count = 2; xu->var->setup.mac_count = 2;
if (xu->var->etherface) if (xu->var->etherface) {
eth_filter (xu->var->etherface, xu->var->setup.mac_count, eth_filter (xu->var->etherface, xu->var->setup.mac_count,
xu->var->setup.macs, xu->var->setup.multicast, xu->var->setup.macs, xu->var->setup.multicast,
xu->var->setup.promiscuous); xu->var->setup.promiscuous);
/* activate device if not disabled */ /* activate device */
if ((xu->dev->flags & DEV_DIS) == 0) {
sim_activate_abs(&xu->unit[0], clk_cosched (tmxr_poll)); sim_activate_abs(&xu->unit[0], clk_cosched (tmxr_poll));
/* start service timer */ /* start service timer */
if (xu->var->etherface)
sim_activate_abs(&xu->unit[1], tmr_poll * clk_tps); sim_activate_abs(&xu->unit[1], tmr_poll * clk_tps);
} }
@ -1622,6 +1620,8 @@ 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 = 0;