proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-07 07:30:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make rtc alatm work

Browse Source 
Convert alarm time from BCD if needed before comparing with current
time.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gleb Natapov 2010-07-05 11:36:34 +03:00 committed by Anthony Liguori
parent 680a34eeb8
commit f292787d9a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/mc146818rtc.c
View File

@ -214,7 +214,6 @@ static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data)
case RTC_SECONDS_ALARM: case RTC_SECONDS_ALARM:
case RTC_MINUTES_ALARM: case RTC_MINUTES_ALARM:
case RTC_HOURS_ALARM: case RTC_HOURS_ALARM:
/* XXX: not supported */
s->cmos_data[s->cmos_index] = data; s->cmos_data[s->cmos_index] = data;
break; break;
case RTC_SECONDS: case RTC_SECONDS:
@ -414,11 +413,11 @@ static void rtc_update_second2(void *opaque)
/* check alarm */ /* check alarm */
if (s->cmos_data[RTC_REG_B] & REG_B_AIE) { if (s->cmos_data[RTC_REG_B] & REG_B_AIE) {
if (((s->cmos_data[RTC_SECONDS_ALARM] & 0xc0) == 0xc0 || if (((s->cmos_data[RTC_SECONDS_ALARM] & 0xc0) == 0xc0 ||
s->cmos_data[RTC_SECONDS_ALARM] == s->current_tm.tm_sec) && rtc_from_bcd(s, s->cmos_data[RTC_SECONDS_ALARM]) == s->current_tm.tm_sec) &&
((s->cmos_data[RTC_MINUTES_ALARM] & 0xc0) == 0xc0 || ((s->cmos_data[RTC_MINUTES_ALARM] & 0xc0) == 0xc0 ||
s->cmos_data[RTC_MINUTES_ALARM] == s->current_tm.tm_mon) && rtc_from_bcd(s, s->cmos_data[RTC_MINUTES_ALARM]) == s->current_tm.tm_min) &&
((s->cmos_data[RTC_HOURS_ALARM] & 0xc0) == 0xc0 || ((s->cmos_data[RTC_HOURS_ALARM] & 0xc0) == 0xc0 ||
s->cmos_data[RTC_HOURS_ALARM] == s->current_tm.tm_hour)) { rtc_from_bcd(s, s->cmos_data[RTC_HOURS_ALARM]) == s->current_tm.tm_hour)) {
s->cmos_data[RTC_REG_C] |= 0xa0; s->cmos_data[RTC_REG_C] |= 0xa0;
qemu_irq_raise(s->irq); qemu_irq_raise(s->irq);