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

I1620: Avoid use of 4.X APIs when building with simh 3.X

Browse source
This commit is contained in:
Mark Pizzolato 2017-06-20 07:52:38 -07:00
parent 7e380e2b12
commit 588c22dce5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
I1620/i1620_defs.h
View file

@ -241,9 +241,13 @@ enum opcodes {
#define DEV_DEFIO (1 << (DEV_V_UF + 0)) #define DEV_DEFIO (1 << (DEV_V_UF + 0))
#define DEFIO_CPS u4 /* Characters per Second field */ #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(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) #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 */ /* Function declarations */
t_stat cpuio_set_inp (uint32 op, UNIT *uptr); t_stat cpuio_set_inp (uint32 op, UNIT *uptr);