aboutsummaryrefslogtreecommitdiff
path: root/hw/arm_timer.c
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2010-05-02 15:20:52 +0530
committerAurelien Jarno <aurelien@aurel32.net>2010-05-21 12:00:22 +0200
commita9cf98d939c4f6539fad7e7d812ea16d96ba3dc9 (patch)
tree3552913c1ed28779ac10d631ed66610285b88fb6 /hw/arm_timer.c
parentd6759902cb467c002086853d2eb38fb969c29f7f (diff)
downloadqemu-a9cf98d939c4f6539fad7e7d812ea16d96ba3dc9.zip
qemu-a9cf98d939c4f6539fad7e7d812ea16d96ba3dc9.tar.gz
qemu-a9cf98d939c4f6539fad7e7d812ea16d96ba3dc9.tar.bz2
arm_timer: fix oneshot mode
In oneshot mode, the delta needs to come from the TimerLoad register, not the maximum limit. Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/arm_timer.c')
-rw-r--r--hw/arm_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm_timer.c b/hw/arm_timer.c
index 5b6947a..9073ffc 100644
--- a/hw/arm_timer.c
+++ b/hw/arm_timer.c
@@ -71,7 +71,7 @@ static void arm_timer_recalibrate(arm_timer_state *s, int reload)
{
uint32_t limit;
- if ((s->control & TIMER_CTRL_PERIODIC) == 0) {
+ if ((s->control & (TIMER_CTRL_PERIODIC | TIMER_CTRL_ONESHOT)) == 0) {
/* Free running. */
if (s->control & TIMER_CTRL_32BIT)
limit = 0xffffffff;