From 3eb45984569a4f995f6ec4ca088faf97458286db Mon Sep 17 00:00:00 2001 From: Bob Supnik Date: Mon, 20 Mar 2017 22:33:38 -0700 Subject: [PATCH] SCP: Removed KBD_WAIT and friends --- PDP10/pdp10_fe.c | 2 +- PDP11/pdp11_stddev.c | 2 +- PDP18B/pdp18b_stddev.c | 2 +- PDP8/pdp8_tt.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 | 2 +- VAX/vax860_stddev.c | 2 +- VAX/vax_stddev.c | 2 +- sim_defs.h | 8 ++++---- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/PDP10/pdp10_fe.c b/PDP10/pdp10_fe.c index cb03d6e3..5cd6b8be 100644 --- a/PDP10/pdp10_fe.c +++ b/PDP10/pdp10_fe.c @@ -298,7 +298,7 @@ M[FE_KEEPA] = INT64_C(0003740000000); /* PARITY STOP, CRM, DP P kaf_unit.u3 = 0; kaf_unit.u4 = 0; apr_flg = apr_flg & ~(APRF_ITC | APRF_CON); -sim_activate (&fei_unit, KBD_WAIT (fei_unit.wait, tmxr_poll)); +sim_activate (&fei_unit, tmxr_poll); sim_activate_after (&kaf_unit, kaf_unit.wait); return SCPE_OK; } diff --git a/PDP11/pdp11_stddev.c b/PDP11/pdp11_stddev.c index 7b5b8e39..cbbad1cb 100644 --- a/PDP11/pdp11_stddev.c +++ b/PDP11/pdp11_stddev.c @@ -317,7 +317,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit); tti_unit.buf = 0; tti_csr = 0; CLR_INT (TTI); -sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); +sim_activate (&tti_unit, tmr_poll); return SCPE_OK; } diff --git a/PDP18B/pdp18b_stddev.c b/PDP18B/pdp18b_stddev.c index eb48231c..43dc3ce4 100644 --- a/PDP18B/pdp18b_stddev.c +++ b/PDP18B/pdp18b_stddev.c @@ -1100,7 +1100,7 @@ if (!sim_is_running) { /* RESET (not CAF)? */ tty_shift = 0; /* clear state */ tti_fdpx = 0; /* clear dpx mode */ } -sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmxr_poll)); +sim_activate (&tti_unit, tmxr_poll); return SCPE_OK; } diff --git a/PDP8/pdp8_tt.c b/PDP8/pdp8_tt.c index d0d30e5e..fa2a6025 100644 --- a/PDP8/pdp8_tt.c +++ b/PDP8/pdp8_tt.c @@ -206,7 +206,7 @@ dev_done = dev_done & ~INT_TTI; /* clear done, int */ int_req = int_req & ~INT_TTI; int_enable = int_enable | INT_TTI; /* set enable */ if (!sim_is_running) /* RESET (not CAF)? */ - sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmxr_poll)); + sim_activate (&tti_unit, tmxr_poll); return SCPE_OK; } diff --git a/VAX/vax610_stddev.c b/VAX/vax610_stddev.c index e2d7d9df..81c08d45 100644 --- a/VAX/vax610_stddev.c +++ b/VAX/vax610_stddev.c @@ -361,7 +361,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit); tti_unit.buf = 0; tti_csr = 0; CLR_INT (TTI); -sim_activate_abs (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); +sim_activate_abs (&tti_unit, tmr_poll); return SCPE_OK; } diff --git a/VAX/vax630_stddev.c b/VAX/vax630_stddev.c index d7476cad..25f70c1c 100644 --- a/VAX/vax630_stddev.c +++ b/VAX/vax630_stddev.c @@ -298,7 +298,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit); tti_unit.buf = 0; tti_csr = 0; CLR_INT (TTI); -sim_activate_abs (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); +sim_activate_abs (&tti_unit, tmr_poll); return SCPE_OK; } diff --git a/VAX/vax730_stddev.c b/VAX/vax730_stddev.c index cf810dc5..ac626d50 100644 --- a/VAX/vax730_stddev.c +++ b/VAX/vax730_stddev.c @@ -571,7 +571,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit); tti_buf = 0; tti_csr = 0; tti_int = 0; -sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); +sim_activate (&tti_unit, tmr_poll); return SCPE_OK; } diff --git a/VAX/vax750_stddev.c b/VAX/vax750_stddev.c index d5715e08..702aeea0 100644 --- a/VAX/vax750_stddev.c +++ b/VAX/vax750_stddev.c @@ -566,7 +566,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit); tti_buf = 0; tti_csr = 0; tti_int = 0; -sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); +sim_activate (&tti_unit, tmr_poll); return SCPE_OK; } diff --git a/VAX/vax780_stddev.c b/VAX/vax780_stddev.c index b95070eb..2e6e91c3 100644 --- a/VAX/vax780_stddev.c +++ b/VAX/vax780_stddev.c @@ -536,7 +536,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit); tti_buf = 0; tti_csr = 0; tti_int = 0; -sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); +sim_activate (&tti_unit, tmr_poll); return SCPE_OK; } diff --git a/VAX/vax860_stddev.c b/VAX/vax860_stddev.c index 93c6345c..8ff3a99d 100644 --- a/VAX/vax860_stddev.c +++ b/VAX/vax860_stddev.c @@ -658,7 +658,7 @@ tmxr_set_console_units (tti_unit, tto_unit); tti_buf = 0; tti_csr = 0; tti_int = 0; -sim_activate (&tti_unit[ID_CT], KBD_WAIT (tti_unit[ID_CT].wait, tmr_poll)); +sim_activate (&tti_unit[ID_CT], tmr_poll); return SCPE_OK; } diff --git a/VAX/vax_stddev.c b/VAX/vax_stddev.c index fb7d537a..aeabd9bf 100644 --- a/VAX/vax_stddev.c +++ b/VAX/vax_stddev.c @@ -372,7 +372,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit); tti_unit.buf = 0; tti_csr = 0; CLR_INT (TTI); -sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); +sim_activate (&tti_unit, tmr_poll); return SCPE_OK; } diff --git a/sim_defs.h b/sim_defs.h index 0730cad3..6037ffd3 100644 --- a/sim_defs.h +++ b/sim_defs.h @@ -1,6 +1,6 @@ /* sim_defs.h: simulator definitions - Copyright (c) 1993-2008, Robert M Supnik + Copyright (c) 1993-2016, Robert M Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -23,6 +23,9 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Robert M Supnik. + 25-Sep-16 RMS Removed KBD_WAIT and friends + 08-Mar-16 RMS Added shutdown invisible switch + 24-Dec-14 JDB Added T_ADDR_FMT 05-Jan-11 MP Added Asynch I/O support 18-Jan-11 MP Added log file reference count support 21-Jul-08 RMS Removed inlining support @@ -396,12 +399,9 @@ typedef uint32 t_addr; /* Default timing parameters */ #define KBD_POLL_WAIT 5000 /* keyboard poll */ -#define KBD_MAX_WAIT 500000 #define SERIAL_IN_WAIT 100 /* serial in time */ #define SERIAL_OUT_WAIT 100 /* serial output */ #define NOQUEUE_WAIT 1000000 /* min check time */ -#define KBD_LIM_WAIT(x) (((x) > KBD_MAX_WAIT)? KBD_MAX_WAIT: (x)) -#define KBD_WAIT(w,s) ((w)? w: KBD_LIM_WAIT (s)) /* Convert switch letter to bit mask */