From 3f7f92682dadc710326bc580e4fd98d2361770d7 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Tue, 20 Mar 2018 20:52:26 -0700
Subject: [PATCH] TMXR, SERIAL: Properly set serial port speed on attach.

---
 sim_serial.c | 3 ++-
 sim_tmxr.c   | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sim_serial.c b/sim_serial.c
index b370b208..af2fbe90 100644
--- a/sim_serial.c
+++ b/sim_serial.c
@@ -421,7 +421,8 @@ if (port == INVALID_HANDLE) {
     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? */
     sim_close_serial (port);                            /* close the port */
diff --git a/sim_tmxr.c b/sim_tmxr.c
index ef59d75a..2237047a 100644
--- a/sim_tmxr.c
+++ b/sim_tmxr.c
@@ -3836,6 +3836,7 @@ else {
     for (i=0; i<tmxr_open_device_count; ++i) {
         TMXR *mp = tmxr_open_devices[i];
         TMLN *lp;
+		UNIT *o_uptr = mp->ldsc[0].o_uptr;
         char *attach;
 
         fprintf(st, "Multiplexer device: %s", (mp->dptr ? sim_dname (mp->dptr) : ""));
@@ -3853,6 +3854,11 @@ else {
             fprintf(st, ", ModemControl=enabled");
         if (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);
         if (attach)
             fprintf(st, ",\n    attached to %s, ", attach);
@@ -3881,7 +3887,7 @@ else {
                     fprintf (st, " - %stelnet", lp->notelnet ? "no" : "");
                 if (lp->uptr && (lp->uptr != lp->mp->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));
                 if (mp->modem_control != lp->modem_control)
                     fprintf(st, ", ModemControl=%s", lp->modem_control ? "enabled" : "disabled");