From 95033cee15ad64233f67c6bd2aa398f193edba15 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Mon, 21 Jan 2013 11:31:29 -0800
Subject: [PATCH] Declare the console port input and output polling units for
 most simulators to potentially allow asynchronous console I/O.

---
 GRI/gri_stddev.c       | 2 ++
 H316/h316_stddev.c     | 2 ++
 NOVA/eclipse_tt.c      | 2 ++
 NOVA/nova_tt.c         | 2 ++
 PDP1/pdp1_stddev.c     | 2 ++
 PDP10/pdp10_fe.c       | 2 ++
 PDP11/pdp11_stddev.c   | 2 ++
 PDP18B/pdp18b_stddev.c | 2 ++
 PDP8/pdp8_tt.c         | 2 ++
 SDS/sds_stddev.c       | 2 ++
 TX-0/tx0_stddev.c      | 2 ++
 VAX/vax610_stddev.c    | 2 ++
 VAX/vax630_stddev.c    | 2 ++
 VAX/vax730_stddev.c    | 2 ++
 VAX/vax750_stddev.c    | 2 ++
 VAX/vax780_stddev.c    | 3 ++-
 VAX/vax860_stddev.c    | 2 ++
 VAX/vax_stddev.c       | 2 ++
 18 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/GRI/gri_stddev.c b/GRI/gri_stddev.c
index 53a3b13d..c07cacdc 100644
--- a/GRI/gri_stddev.c
+++ b/GRI/gri_stddev.c
@@ -39,6 +39,7 @@
 */
 
 #include "gri_defs.h"
+#include "sim_tmxr.h"
 #include <ctype.h>
 
 uint32 hsr_stopioe = 1, hsp_stopioe = 1;
@@ -277,6 +278,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_unit.buf = 0;                                       /* clear buffer */
 dev_done = dev_done & ~INT_TTI;                         /* clear ready */
 sim_activate (&tti_unit, tti_unit.wait);                /* activate unit */
diff --git a/H316/h316_stddev.c b/H316/h316_stddev.c
index 14060c82..32005811 100644
--- a/H316/h316_stddev.c
+++ b/H316/h316_stddev.c
@@ -68,6 +68,7 @@
 */
 
 #include "h316_defs.h"
+#include "sim_tmxr.h"
 #include <ctype.h>
 
 #define UNIT_V_ASC      (TTUF_V_UF + 0)                 /* ASCII */
@@ -533,6 +534,7 @@ return SCPE_OK;
 
 t_stat ptp_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tty_unit[TTR], &tty_unit[TTO]);
 CLR_INT (INT_PTP);                                      /* clear ready, enb */
 CLR_ENB (INT_PTP);
 ptp_power = 0;                                          /* power off */
diff --git a/NOVA/eclipse_tt.c b/NOVA/eclipse_tt.c
index ab3489dd..49c350d7 100644
--- a/NOVA/eclipse_tt.c
+++ b/NOVA/eclipse_tt.c
@@ -35,6 +35,7 @@
 */
 
 #include "nova_defs.h"
+#include "sim_tmxr.h"
 
 #define UNIT_V_DASHER   (UNIT_V_UF + 0)                 /* Dasher mode */
 #define UNIT_DASHER (1 << UNIT_V_DASHER)
@@ -192,6 +193,7 @@ void translate_in()
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_unit.buf = 0;
 dev_busy = dev_busy & ~INT_TTI;                         /* clear busy */
 dev_done = dev_done & ~INT_TTI;                         /* clear done, int */
diff --git a/NOVA/nova_tt.c b/NOVA/nova_tt.c
index 59491d5c..8d5abff3 100644
--- a/NOVA/nova_tt.c
+++ b/NOVA/nova_tt.c
@@ -49,6 +49,7 @@
 */
 
 #include "nova_defs.h"
+#include "sim_tmxr.h"
 
 #define UNIT_V_DASHER   (UNIT_V_UF + 0)                 /* Dasher mode */
 #define UNIT_DASHER     (1 << UNIT_V_DASHER)
@@ -186,6 +187,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_unit.buf = 0;                                       /* <not DG compatible>  */
 DEV_CLR_BUSY( INT_TTI ) ;
 DEV_CLR_DONE( INT_TTI ) ;
diff --git a/PDP1/pdp1_stddev.c b/PDP1/pdp1_stddev.c
index 1d1586dc..da86e10c 100644
--- a/PDP1/pdp1_stddev.c
+++ b/PDP1/pdp1_stddev.c
@@ -51,6 +51,7 @@
 */
 
 #include "pdp1_defs.h"
