From 588c22dce52e9eccb29f1f7fcaaed5e67b013ca3 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Tue, 20 Jun 2017 07:52:38 -0700 Subject: [PATCH] I1620: Avoid use of 4.X APIs when building with simh 3.X --- I1620/i1620_defs.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/I1620/i1620_defs.h b/I1620/i1620_defs.h index 7db8cb97..11e7ba22 100644 --- a/I1620/i1620_defs.h +++ b/I1620/i1620_defs.h @@ -241,9 +241,13 @@ enum opcodes { #define DEV_DEFIO (1 << (DEV_V_UF + 0)) #define DEFIO_CPS u4 /* Characters per Second field */ +#if (SIM_MAJOR >= 4) #define DEFIO_ACTIVATE(uptr) ((uptr)->DEFIO_CPS) ? sim_activate_after (uptr, 1000000/(uptr)->DEFIO_CPS) : sim_activate (uptr, (uptr)->wait) #define DEFIO_ACTIVATE_ABS(uptr) ((uptr)->DEFIO_CPS) ? sim_activate_after_abs (uptr, 1000000/(uptr)->DEFIO_CPS) : sim_activate_abs (uptr, (uptr)->wait) - +#else +#define DEFIO_ACTIVATE(uptr) sim_activate (uptr, (uptr)->wait) +#define DEFIO_ACTIVATE_ABS(uptr) sim_activate_abs (uptr, (uptr)->wait) +#endif /* Function declarations */ t_stat cpuio_set_inp (uint32 op, UNIT *uptr);