From b8842e40e5433da12b28eb9f983b19708cd7d5e8 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Wed, 26 Oct 2016 16:16:36 -0700
Subject: [PATCH] TIMER: Fix internal calibrated clock to be well behaved while
 idling.

---
 scp.c       | 2 +-
 sim_timer.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scp.c b/scp.c
index 7d1361ca..f5fe4a9d 100644
--- a/scp.c
+++ b/scp.c
@@ -4628,7 +4628,7 @@ else {
                 if ((dptr = find_dev_from_unit (uptr)) != NULL) {
                     fprintf (st, "  %s", sim_dname (dptr));
                     if (dptr->numunits > 1)
-                        fprintf (st, " unit %d", (int32) (uptr - dptr->units));
+                        fprintf (st, " at %d%s\n", accum + uptr->time, (uptr->flags & UNIT_IDLE) ? " (Idle capable)" : "");
                     }
                 else
                     fprintf (st, "  Unknown");
diff --git a/sim_timer.c b/sim_timer.c
index 23d60053..70a524da 100644
--- a/sim_timer.c
+++ b/sim_timer.c
@@ -843,10 +843,10 @@ uint32 clock_start, clock_last, clock_now;
 sim_debug (DBG_TRC, &sim_timer_dev, "sim_timer_init()\n");
 for (i=0; i<SIM_NTIMERS; i++) {
     sim_timer_units[i].action = &sim_timer_tick_svc;
-    sim_timer_units[i].flags = UNIT_DIS;
+    sim_timer_units[i].flags = UNIT_DIS | UNIT_IDLE;
     }
 sim_timer_units[SIM_NTIMERS].action = &sim_throt_svc;
-sim_timer_units[SIM_NTIMERS].flags = UNIT_DIS;
+sim_timer_units[SIM_NTIMERS].flags = UNIT_DIS | UNIT_IDLE;
 sim_register_internal_device (&sim_timer_dev);
 sim_idle_enab = FALSE;                                  /* init idle off */
 sim_idle_rate_ms = sim_os_ms_sleep_init ();             /* get OS timer rate */
@@ -1552,7 +1552,7 @@ for (i = 0; i < SIM_NTIMERS; i++)
 if (i == SIM_NTIMERS) {     /* No clocks have signed in. */
     /* setup internal clock */
     sim_timer_units[SIM_NTIMERS+1].action = &sim_timer_clock_tick_svc;
-    sim_timer_units[SIM_NTIMERS+1].flags = UNIT_DIS;
+    sim_timer_units[SIM_NTIMERS+1].flags = UNIT_DIS | UNIT_IDLE;
     }
 if (sim_timer_units[SIM_NTIMERS+1].action == &sim_timer_clock_tick_svc) {
     /* actual clock reset */