+#include "sim_tmxr.h"
 
 #define FIODEC_STOP     013                             /* stop code */
 #define FIODEC_UC       074
@@ -624,6 +625,7 @@ return SCPE_OK;
 
 t_stat tty_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tty_buf = 0;                                            /* clear buffer */
 tty_uc = 0;                                             /* clear case */
 tti_hold = 0;                                           /* clear hold buf */
diff --git a/PDP10/pdp10_fe.c b/PDP10/pdp10_fe.c
index 97cbb20d..7b4292b0 100644
--- a/PDP10/pdp10_fe.c
+++ b/PDP10/pdp10_fe.c
@@ -39,6 +39,7 @@
 */
 
 #include "pdp10_defs.h"
+#include "sim_tmxr.h"
 #define UNIT_DUMMY      (1 << UNIT_V_UF)
 
 extern d10 *M;
@@ -160,6 +161,7 @@ return SCPE_OK;
 
 t_stat fe_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&fe_unit[0], &fe_unit[1]);
 fei_unit.buf = feo_unit.buf = 0;
 M[FE_CTYIN] = M[FE_CTYOUT] = 0;
 apr_flg = apr_flg & ~(APRF_ITC | APRF_CON);
diff --git a/PDP11/pdp11_stddev.c b/PDP11/pdp11_stddev.c
index 733d0d45..108fe8f8 100644
--- a/PDP11/pdp11_stddev.c
+++ b/PDP11/pdp11_stddev.c
@@ -61,6 +61,7 @@
 */
 
 #include "pdp11_defs.h"
+#include "sim_tmxr.h"
 
 #define TTICSR_IMP      (CSR_DONE + CSR_IE)             /* terminal input */
 #define TTICSR_RW       (CSR_IE)
@@ -308,6 +309,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_unit.buf = 0;
 tti_csr = 0;
 CLR_INT (TTI);
diff --git a/PDP18B/pdp18b_stddev.c b/PDP18B/pdp18b_stddev.c
index ecb96087..152d5e26 100644
--- a/PDP18B/pdp18b_stddev.c
+++ b/PDP18B/pdp18b_stddev.c
@@ -74,6 +74,7 @@
 */
 
 #include "pdp18b_defs.h"
+#include "sim_tmxr.h"
 #include <ctype.h>
 
 #define UNIT_V_RASCII   (UNIT_V_UF + 0)                 /* reader ASCII */
