diff options
| author | Bernhard Kauer <kauer@os.inf.tu-dresden.de> | 2009-09-02 09:49:05 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-09-09 17:31:27 -0500 |
| commit | 98815437f731372d9456f6a2ad103f3b836a9646 (patch) | |
| tree | 90602110e7960621eae82698312f4a74ba66e2b1 /hw/mc146818rtc.c | |
| parent | e09a5267adf0af25b55d2abaf06e288b2d9537ea (diff) | |
| download | qemu-98815437f731372d9456f6a2ad103f3b836a9646.zip | |
RTC polling mode broken
The RTC emulation does not set the IRQ flags independent of the IRQ enable bits.
The original MC146818A datasheet from 1984 notes:
"flag bits in Register C [...] are set independent of the
state of the corresponding enable bits in Register B"
Similar sections can be found in newer documentation e.g. in rtc82885.
Qemu and Bochs set the IRQ flags only if they are enabled,
which breaks drivers polling on them.
The following patch corrects this for the update-ended-flag in Qemu only.
It does not fix the handling of the other flags.
Signed-off-by: Bernhard Kauer <kauer@tudos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mc146818rtc.c')
| -rw-r--r-- | hw/mc146818rtc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 5c8676ef68..5f1760c58c 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -421,9 +421,10 @@ static void rtc_update_second2(void *opaque) } /* update ended interrupt */ + s->cmos_data[RTC_REG_C] |= REG_C_UF; if (s->cmos_data[RTC_REG_B] & REG_B_UIE) { - s->cmos_data[RTC_REG_C] |= 0x90; - rtc_irq_raise(s->irq); + s->cmos_data[RTC_REG_C] |= REG_C_IRQF; + rtc_irq_raise(s->irq); } /* clear update in progress bit */ |