summaryrefslogtreecommitdiff
path: root/hw/mips_r4k.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2010-06-13 14:15:40 +0200
committerBlue Swirl <blauwirbel@gmail.com>2010-06-13 15:33:00 +0300
commit7d932dfdc5ebc07a7bfed9c01e587c9c7e9b6e26 (patch)
treef3fc984cd0abc83b394897c617c1da7d78426a21 /hw/mips_r4k.c
parent9cec89e8db494df43faf242a5a030bc6540c89dd (diff)
downloadqemu-7d932dfdc5ebc07a7bfed9c01e587c9c7e9b6e26.tar.gz
qemu-7d932dfdc5ebc07a7bfed9c01e587c9c7e9b6e26.tar.bz2
qemu-7d932dfdc5ebc07a7bfed9c01e587c9c7e9b6e26.zip
hpet/rtc: Rework RTC IRQ replacement by HPET
Allow the intercept the RTC IRQ for the HPET legacy mode. Then push routing to IRQ8 completely into the HPET. This allows to turn hpet_in_legacy_mode() into a private function. Furthermore, this stops the RTC from clearing IRQ8 even if the HPET is in control. This patch comes with a side effect: The RTC timers will no longer be stoppend when there is no IRQ consumer, possibly causing a minor performance degration. But as the guest may want to redirect the RTC to the SCI in that mode, it should normally disable unused IRQ source anyway. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/mips_r4k.c')
-rw-r--r--hw/mips_r4k.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index f1fcfcd2ed..5a96dea003 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -267,7 +267,7 @@ void mips_r4k_init (ram_addr_t ram_size,
isa_bus_new(NULL);
isa_bus_irqs(i8259);
- rtc_state = rtc_init(2000);
+ rtc_state = rtc_init(2000, NULL);
/* Register 64 KB of ISA IO space at 0x14000000 */
#ifdef TARGET_WORDS_BIGENDIAN