Commit 3b4aa426a92ecf449d6b3c8317f5e3fb1544cdef
1 parent
bd7e2875
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
Showing
1 changed file
with
3 additions
and
5 deletions
hw/slavio_timer.c
| @@ -311,13 +311,11 @@ static void slavio_timer_reset(void *opaque) | @@ -311,13 +311,11 @@ static void slavio_timer_reset(void *opaque) | ||
| 311 | { | 311 | { |
| 312 | SLAVIO_TIMERState *s = opaque; | 312 | SLAVIO_TIMERState *s = opaque; |
| 313 | 313 | ||
| 314 | - if (slavio_timer_is_user(s)) | ||
| 315 | - s->limit = TIMER_MAX_COUNT64; | ||
| 316 | - else | ||
| 317 | - s->limit = TIMER_MAX_COUNT32; | 314 | + s->limit = 0; |
| 318 | s->count = 0; | 315 | s->count = 0; |
| 319 | s->reached = 0; | 316 | s->reached = 0; |
| 320 | - ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(s->limit), 1); | 317 | + s->slave_mode = 0; |
| 318 | + ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1); | ||
| 321 | ptimer_run(s->timer, 0); | 319 | ptimer_run(s->timer, 0); |
| 322 | s->running = 1; | 320 | s->running = 1; |
| 323 | qemu_irq_lower(s->irq); | 321 | qemu_irq_lower(s->irq); |