ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RTC: Rename rtc_timer_update 

Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Yang Zhang 2012-08-02 18:04:05 +02:00 committed by Anthony Liguori
parent bedc572eae
commit c4c18e246f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/mc146818rtc.c
View File

@ -110,7 +110,7 @@ static void rtc_coalesced_timer(void *opaque)
} }
#endif #endif
static void rtc_timer_update(RTCState *s, int64_t current_time) static void periodic_timer_update(RTCState *s, int64_t current_time)
{ {
int period_code, period; int period_code, period;
int64_t cur_clock, next_irq_clock; int64_t cur_clock, next_irq_clock;
@ -148,7 +148,7 @@ static void rtc_periodic_timer(void *opaque)
{ {
RTCState *s = opaque; RTCState *s = opaque;
rtc_timer_update(s, s->next_periodic_time); periodic_timer_update(s, s->next_periodic_time);
s->cmos_data[RTC_REG_C] |= REG_C_PF; s->cmos_data[RTC_REG_C] |= REG_C_PF;
if (s->cmos_data[RTC_REG_B] & REG_B_PIE) { if (s->cmos_data[RTC_REG_B] & REG_B_PIE) {
s->cmos_data[RTC_REG_C] |= REG_C_IRQF; s->cmos_data[RTC_REG_C] |= REG_C_IRQF;
@ -207,7 +207,7 @@ static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data)
/* UIP bit is read only */ /* UIP bit is read only */
s->cmos_data[RTC_REG_A] = (data & ~REG_A_UIP) | s->cmos_data[RTC_REG_A] = (data & ~REG_A_UIP) |
(s->cmos_data[RTC_REG_A] & REG_A_UIP); (s->cmos_data[RTC_REG_A] & REG_A_UIP);
rtc_timer_update(s, qemu_get_clock_ns(rtc_clock)); periodic_timer_update(s, qemu_get_clock_ns(rtc_clock));
break; break;
case RTC_REG_B: case RTC_REG_B:
if (data & REG_B_SET) { if (data & REG_B_SET) {
@ -221,7 +221,7 @@ static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data)
} }
} }
s->cmos_data[RTC_REG_B] = data; s->cmos_data[RTC_REG_B] = data;
rtc_timer_update(s, qemu_get_clock_ns(rtc_clock)); periodic_timer_update(s, qemu_get_clock_ns(rtc_clock));
break; break;
case RTC_REG_C: case RTC_REG_C:
case RTC_REG_D: case RTC_REG_D:
@ -550,7 +550,7 @@ static void rtc_notify_clock_reset(Notifier *notifier, void *data)
rtc_set_date_from_host(&s->dev); rtc_set_date_from_host(&s->dev);
s->next_second_time = now + (get_ticks_per_sec() * 99) / 100; s->next_second_time = now + (get_ticks_per_sec() * 99) / 100;
qemu_mod_timer(s->second_timer2, s->next_second_time); qemu_mod_timer(s->second_timer2, s->next_second_time);
rtc_timer_update(s, now); periodic_timer_update(s, now);
#ifdef TARGET_I386 #ifdef TARGET_I386
if (s->lost_tick_policy == LOST_TICK_SLEW) { if (s->lost_tick_policy == LOST_TICK_SLEW) {
rtc_coalesced_timer_update(s); rtc_coalesced_timer_update(s);