diff options
| author | Havard Skinnemoen | 2020-10-23 23:06:33 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-10-27 11:44:07 +0100 |
| commit | 2ac88848cb03605e2fae6a035650eea461218af2 (patch) | |
| tree | c17813e66e639702e638c144d825d3bb2ee1b19f | |
| parent | hw/arm: fix min_cpus for xlnx-versal-virt platform (diff) | |
| download | qemu-2ac88848cb03605e2fae6a035650eea461218af2.tar.gz qemu-2ac88848cb03605e2fae6a035650eea461218af2.tar.xz qemu-2ac88848cb03605e2fae6a035650eea461218af2.zip | |
Move npcm7xx_timer_reached_zero call out of npcm7xx_timer_pause
This allows us to reuse npcm7xx_timer_pause for the watchdog timer.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Havard Skinnemoen <hskinnemoen@google.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/timer/npcm7xx_timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c index 5703e43d40..2df9e3e496 100644 --- a/hw/timer/npcm7xx_timer.c +++ b/hw/timer/npcm7xx_timer.c @@ -157,9 +157,6 @@ static void npcm7xx_timer_pause(NPCM7xxTimer *t) timer_del(&t->qtimer); now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); t->remaining_ns = t->expires_ns - now; - if (t->remaining_ns <= 0) { - npcm7xx_timer_reached_zero(t); - } } /* @@ -239,6 +236,9 @@ static void npcm7xx_timer_write_tcsr(NPCM7xxTimer *t, uint32_t new_tcsr) } else { t->tcsr &= ~NPCM7XX_TCSR_CACT; npcm7xx_timer_pause(t); + if (t->remaining_ns <= 0) { + npcm7xx_timer_reached_zero(t); + } } } } |