@@ -1079,6 +1080,7 @@ return (TST_INT (TTI)? IOS_TTI: 0);
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 CLR_INT (TTI);                                          /* clear flag */
 if (!sim_is_running) {                                  /* RESET (not CAF)? */
     tti_unit.buf = 0;                                   /* clear buffer */
diff --git a/PDP8/pdp8_tt.c b/PDP8/pdp8_tt.c
index f0c522b3..de72fa22 100644
--- a/PDP8/pdp8_tt.c
+++ b/PDP8/pdp8_tt.c
@@ -42,6 +42,7 @@
 */
 
 #include "pdp8_defs.h"
+#include "sim_tmxr.h"
 #include <ctype.h>
 
 extern int32 int_req, int_enable, dev_done, stop_inst;
@@ -193,6 +194,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_unit.buf = 0;
 dev_done = dev_done & ~INT_TTI;                         /* clear done, int */
 int_req = int_req & ~INT_TTI;
diff --git a/SDS/sds_stddev.c b/SDS/sds_stddev.c
index 13877418..537acca1 100644
--- a/SDS/sds_stddev.c
+++ b/SDS/sds_stddev.c
@@ -33,6 +33,7 @@
 */
 
 #include "sds_defs.h"
+#include "sim_tmxr.h"
 
 #define TT_CR           052                             /* typewriter */
 #define TT_TB           072
@@ -518,6 +519,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 chan_disc (tti_dib.chan);                               /* disconnect */
 tti_unit.buf = 0;                                       /* clear state */
 xfr_req = xfr_req & ~XFR_TTI;                           /* clr xfr flag */
diff --git a/TX-0/tx0_stddev.c b/TX-0/tx0_stddev.c
index 9fbe26db..d90d6be8 100644
--- a/TX-0/tx0_stddev.c
+++ b/TX-0/tx0_stddev.c
@@ -48,6 +48,7 @@
 */
 
 #include "tx0_defs.h"
+#include "sim_tmxr.h"
 
 #define FLEXO_STOP     061                             /* stop code */
 #define FLEXO_UC       071
@@ -628,6 +629,7 @@ t_stat tto_svc (UNIT *uptr)
 
 t_stat tty_reset (DEVICE *dptr)
 {
+    tmxr_set_console_units (&tti_unit, &tto_unit);
     tty_buf = 0;                                            /* clear buffer */
     tty_uc = 0;                                             /* clear case */
     tti_hold = 0;                                           /* clear hold buf */
diff --git a/VAX/vax610_stddev.c b/VAX/vax610_stddev.c
index ef3964d7..cb1562e7 100644
--- a/VAX/vax610_stddev.c
+++ b/VAX/vax610_stddev.c
@@ -32,6 +32,7 @@
 */
 
 #include "vax_defs.h"
+#include "sim_tmxr.h"
 #include <time.h>
 
 #define TTICSR_IMP      (CSR_DONE + CSR_IE)             /* terminal input */
@@ -343,6 +344,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_unit.buf = 0;
 tti_csr = 0;
 CLR_INT (TTI);
diff --git a/VAX/vax630_stddev.c b/VAX/vax630_stddev.c
index abe236d0..ead1aa4e 100644
--- a/VAX/vax630_stddev.c
+++ b/VAX/vax630_stddev.c
@@ -32,6 +32,7 @@
 */
 
 #include "vax_defs.h"
+#include "sim_tmxr.h"
 #include <time.h>
 
 #define TTICSR_IMP      (CSR_DONE + CSR_IE)             /* terminal input */
@@ -278,6 +279,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_unit.buf = 0;
 tti_csr = 0;
 CLR_INT (TTI);
diff --git a/VAX/vax730_stddev.c b/VAX/vax730_stddev.c
index ab8cb5d1..1cfc647e 100644
--- a/VAX/vax730_stddev.c
+++ b/VAX/vax730_stddev.c
@@ -58,6 +58,7 @@
 */
 
 #include "vax_defs.h"
+#include "sim_tmxr.h"
 
 /* Terminal definitions */
 
@@ -668,6 +669,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_buf = 0;
 tti_csr = 0;
 tti_int = 0;
diff --git a/VAX/vax750_stddev.c b/VAX/vax750_stddev.c
index 3a0e31a2..d72f99a0 100644
--- a/VAX/vax750_stddev.c
+++ b/VAX/vax750_stddev.c
@@ -59,6 +59,7 @@
 */
 
 #include "vax_defs.h"
+#include "sim_tmxr.h"
 #include <time.h>
 
 /* Terminal definitions */
@@ -661,6 +662,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_buf = 0;
 tti_csr = 0;
 tti_int = 0;
diff --git a/VAX/vax780_stddev.c b/VAX/vax780_stddev.c
index 9d48972a..ced095e3 100644
--- a/VAX/vax780_stddev.c
+++ b/VAX/vax780_stddev.c
@@ -81,7 +81,7 @@
 */
 
 #include "vax_defs.h"
-
+#include "sim_tmxr.h"
 
 /* Terminal definitions */
 
@@ -484,6 +484,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_buf = 0;
 tti_csr = 0;
 tti_int = 0;
diff --git a/VAX/vax860_stddev.c b/VAX/vax860_stddev.c
index 44fd3b3a..4542a8a4 100644
--- a/VAX/vax860_stddev.c
+++ b/VAX/vax860_stddev.c
@@ -34,6 +34,7 @@
 */
 
 #include "vax_defs.h"
+#include "sim_tmxr.h"
 #include <time.h>
 
 /* Terminal definitions */
@@ -607,6 +608,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (tti_unit, tto_unit);
 tti_buf = 0;
 tti_csr = 0;
 tti_int = 0;
diff --git a/VAX/vax_stddev.c b/VAX/vax_stddev.c
index e1e54866..6bfb6772 100644
--- a/VAX/vax_stddev.c
+++ b/VAX/vax_stddev.c
@@ -77,6 +77,7 @@
 */
 
 #include "vax_defs.h"
+#include "sim_tmxr.h"
 #include <time.h>
 
 #define TTICSR_IMP      (CSR_DONE + CSR_IE)             /* terminal input */
@@ -341,6 +342,7 @@ return SCPE_OK;
 
 t_stat tti_reset (DEVICE *dptr)
 {
+tmxr_set_console_units (&tti_unit, &tto_unit);
 tti_unit.buf = 0;
 tti_csr = 0;
 CLR_INT (TTI);