diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2012-08-02 18:04:06 +0200 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2012-09-10 13:52:28 -0500 |
| commit | e46deabaa58b78397aeef2b04147aeecf5933794 (patch) | |
| tree | 819f4cf816e5c71fffe5caf1afea9f4a35946979 | |
| parent | c4c18e246f968f18dc656afa3e8de7cf6b9752e8 (diff) | |
RTC: introduce RTC_CLOCK_RATE
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/mc146818rtc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index b99f4d35f..175ddac6f 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -46,6 +46,7 @@ #endif #define RTC_REINJECT_ON_ACK_COUNT 20 +#define RTC_CLOCK_RATE 32768 typedef struct RTCState { ISADevice dev; @@ -85,7 +86,7 @@ static void rtc_coalesced_timer_update(RTCState *s) /* divide each RTC interval to 2 - 8 smaller intervals */ int c = MIN(s->irq_coalesced, 7) + 1; int64_t next_clock = qemu_get_clock_ns(rtc_clock) + - muldiv64(s->period / c, get_ticks_per_sec(), 32768); + muldiv64(s->period / c, get_ticks_per_sec(), RTC_CLOCK_RATE); qemu_mod_timer(s->coalesced_timer, next_clock); } } @@ -131,10 +132,10 @@ static void periodic_timer_update(RTCState *s, int64_t current_time) s->period = period; #endif /* compute 32 khz clock */ - cur_clock = muldiv64(current_time, 32768, get_ticks_per_sec()); + cur_clock = muldiv64(current_time, RTC_CLOCK_RATE, get_ticks_per_sec()); next_irq_clock = (cur_clock & ~(period - 1)) + period; s->next_periodic_time = - muldiv64(next_irq_clock, get_ticks_per_sec(), 32768) + 1; + muldiv64(next_irq_clock, get_ticks_per_sec(), RTC_CLOCK_RATE) + 1; qemu_mod_timer(s->periodic_timer, s->next_periodic_time); } else { #ifdef TARGET_I386 @@ -369,7 +370,7 @@ static void rtc_update_second(void *opaque) /* update in progress bit */ s->cmos_data[RTC_REG_A] |= REG_A_UIP; } - /* should be 244 us = 8 / 32768 seconds, but currently the + /* should be 244 us = 8 / RTC_CLOCK_RATE seconds, but currently the timers do not have the necessary resolution. */ delay = (get_ticks_per_sec() * 1) / 100; if (delay < 1) |