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

TMXR: Remove the ability to detach a serial port while the simulator is running

Browse source 
As discussed in #782
This commit is contained in:
Mark Pizzolato 2020-02-18 13:55:22 -08:00
parent 0fca58a6da
commit 08d2bafb28
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sim_tmxr.c
View file

@ -303,11 +303,6 @@
sim> set MUX disconnect=2 sim> set MUX disconnect=2
A line which is connected to a serial port can be manually closed by
adding the -C switch to a disconnect command.
sim> set -C MUX disconnect=2
Full Modem Control serial port support. Full Modem Control serial port support.
This library supports devices which wish to emulate full modem This library supports devices which wish to emulate full modem
@ -4617,9 +4612,12 @@ if (dptr->modifiers) {
fprintf (st, "This will cause a telnet connection to be closed, but a serial port will\n"); fprintf (st, "This will cause a telnet connection to be closed, but a serial port will\n");
fprintf (st, "normally have DTR dropped for 500ms and raised again (thus hanging up a\n"); fprintf (st, "normally have DTR dropped for 500ms and raised again (thus hanging up a\n");
fprintf (st, "modem on that serial port).\n\n"); fprintf (st, "modem on that serial port).\n\n");
fprintf (st, "A line which is connected to a serial port can be manually closed by\n"); fprintf (st, "Any lines connected to serial port can be manually closed by unplugging\n");
fprintf (st, "adding the -C switch to a %s command.\n\n", mptr->mstring); fprintf (st, "the serial cable from the host computer. Dynamically adding or removing\n");
fprintf (st, " sim> SET -C %s %s=n\n\n", dptr->name, mptr->mstring); fprintf (st, "a serial port from a mux while the simulated operating system is running\n");
fprintf (st, "is guaranteed to have an inconsistent state between the running OS and\n");
fprintf (st, "the simulated port state. Restart the simulator without the serial port\n");
fprintf (st, "attached.\n\n");
} }
} }
return SCPE_OK; return SCPE_OK;
@ -4854,8 +4852,7 @@ if (lp->txstall)
If the line was connected to a tcp session, the socket associated with the If the line was connected to a tcp session, the socket associated with the
line will be closed. If the line was connected to a serial port, the port line will be closed. If the line was connected to a serial port, the port
will NOT be closed, but DTR will be dropped. After a 500ms delay DTR will will NOT be closed, but DTR will be dropped. After a 500ms delay DTR will
be raised again. If the sim_switches -C flag is set, then a serial port be raised again.
connection will be closed.
Implementation notes: Implementation notes:
@ -4881,8 +4878,11 @@ if (lp == NULL) /* bad line numb
if ((lp->sock) || (lp->serport)) { /* connection active? */ if ((lp->sock) || (lp->serport)) { /* connection active? */
if (!lp->notelnet) if (!lp->notelnet)
tmxr_linemsg (lp, "\r\nOperator disconnected line\r\n\n");/* report closure */ tmxr_linemsg (lp, "\r\nOperator disconnected line\r\n\n");/* report closure */
if (lp->serport && (sim_switches & SWMASK ('C'))) if (lp->serport && (sim_switches & SWMASK ('C'))) {
return tmxr_detach_ln (lp); sim_messagef (SCPE_OK, "If you really feel the need to disconnect this serial port, unplug the cable\n");
sim_messagef (SCPE_OK, "from the serial port on your system. Alternatively, you should restart the\n");
sim_messagef (SCPE_OK, "simulator without attaching the serial port in your configuration.\n");
}
return tmxr_reset_ln_ex (lp, FALSE); /* drop the line */ return tmxr_reset_ln_ex (lp, FALSE); /* drop the line */
} }