projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d675990
)
arm_timer: fix oneshot mode
author
Rabin Vincent
<rabin@rab.in>
Sun, 2 May 2010 09:50:52 +0000
(15:20 +0530)
committer
Aurelien Jarno
<aurelien@aurel32.net>
Fri, 21 May 2010 10:00:22 +0000
(12:00 +0200)
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>
hw/arm_timer.c
patch
|
blob
|
history
diff --git
a/hw/arm_timer.c
b/hw/arm_timer.c
index 5b6947a16684db78e2efe331549899a4c064cbd5..9073ffc00773e217265ec32faf88dae9f1f30282 100644
(file)
--- 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;