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

Normalized the saved format of the optional VAX TODR persistent file so that it may be moved around from one platform to another along with other simulator state files (disk & tape images, save/restore files, etc.).

Browse source
This commit is contained in:
Mark Pizzolato 2012-01-13 10:51:26 -08:00
parent 3443839ba7
commit 3172e743ee
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
VAX/vax_stddev.c
View file

@ -27,6 +27,10 @@
tto terminal output tto terminal output
clk 100Hz and TODR clock clk 100Hz and TODR clock
13-Jan-12 MP Normalized the saved format of the TODR persistent
file so that it may be moved around from one platform
to another along with other simulator state files
(disk & tape images, save/restore files, etc.)
28-Sep-11 MP Generalized setting TODR for all OSes. 28-Sep-11 MP Generalized setting TODR for all OSes.
Unbound the TODR value from the 100hz clock tick Unbound the TODR value from the 100hz clock tick
interrupt. TODR now behaves like the original interrupt. TODR now behaves like the original
@ -49,9 +53,10 @@
(i.e. sim> attach TODR TOY_CLOCK). When operating (i.e. sim> attach TODR TOY_CLOCK). When operating
in OS Agnostic mode, the TODR will initially start in OS Agnostic mode, the TODR will initially start
counting from 0 and be adjusted differently when an counting from 0 and be adjusted differently when an
OS specifically writes to the TODR. VMS will prompt OS specifically writes to the TODR. On the first OS
to set the time on each boot unless the SYSGEN boot with an attached TODR VMS will prompt to set
parameter TIMEPROMPTWAIT is set to 0. the time unless the SYSGEN parameter TIMEPROMPTWAIT
is set to 0.
05-Jan-11 MP Added Asynch I/O support 05-Jan-11 MP Added Asynch I/O support
17-Aug-08 RMS Resync TODR on any clock reset 17-Aug-08 RMS Resync TODR on any clock reset
18-Jun-07 RMS Added UNIT_IDLE flag to console input, clock 18-Jun-07 RMS Added UNIT_IDLE flag to console input, clock
@ -96,6 +101,8 @@ int32 clk_tps = 100; /* ticks/second */
int32 todr_reg = 0; /* TODR register */ int32 todr_reg = 0; /* TODR register */
int32 todr_blow = 1; /* TODR battery low */ int32 todr_blow = 1; /* TODR battery low */
struct todr_battery_info { struct todr_battery_info {
char toy_gmtbase_a[16]; /* Platform independent Text format of toy_gmtbase */
char toy_gmtbasemsec_a[16]; /* Platform independent Text format of toy_gmtbasemsec */
uint32 toy_gmtbase; /* GMT base of set value */ uint32 toy_gmtbase; /* GMT base of set value */
uint32 toy_gmtbasemsec; /* The milliseconds of the set value */ uint32 toy_gmtbasemsec; /* The milliseconds of the set value */
}; };
@ -422,6 +429,8 @@ if (0 == todr_reg) /* clock running? */
#define TOY_MAX_SECS (0x40000000/25) #define TOY_MAX_SECS (0x40000000/25)
clock_gettime(CLOCK_REALTIME, &now); /* get curr time */ clock_gettime(CLOCK_REALTIME, &now); /* get curr time */
toy->toy_gmtbase = strtoul(toy->toy_gmtbase_a, NULL, 0);
toy->toy_gmtbasemsec = strtoul(toy->toy_gmtbasemsec_a, NULL, 0);
base.tv_sec = toy->toy_gmtbase; base.tv_sec = toy->toy_gmtbase;
base.tv_nsec = toy->toy_gmtbasemsec * 1000000; base.tv_nsec = toy->toy_gmtbasemsec * 1000000;
sim_timespec_diff (&val, &now, &base); sim_timespec_diff (&val, &now, &base);
@ -446,8 +455,10 @@ if (-1 == clock_gettime(CLOCK_REALTIME, &now)) /* get curr time */
val.tv_sec = ((uint32)data) / 100; val.tv_sec = ((uint32)data) / 100;
val.tv_nsec = (((uint32)data) % 100) * 10000000; val.tv_nsec = (((uint32)data) % 100) * 10000000;
sim_timespec_diff (&base, &now, &val); /* base = now - data */ sim_timespec_diff (&base, &now, &val); /* base = now - data */
toy->toy_gmtbase = base.tv_sec; toy->toy_gmtbase = (uint32)base.tv_sec;
toy->toy_gmtbasemsec = base.tv_nsec/1000000; toy->toy_gmtbasemsec = base.tv_nsec/1000000;
sprintf(toy->toy_gmtbase_a, "0x%08X", toy->toy_gmtbase);
sprintf(toy->toy_gmtbasemsec_a, "0x%08X", toy->toy_gmtbasemsec);
todr_reg = data; todr_reg = data;
if (data) if (data)
todr_blow = 0; todr_blow = 0;