Skip to content

SCP: Add a -F option to SET <dev> DISABLE command to force detach and cancel #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SCP: Add a -F option to SET <dev> DISABLE command to force detach and cancel #492

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions scp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,9 @@ static const char simh_help2[] =
" specified device from the configuration. A DISABLED device is invisible\n"
" to running programs. The device can still be RESET, but it cannot be\n"
" ATTAChed, DETACHed, or BOOTed. SET <device> ENABLED restores a disabled\n"
" device to a configuration.\n\n"
" device to a configuration. The SET <device> DISABLED command has an\n"
" optional -F switch which will force units to be detached and removed from\n"
" the event queue.\n\n"
" Most multi-unit devices allow units to be enabled or disabled:\n\n"
"++SET <unit> ENABLED\n"
"++SET <unit> DISABLED\n\n"
Expand Down Expand Up @@ -6108,8 +6110,12 @@ else {
return SCPE_OK;
for (i = 0; i < dptr->numunits; i++) { /* check units */
up = (dptr->units) + i; /* att or active? */
if ((up->flags & UNIT_ATT) || sim_is_active (up))
return sim_messagef (SCPE_NOFNC, "%s has attached or busy units\n", sim_dname (dptr)); /* can't do it */
if ((up->flags & UNIT_ATT) || sim_is_active (up)) {
if ((sim_switches & SWMASK ('F')) == 0) /* no forced disable? */
return sim_messagef (SCPE_NOFNC, "%s has attached or busy units\n", sim_dname (dptr)); /* can't do it */
sim_cancel (up);
(void)scp_detach_unit (dptr, up);
}
}
dptr->flags = dptr->flags | DEV_DIS; /* disable */
}
Expand Down Expand Up @@ -16616,11 +16622,14 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
default:
break;
}
if (was_disabled)
if (was_disabled) {
sim_switches |= SWMASK ('F'); /* force complete disable */
set_dev_enbdis (dptr, NULL, 0, NULL);
}
}
else
tstat = SCPE_OK; /* can't enable, just skip device */
sim_switches = saved_switches;
if (tstat != SCPE_OK) {
stat = tstat;
sim_printf ("%s device tests returned: %d - %s\n", dptr->name, SCPE_BARE_STATUS (tstat), sim_error_text (tstat));
Expand Down
Loading