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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Mark Pizzolato 2013-07-10 12:04:23 -10:00
commit 95e54dc60e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PDP11/pdp11_dl.c
View file

@ -160,7 +160,7 @@ DEVICE dli_dev = {
1, 10, 31, 1, 8, 8,
NULL, NULL, &dlx_reset,
NULL, &dlx_attach, &dlx_detach,
&dli_dib, DEV_UBUS | DEV_QBUS | DEV_DISABLE | DEV_DIS
&dli_dib, DEV_UBUS | DEV_QBUS | DEV_DISABLE | DEV_DIS | DEV_MUX
};
/* DLO data structures
@ -219,7 +219,7 @@ DEVICE dlo_dev = {
DLX_LINES, 10, 31, 1, 8, 8,
NULL, NULL, &dlx_reset,
NULL, NULL, NULL,
NULL, DEV_UBUS | DEV_QBUS | DEV_DISABLE | DEV_DIS | DEV_MUX
NULL, DEV_UBUS | DEV_QBUS | DEV_DISABLE | DEV_DIS
};
/* Terminal input routines */

3
scp.c
View file

@ -3664,7 +3664,8 @@ if (uptr->flags & UNIT_ATT) /* already attached? */
return r;
}
else
return SCPE_ALATT; /* Already attached */
if (!(uptr->dynflags & UNIT_ATTMULT))
return SCPE_ALATT; /* Already attached */
sim_trim_endspc (cptr); /* trim trailing spc */
return scp_attach_unit (dptr, uptr, cptr); /* attach */
}