From 71fcfacafc2e1931a6af375db2df1624cbe1b962 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Tue, 22 Jan 2013 16:07:23 -0800 Subject: [PATCH] Added calls to sim_register_clock_unit for simulators with clock devices --- GRI/gri_stddev.c | 1 + H316/h316_stddev.c | 1 + I7094/i7094_clk.c | 1 + NOVA/nova_clk.c | 1 + PDP1/pdp1_clk.c | 1 + PDP10/pdp10_tim.c | 1 + PDP11/pdp11_stddev.c | 1 + PDP18B/pdp18b_stddev.c | 1 + PDP8/pdp8_clk.c | 1 + VAX/vax610_stddev.c | 1 + VAX/vax630_stddev.c | 1 + VAX/vax730_stddev.c | 1 + VAX/vax750_stddev.c | 1 + VAX/vax780_stddev.c | 1 + VAX/vax860_stddev.c | 1 + 15 files changed, 15 insertions(+) diff --git a/GRI/gri_stddev.c b/GRI/gri_stddev.c index c07cacdc..3ae4afc2 100644 --- a/GRI/gri_stddev.c +++ b/GRI/gri_stddev.c @@ -419,6 +419,7 @@ return SCPE_OK; t_stat rtc_reset (DEVICE *dptr) { +sim_register_clock_unit (&rtc_unit); /* declare clock unit */ dev_done = dev_done & ~INT_RTC; /* clear ready */ sim_cancel (&rtc_unit); /* stop clock */ return SCPE_OK; diff --git a/H316/h316_stddev.c b/H316/h316_stddev.c index c48ac7f8..ce7c8667 100644 --- a/H316/h316_stddev.c +++ b/H316/h316_stddev.c @@ -881,6 +881,7 @@ return SCPE_OK; t_stat clk_reset (DEVICE *dptr) { +sim_register_clock_unit (&clk_unit); /* declare clock unit */ CLR_INT (INT_CLK); /* clear ready, enb */ CLR_ENB (INT_CLK); sim_cancel (&clk_unit); /* deactivate unit */ diff --git a/I7094/i7094_clk.c b/I7094/i7094_clk.c index 311757fb..e533339f 100644 --- a/I7094/i7094_clk.c +++ b/I7094/i7094_clk.c @@ -126,6 +126,7 @@ return d1; t_stat clk_reset (DEVICE *dptr) { +sim_register_clock_unit (&clk_unit); /* declare clock unit */ chtr_clk = 0; if (clk_dev.flags & DEV_DIS) sim_cancel (&clk_unit); diff --git a/NOVA/nova_clk.c b/NOVA/nova_clk.c index 47042808..59bc0af9 100644 --- a/NOVA/nova_clk.c +++ b/NOVA/nova_clk.c @@ -153,6 +153,7 @@ return SCPE_OK; t_stat clk_reset (DEVICE *dptr) { +sim_register_clock_unit (&clk_unit); /* declare clock unit */ clk_sel = 0; DEV_CLR_BUSY( INT_CLK ) ; DEV_CLR_DONE( INT_CLK ) ; diff --git a/PDP1/pdp1_clk.c b/PDP1/pdp1_clk.c index 56a5accb..94d4124a 100644 --- a/PDP1/pdp1_clk.c +++ b/PDP1/pdp1_clk.c @@ -118,6 +118,7 @@ t_stat clk_reset (DEVICE *dptr) { if (clk_dev.flags & DEV_DIS) sim_cancel (&clk_unit); /* disabled? */ else { + sim_register_clock_unit (&clk_unit); /* declare clock unit */ tmxr_poll = sim_rtcn_init (clk_unit.wait, TMR_CLK); sim_activate_abs (&clk_unit, tmxr_poll); /* activate unit */ } diff --git a/PDP10/pdp10_tim.c b/PDP10/pdp10_tim.c index b9bbdfc1..c3d8b79d 100644 --- a/PDP10/pdp10_tim.c +++ b/PDP10/pdp10_tim.c @@ -224,6 +224,7 @@ return; t_stat tim_reset (DEVICE *dptr) { +sim_register_clock_unit (&tim_unit); /* declare clock unit */ tim_period = 0; /* clear timer */ tim_ttg = 0; apr_flg = apr_flg & ~APRF_TIM; /* clear interrupt */ diff --git a/PDP11/pdp11_stddev.c b/PDP11/pdp11_stddev.c index ab15699b..2d6dc8a6 100644 --- a/PDP11/pdp11_stddev.c +++ b/PDP11/pdp11_stddev.c @@ -463,6 +463,7 @@ return clk_dib.vec; t_stat clk_reset (DEVICE *dptr) { +sim_register_clock_unit (&clk_unit); /* declare clock unit */ if (CPUT (HAS_LTCR)) /* reg there? */ clk_fie = clk_fnxm = 0; else clk_fie = clk_fnxm = 1; /* no, BEVENT */ diff --git a/PDP18B/pdp18b_stddev.c b/PDP18B/pdp18b_stddev.c index 987f2f1d..fd1959e3 100644 --- a/PDP18B/pdp18b_stddev.c +++ b/PDP18B/pdp18b_stddev.c @@ -483,6 +483,7 @@ t_stat clk_reset (DEVICE *dptr) { int32 t; +sim_register_clock_unit (&clk_unit); /* declare clock unit */ CLR_INT (CLK); /* clear flag */ if (!sim_is_running) { /* RESET (not CAF)? */ t = sim_rtc_init (clk_unit.wait); /* init calibration */ diff --git a/PDP8/pdp8_clk.c b/PDP8/pdp8_clk.c index 9d81d5ae..ec70f2a8 100644 --- a/PDP8/pdp8_clk.c +++ b/PDP8/pdp8_clk.c @@ -157,6 +157,7 @@ t_stat clk_reset (DEVICE *dptr) { int32 t; +sim_register_clock_unit (&clk_unit); /* declare clock unit */ dev_done = dev_done & ~INT_CLK; /* clear done, int */ int_req = int_req & ~INT_CLK; int_enable = int_enable & ~INT_CLK; /* clear enable */ diff --git a/VAX/vax610_stddev.c b/VAX/vax610_stddev.c index 74faa632..bf0741e8 100644 --- a/VAX/vax610_stddev.c +++ b/VAX/vax610_stddev.c @@ -412,6 +412,7 @@ t_stat clk_reset (DEVICE *dptr) { int32 t; +sim_register_clock_unit (&clk_unit); /* declare clock unit */ clk_csr = 0; CLR_INT (CLK); t = sim_rtcn_init (clk_unit.wait, TMR_CLK); /* init timer */ diff --git a/VAX/vax630_stddev.c b/VAX/vax630_stddev.c index e3c0b55a..a3b34ea2 100644 --- a/VAX/vax630_stddev.c +++ b/VAX/vax630_stddev.c @@ -348,6 +348,7 @@ t_stat clk_reset (DEVICE *dptr) { int32 t; +sim_register_clock_unit (&clk_unit); /* declare clock unit */ clk_csr = 0; CLR_INT (CLK); t = sim_rtcn_init (clk_unit.wait, TMR_CLK); /* init timer */ diff --git a/VAX/vax730_stddev.c b/VAX/vax730_stddev.c index 30b6484b..7bf1fc41 100644 --- a/VAX/vax730_stddev.c +++ b/VAX/vax730_stddev.c @@ -858,6 +858,7 @@ return; t_stat clk_reset (DEVICE *dptr) { +sim_register_clock_unit (&clk_unit); /* declare clock unit */ tmr_poll = sim_rtcn_init (clk_unit.wait, TMR_CLK); /* init 100Hz timer */ sim_activate_abs (&clk_unit, tmr_poll); /* activate 100Hz unit */ tmxr_poll = tmr_poll * TMXR_MULT; /* set mux poll */ diff --git a/VAX/vax750_stddev.c b/VAX/vax750_stddev.c index 3a06175e..a36084cf 100644 --- a/VAX/vax750_stddev.c +++ b/VAX/vax750_stddev.c @@ -854,6 +854,7 @@ return; t_stat clk_reset (DEVICE *dptr) { +sim_register_clock_unit (&clk_unit); /* declare clock unit */ tmr_poll = sim_rtcn_init (clk_unit.wait, TMR_CLK); /* init 100Hz timer */ sim_activate_abs (&clk_unit, tmr_poll); /* activate 100Hz unit */ tmxr_poll = tmr_poll * TMXR_MULT; /* set mux poll */ diff --git a/VAX/vax780_stddev.c b/VAX/vax780_stddev.c index 1237884b..40aaa491 100644 --- a/VAX/vax780_stddev.c +++ b/VAX/vax780_stddev.c @@ -672,6 +672,7 @@ return; t_stat clk_reset (DEVICE *dptr) { +sim_register_clock_unit (&clk_unit); /* declare clock unit */ tmr_poll = sim_rtcn_init (clk_unit.wait, TMR_CLK); /* init 100Hz timer */ sim_activate (&clk_unit, tmr_poll); /* activate 100Hz unit */ tmxr_poll = tmr_poll * TMXR_MULT; /* set mux poll */ diff --git a/VAX/vax860_stddev.c b/VAX/vax860_stddev.c index 760d8cb7..45adc1f9 100644 --- a/VAX/vax860_stddev.c +++ b/VAX/vax860_stddev.c @@ -809,6 +809,7 @@ return; t_stat clk_reset (DEVICE *dptr) { +sim_register_clock_unit (&clk_unit); /* declare clock unit */ tmr_poll = sim_rtcn_init (clk_unit.wait, TMR_CLK); /* init 100Hz timer */ sim_activate (&clk_unit, tmr_poll); /* activate 100Hz unit */ tmxr_poll = tmr_poll * TMXR_MULT; /* set mux poll */