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

Remote Console: Fixed "SET REMOTE NOMASTER" command to properly disable Remote Console Master mode and return control to the simulator initiating session.

Browse source
This commit is contained in:
Mark Pizzolato 2014-10-28 08:40:48 -07:00
parent 6368a217fb
commit e2c7141675
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sim_console.c
View file

@ -652,7 +652,6 @@ t_stat stat = SCPE_OK;
t_bool stepping = FALSE; t_bool stepping = FALSE;
int32 steps = 1; int32 steps = 1;
t_bool was_stepping = (sim_rem_step_line != -1); t_bool was_stepping = (sim_rem_step_line != -1);
#define master_session (sim_rem_master_mode && (i == 0))
t_bool got_command; t_bool got_command;
t_bool close_session = FALSE; t_bool close_session = FALSE;
TMLN *lp; TMLN *lp;
@ -665,6 +664,8 @@ tmxr_poll_rx (&sim_rem_con_tmxr); /* poll input */
for (i=(was_stepping ? sim_rem_step_line : 0); for (i=(was_stepping ? sim_rem_step_line : 0);
(i < sim_rem_con_tmxr.lines) && (!stepping); (i < sim_rem_con_tmxr.lines) && (!stepping);
i++) { i++) {
t_bool master_session = (sim_rem_master_mode && (i == 0));
lp = &sim_rem_con_tmxr.ldsc[i]; lp = &sim_rem_con_tmxr.ldsc[i];
if (!lp->conn) if (!lp->conn)
continue; continue;
@ -918,6 +919,10 @@ for (i=(was_stepping ? sim_rem_step_line : 0);
if (stat != SCPE_OK) if (stat != SCPE_OK)
stat = _sim_rem_message (gbuf, stat); stat = _sim_rem_message (gbuf, stat);
_sim_rem_log_out (lp); _sim_rem_log_out (lp);
if (master_session && !sim_rem_master_mode) {
sim_rem_single_mode[i] = TRUE;
return SCPE_STOP;
}
if ((cmdp && (cmdp->action == &x_continue_cmd)) || if ((cmdp && (cmdp->action == &x_continue_cmd)) ||
(sim_rem_single_mode[i])) { (sim_rem_single_mode[i])) {
sim_rem_step_line = -1; /* Not stepping */ sim_rem_step_line = -1; /* Not stepping */