[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v12 4/9] hw/ptimer: Support "on the fly" timer mode
From: |
Dmitry Osipenko |
Subject: |
[Qemu-devel] [PATCH v12 4/9] hw/ptimer: Support "on the fly" timer mode switch |
Date: |
Sat, 30 Jan 2016 19:43:13 +0300 |
Allow switching between periodic <-> oneshot modes while timer is running.
Signed-off-by: Dmitry Osipenko <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
---
hw/core/ptimer.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index f58790a..78ae443 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -162,16 +162,17 @@ void ptimer_set_count(ptimer_state *s, uint64_t count)
void ptimer_run(ptimer_state *s, int oneshot)
{
- if (s->enabled) {
- return;
- }
- if (s->period == 0) {
+ bool was_disabled = !s->enabled;
+
+ if (was_disabled && s->period == 0) {
fprintf(stderr, "Timer with period zero, disabling\n");
return;
}
s->enabled = oneshot ? 2 : 1;
- s->next_event = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
- ptimer_reload(s);
+ if (was_disabled) {
+ s->next_event = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+ ptimer_reload(s);
+ }
}
/* Pause a timer. Note that this may cause it to "lose" time, even if it
--
2.7.0
- [Qemu-devel] [PATCH v12 0/9] PTimer fixes/features and ARM MPTimer conversion, Dmitry Osipenko, 2016/01/30
- [Qemu-devel] [PATCH v12 1/9] hw/ptimer: Fix issues caused by the adjusted timer limit value, Dmitry Osipenko, 2016/01/30
- [Qemu-devel] [PATCH v12 4/9] hw/ptimer: Support "on the fly" timer mode switch,
Dmitry Osipenko <=
- [Qemu-devel] [PATCH v12 3/9] hw/ptimer: Update .delta on period/freq change, Dmitry Osipenko, 2016/01/30
- [Qemu-devel] [PATCH v12 8/9] hw/ptimer: Perform delayed tick instead of immediate if delta = 0, Dmitry Osipenko, 2016/01/30
- [Qemu-devel] [PATCH v12 5/9] hw/ptimer: Introduce ptimer_get_limit, Dmitry Osipenko, 2016/01/30
- [Qemu-devel] [PATCH v12 2/9] hw/ptimer: Perform counter wrap around if timer already expired, Dmitry Osipenko, 2016/01/30
- [Qemu-devel] [PATCH v12 6/9] hw/ptimer: Legalize running with delta = load = 0 and abort on period = 0, Dmitry Osipenko, 2016/01/30
- [Qemu-devel] [PATCH v12 7/9] hw/ptimer: Fix counter - 1 returned by ptimer_get_count for the active timer, Dmitry Osipenko, 2016/01/30
- [Qemu-devel] [PATCH v12 9/9] arm_mptimer: Convert to use ptimer, Dmitry Osipenko, 2016/01/30