[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] Move npcm7xx_timer_reached_zero call out of npcm7xx_timer_pa
From: |
Havard Skinnemoen |
Subject: |
[PATCH 2/6] Move npcm7xx_timer_reached_zero call out of npcm7xx_timer_pause |
Date: |
Thu, 8 Oct 2020 16:21:50 -0700 |
This allows us to reuse npcm7xx_timer_pause for the watchdog timer.
Signed-off-by: Havard Skinnemoen <hskinnemoen@google.com>
---
hw/timer/npcm7xx_timer.c | 6 +++---
1 file 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);
+ }
}
}
}
--
2.28.0.1011.ga647a8990f-goog
- [PATCH 0/6] Additional NPCM7xx features, devices and tests, Havard Skinnemoen, 2020/10/08
- [PATCH 1/6] tests/qtest: Add npcm7xx timer test, Havard Skinnemoen, 2020/10/08
- [PATCH 3/6] hw/timer: Adding watchdog for NPCM7XX Timer., Havard Skinnemoen, 2020/10/08
- [PATCH 5/6] hw/arm/npcm7xx: Add EHCI and OHCI controllers, Havard Skinnemoen, 2020/10/08
- [PATCH 4/6] hw/misc: Add npcm7xx random number generator, Havard Skinnemoen, 2020/10/08
- [PATCH 2/6] Move npcm7xx_timer_reached_zero call out of npcm7xx_timer_pause,
Havard Skinnemoen <=
- [PATCH 6/6] hw/gpio: Add GPIO model for Nuvoton NPCM7xx, Havard Skinnemoen, 2020/10/08
- Re: [PATCH 0/6] Additional NPCM7xx features, devices and tests, Peter Maydell, 2020/10/20