github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-26 04:01:38 +00:00
Code Releases Activity

FRONTPANEL: Added logic to pass simulator startup messages in panel error text if the connection to the simulator shuts down while it is starting.

Browse Source
This commit is contained in:
Mark Pizzolato
2015-04-04 09:18:02 -07:00
parent 1548777278
commit 9d47891971
4 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sim_console.c
View File

@@ -1226,13 +1226,7 @@ else {
if (sim_rem_master_mode) {
t_stat stat_nomessage;
if ((!sim_con_ldsc.serport) &&
(sim_con_tmxr.master == 0) &&
(sim_con_console_port)) {
sim_printf ("Console port must be Telnet or Serial with Master Remote Console\r\n");
return SCPE_IERR|SCPE_NOMESSAGE;
}
sim_printf ("Command input now processed on Master Remote Console Session\n");
sim_printf ("Command input starting on Master Remote Console Session\n");
stat = sim_run_boot_prep ();
sim_rem_master_was_enabled = TRUE;
while (sim_rem_master_mode) {
@@ -1809,11 +1803,6 @@ t_stat sim_check_console (int32 sec)
int32 c, trys = 0;
if (sim_rem_master_mode) {
if ((!sim_con_ldsc.serport) &&
(sim_con_tmxr.master == 0)) {
sim_printf ("Console port must be Telnet or Serial with Master Remote Console\r\n");
return SCPE_IERR|SCPE_NOMESSAGE;
}
for (;trys < sec; ++trys) {
sim_rem_con_poll_svc (&sim_rem_con_unit[0]);
if (sim_rem_con_tmxr.ldsc[0].conn)
@@ -1826,6 +1815,19 @@ if (sim_rem_master_mode) {
}
sim_os_sleep (1); /* wait 1 second */
}
if ((sim_rem_con_tmxr.ldsc[0].conn) &&
(!sim_con_ldsc.serport) &&
(sim_con_tmxr.master == 0) &&
(sim_con_console_port)) {
tmxr_linemsgf (&sim_rem_con_tmxr.ldsc[0], "\r\nConsole port must be Telnet or Serial with Master Remote Console\r\n");
tmxr_linemsgf (&sim_rem_con_tmxr.ldsc[0], "Goodbye\r\n");
while (tmxr_send_buffered_data (&sim_rem_con_tmxr.ldsc[0]))
sim_os_ms_sleep (100);
sim_os_ms_sleep (100);
tmxr_reset_ln (&sim_rem_con_tmxr.ldsc[0]);
sim_printf ("Console port must be Telnet or Serial with Master Remote Console\r\n");
return SCPE_EXIT;
}
}
if (trys == sec) {
return SCPE_TTMO; /* timed out */