summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2007-12-19 17:59:31 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2007-12-19 17:59:31 +0000
commit3b4aa426a92ecf449d6b3c8317f5e3fb1544cdef (patch)
treeba591ea5979c8ec7961b6d82546f2655264145bf /hw
parentbd7e2875fe99ca9621c02666e11389602b512f4b (diff)
downloadqemu-3b4aa426a92ecf449d6b3c8317f5e3fb1544cdef.tar.gz
All registers are set to 0 on reset (Robert Reif)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3841 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/slavio_timer.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c
index e854358175..9987d38aea 100644
--- a/hw/slavio_timer.c
+++ b/hw/slavio_timer.c
@@ -311,13 +311,11 @@ static void slavio_timer_reset(void *opaque)
{
SLAVIO_TIMERState *s = opaque;
- if (slavio_timer_is_user(s))
- s->limit = TIMER_MAX_COUNT64;
- else
- s->limit = TIMER_MAX_COUNT32;
+ s->limit = 0;
s->count = 0;
s->reached = 0;
- ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(s->limit), 1);
+ s->slave_mode = 0;
+ ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1);
ptimer_run(s->timer, 0);
s->running = 1;
qemu_irq_lower(s->irq);