haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

RTC: introduce RTC_CLOCK_RATE

Browse source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2012-08-02 18:04:06 +02:00 committed by Anthony Liguori
parent c4c18e246f
commit e46deabaa5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hw/mc146818rtc.c
View file

@ -46,6 +46,7 @@
#endif #endif
#define RTC_REINJECT_ON_ACK_COUNT 20 #define RTC_REINJECT_ON_ACK_COUNT 20
#define RTC_CLOCK_RATE 32768
typedef struct RTCState { typedef struct RTCState {
ISADevice dev; ISADevice dev;
@ -85,7 +86,7 @@ static void rtc_coalesced_timer_update(RTCState *s)
/* divide each RTC interval to 2 - 8 smaller intervals */ /* divide each RTC interval to 2 - 8 smaller intervals */
int c = MIN(s->irq_coalesced, 7) + 1; int c = MIN(s->irq_coalesced, 7) + 1;
int64_t next_clock = qemu_get_clock_ns(rtc_clock) + 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); 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; s->period = period;
#endif #endif
/* compute 32 khz clock */ /* 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; next_irq_clock = (cur_clock & ~(period - 1)) + period;
s->next_periodic_time = 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); qemu_mod_timer(s->periodic_timer, s->next_periodic_time);
} else { } else {
#ifdef TARGET_I386 #ifdef TARGET_I386
@ -369,7 +370,7 @@ static void rtc_update_second(void *opaque)
/* update in progress bit */ /* update in progress bit */
s->cmos_data[RTC_REG_A] |= REG_A_UIP; 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. */ timers do not have the necessary resolution. */
delay = (get_ticks_per_sec() * 1) / 100; delay = (get_ticks_per_sec() * 1) / 100;
if (delay < 1) if (delay < 1)