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

SCP: Removed KBD_WAIT and friends

Browse source
This commit is contained in:
Bob Supnik 2017-03-20 22:33:38 -07:00 • committed by Mark Pizzolato
parent 0947a69a9e
commit 3eb4598456
12 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PDP10/pdp10_fe.c
View file

@ -298,7 +298,7 @@ M[FE_KEEPA] = INT64_C(0003740000000); /* PARITY STOP, CRM, DP P
kaf_unit.u3 = 0; kaf_unit.u3 = 0;
kaf_unit.u4 = 0; kaf_unit.u4 = 0;
apr_flg = apr_flg & ~(APRF_ITC | APRF_CON); 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); sim_activate_after (&kaf_unit, kaf_unit.wait);
return SCPE_OK; return SCPE_OK;
} }

2
PDP11/pdp11_stddev.c
View file

@ -317,7 +317,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit);
tti_unit.buf = 0; tti_unit.buf = 0;
tti_csr = 0; tti_csr = 0;
CLR_INT (TTI); CLR_INT (TTI);
sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); sim_activate (&tti_unit, tmr_poll);
return SCPE_OK; return SCPE_OK;
} }

2
PDP18B/pdp18b_stddev.c
View file

@ -1100,7 +1100,7 @@ if (!sim_is_running) { /* RESET (not CAF)? */
tty_shift = 0; /* clear state */ tty_shift = 0; /* clear state */
tti_fdpx = 0; /* clear dpx mode */ 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; return SCPE_OK;
} }

2
PDP8/pdp8_tt.c
View file

@ -206,7 +206,7 @@ dev_done = dev_done & ~INT_TTI; /* clear done, int */
int_req = int_req & ~INT_TTI; int_req = int_req & ~INT_TTI;
int_enable = int_enable | INT_TTI; /* set enable */ int_enable = int_enable | INT_TTI; /* set enable */
if (!sim_is_running) /* RESET (not CAF)? */ 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; return SCPE_OK;
} }

2
VAX/vax610_stddev.c
View file

@ -361,7 +361,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit);
tti_unit.buf = 0; tti_unit.buf = 0;
tti_csr = 0; tti_csr = 0;
CLR_INT (TTI); 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; return SCPE_OK;
} }

2
VAX/vax630_stddev.c
View file

@ -298,7 +298,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit);
tti_unit.buf = 0; tti_unit.buf = 0;
tti_csr = 0; tti_csr = 0;
CLR_INT (TTI); 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; return SCPE_OK;
} }

2
VAX/vax730_stddev.c
View file

@ -571,7 +571,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit);
tti_buf = 0; tti_buf = 0;
tti_csr = 0; tti_csr = 0;
tti_int = 0; tti_int = 0;
sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); sim_activate (&tti_unit, tmr_poll);
return SCPE_OK; return SCPE_OK;
} }

2
VAX/vax750_stddev.c
View file

@ -566,7 +566,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit);
tti_buf = 0; tti_buf = 0;
tti_csr = 0; tti_csr = 0;
tti_int = 0; tti_int = 0;
sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); sim_activate (&tti_unit, tmr_poll);
return SCPE_OK; return SCPE_OK;
} }

2
VAX/vax780_stddev.c
View file

@ -536,7 +536,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit);
tti_buf = 0; tti_buf = 0;
tti_csr = 0; tti_csr = 0;
tti_int = 0; tti_int = 0;
sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); sim_activate (&tti_unit, tmr_poll);
return SCPE_OK; return SCPE_OK;
} }

2
VAX/vax860_stddev.c
View file

@ -658,7 +658,7 @@ tmxr_set_console_units (tti_unit, tto_unit);
tti_buf = 0; tti_buf = 0;
tti_csr = 0; tti_csr = 0;
tti_int = 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; return SCPE_OK;
} }

2
VAX/vax_stddev.c
View file

@ -372,7 +372,7 @@ tmxr_set_console_units (&tti_unit, &tto_unit);
tti_unit.buf = 0; tti_unit.buf = 0;
tti_csr = 0; tti_csr = 0;
CLR_INT (TTI); CLR_INT (TTI);
sim_activate (&tti_unit, KBD_WAIT (tti_unit.wait, tmr_poll)); sim_activate (&tti_unit, tmr_poll);
return SCPE_OK; return SCPE_OK;
} }

8
sim_defs.h
View file

@ -1,6 +1,6 @@
/* sim_defs.h: simulator definitions /* 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 Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), 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 used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Robert M Supnik. 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 05-Jan-11 MP Added Asynch I/O support
18-Jan-11 MP Added log file reference count support 18-Jan-11 MP Added log file reference count support
21-Jul-08 RMS Removed inlining support 21-Jul-08 RMS Removed inlining support
@ -396,12 +399,9 @@ typedef uint32 t_addr;
/* Default timing parameters */ /* Default timing parameters */
#define KBD_POLL_WAIT 5000 /* keyboard poll */ #define KBD_POLL_WAIT 5000 /* keyboard poll */
#define KBD_MAX_WAIT 500000
#define SERIAL_IN_WAIT 100 /* serial in time */ #define SERIAL_IN_WAIT 100 /* serial in time */
#define SERIAL_OUT_WAIT 100 /* serial output */ #define SERIAL_OUT_WAIT 100 /* serial output */
#define NOQUEUE_WAIT 1000000 /* min check time */ #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 */ /* Convert switch letter to bit mask */