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

TMXR, SERIAL: Properly set serial port speed on attach.

Browse source
This commit is contained in:
Mark Pizzolato 2018-03-20 20:52:26 -07:00
parent 054e8e56c1
commit 3f7f92682d
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sim_serial.c
View file

@ -421,7 +421,8 @@ if (port == INVALID_HANDLE) {
return port; return port;
} }
status = sim_config_serial (port, config); /* set serial configuration */ status = (lp) ? tmxr_set_config_line (lp, config) /* set serial configuration */
: sim_config_serial (port, config); /* set serial configuration */
if (status != SCPE_OK) { /* port configuration error? */ if (status != SCPE_OK) { /* port configuration error? */
sim_close_serial (port); /* close the port */ sim_close_serial (port); /* close the port */

8
sim_tmxr.c
View file

@ -3836,6 +3836,7 @@ else {
for (i=0; i<tmxr_open_device_count; ++i) { for (i=0; i<tmxr_open_device_count; ++i) {
TMXR *mp = tmxr_open_devices[i]; TMXR *mp = tmxr_open_devices[i];
TMLN *lp; TMLN *lp;
UNIT *o_uptr = mp->ldsc[0].o_uptr;
char *attach; char *attach;
fprintf(st, "Multiplexer device: %s", (mp->dptr ? sim_dname (mp->dptr) : "")); fprintf(st, "Multiplexer device: %s", (mp->dptr ? sim_dname (mp->dptr) : ""));
@ -3853,6 +3854,11 @@ else {
fprintf(st, ", ModemControl=enabled"); fprintf(st, ", ModemControl=enabled");
if (mp->buffered) if (mp->buffered)
fprintf(st, ", Buffered=%d", mp->buffered); fprintf(st, ", Buffered=%d", mp->buffered);
for (j = 1; j < mp->lines; j++)
if (o_uptr != mp->ldsc[j].o_uptr)
break;
if (j == mp->lines)
fprintf(st, ", Output Unit: %s", sim_uname (o_uptr));
attach = tmxr_mux_attach_string (NULL, mp); attach = tmxr_mux_attach_string (NULL, mp);
if (attach) if (attach)
fprintf(st, ",\n attached to %s, ", attach); fprintf(st, ",\n attached to %s, ", attach);
@ -3881,7 +3887,7 @@ else {
fprintf (st, " - %stelnet", lp->notelnet ? "no" : ""); fprintf (st, " - %stelnet", lp->notelnet ? "no" : "");
if (lp->uptr && (lp->uptr != lp->mp->uptr)) if (lp->uptr && (lp->uptr != lp->mp->uptr))
fprintf (st, " - Unit: %s", sim_uname (lp->uptr)); fprintf (st, " - Unit: %s", sim_uname (lp->uptr));
if (lp->o_uptr && (lp->o_uptr != lp->mp->uptr) && (lp->o_uptr != lp->uptr)) if ((lp->o_uptr != o_uptr) && lp->o_uptr && (lp->o_uptr != lp->mp->uptr) && (lp->o_uptr != lp->uptr))
fprintf (st, " - Output Unit: %s", sim_uname (lp->o_uptr)); fprintf (st, " - Output Unit: %s", sim_uname (lp->o_uptr));
if (mp->modem_control != lp->modem_control) if (mp->modem_control != lp->modem_control)
fprintf(st, ", ModemControl=%s", lp->modem_control ? "enabled" : "disabled"); fprintf(st, ", ModemControl=%s", lp->modem_control ? "enabled" : "disabled");