* [Qemu-devel] [PATCH] make rtc alatm work
@ 2010-07-05 8:36 Gleb Natapov
2010-07-06 15:46 ` Anthony Liguori
0 siblings, 1 reply; 2+ messages in thread
From: Gleb Natapov @ 2010-07-05 8:36 UTC (permalink / raw)
To: qemu-devel
Convert alarm time from BCD if needed before comparing with current
time.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index c3459bf..2b91fa8 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -214,7 +214,6 @@ static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data)
case RTC_SECONDS_ALARM:
case RTC_MINUTES_ALARM:
case RTC_HOURS_ALARM:
- /* XXX: not supported */
s->cmos_data[s->cmos_index] = data;
break;
case RTC_SECONDS:
@@ -414,11 +413,11 @@ static void rtc_update_second2(void *opaque)
/* check alarm */
if (s->cmos_data[RTC_REG_B] & REG_B_AIE) {
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] == 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] == 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;
qemu_irq_raise(s->irq);
--
Gleb.
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] make rtc alatm work
2010-07-05 8:36 [Qemu-devel] [PATCH] make rtc alatm work Gleb Natapov
@ 2010-07-06 15:46 ` Anthony Liguori
0 siblings, 0 replies; 2+ messages in thread
From: Anthony Liguori @ 2010-07-06 15:46 UTC (permalink / raw)
To: Gleb Natapov; +Cc: qemu-devel
On 07/05/2010 03:36 AM, Gleb Natapov wrote:
> Convert alarm time from BCD if needed before comparing with current
> time.
>
> Signed-off-by: Gleb Natapov<gleb@redhat.com>
>
Applied. Thanks.
Regards,
Anthony Liguori
> diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
> index c3459bf..2b91fa8 100644
> --- a/hw/mc146818rtc.c
> +++ b/hw/mc146818rtc.c
> @@ -214,7 +214,6 @@ static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data)
> case RTC_SECONDS_ALARM:
> case RTC_MINUTES_ALARM:
> case RTC_HOURS_ALARM:
> - /* XXX: not supported */
> s->cmos_data[s->cmos_index] = data;
> break;
> case RTC_SECONDS:
> @@ -414,11 +413,11 @@ static void rtc_update_second2(void *opaque)
> /* check alarm */
> if (s->cmos_data[RTC_REG_B]& REG_B_AIE) {
> 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] == 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] == 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;
> qemu_irq_raise(s->irq);
> --
> Gleb.
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-06 15:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-05 8:36 [Qemu-devel] [PATCH] make rtc alatm work Gleb Natapov
2010-07-06 15:46 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).