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

Fixed console serial port connection checking

Browse source
This commit is contained in:
Mark Pizzolato 2012-12-18 15:41:34 -08:00
parent 37b73c40a6
commit 1370ad6a2c
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sim_console.c
View file

@ -774,7 +774,11 @@ t_stat sim_check_console (int32 sec)
{ {
int32 c, i; int32 c, i;
if (sim_con_tmxr.master == 0) /* not Telnet? done */ if (sim_con_ldsc.serport)
if (tmxr_poll_conn (&sim_con_tmxr) >= 0)
sim_con_ldsc.rcve = 1; /* rcv enabled */
if ((sim_con_tmxr.master == 0) || /* serial console or not Telnet? done */
(sim_con_ldsc.serport))
return SCPE_OK; return SCPE_OK;
if (sim_con_ldsc.conn || sim_con_ldsc.txbfd) { /* connected or buffered ? */ if (sim_con_ldsc.conn || sim_con_ldsc.txbfd) { /* connected or buffered ? */
tmxr_poll_rx (&sim_con_tmxr); /* poll (check disconn) */ tmxr_poll_rx (&sim_con_tmxr); /* poll (check disconn) */

1
sim_tmxr.c
View file

@ -844,6 +844,7 @@ for (i = 0; i < mp->lines; i++) { /* check each line in se
if (lp->ser_connect_pending) { if (lp->ser_connect_pending) {
lp->ser_connect_pending = FALSE; lp->ser_connect_pending = FALSE;
lp->conn = TRUE;
return i; return i;
} }
} }