aboutsummaryrefslogtreecommitdiff
path: root/hw/i8254.h
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-02-01 20:31:41 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2012-02-17 09:58:22 -0600
commitce967e2f33861b0e17753f97fa4527b5943c94b6 (patch)
tree3f5c160e2b43162aa2dfda85eeb4813f20ebade4 /hw/i8254.h
parent319ba9f52737fc79de5c2c6abd059933398b72d5 (diff)
downloadqemu-ce967e2f33861b0e17753f97fa4527b5943c94b6.zip
qemu-ce967e2f33861b0e17753f97fa4527b5943c94b6.tar.gz
qemu-ce967e2f33861b0e17753f97fa4527b5943c94b6.tar.bz2
i8254: Rework & fix interaction with HPET in legacy mode
When the HPET enters legacy mode, the IRQ output of the PIT is suppressed and replaced by the HPET timer 0. But the current code to emulate this was broken in many ways. It reset the PIT state after re-enabling, it worked against a stale static PIT structure, and it did not properly saved/restored the IRQ output mask in the PIT vmstate. This patch solves the PIT IRQ control in a different way. On x86, it both redirects the PIT IRQ to the HPET, just like the RTC. But it also keeps the control line from the HPET to the PIT. This allows to disable the PIT QEMU timer when it is not needed. The PIT's view on the control line state is now saved in the same format that qemu-kvm is already using. Note that, in contrast to the suppressed RTC IRQ line, we do not need to save/restore the PIT line state in the HPET. As we trigger a PIT IRQ update via the control line, the line state is reconstructed on mode switch. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/i8254.h')
-rw-r--r--hw/i8254.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/i8254.h b/hw/i8254.h
index fc64a63..8ad8e07 100644
--- a/hw/i8254.h
+++ b/hw/i8254.h
@@ -50,7 +50,4 @@ int pit_get_initial_count(ISADevice *dev, int channel);
int pit_get_mode(ISADevice *dev, int channel);
int pit_get_out(ISADevice *dev, int channel, int64_t current_time);
-void hpet_pit_disable(void);
-void hpet_pit_enable(void);
-
#endif /* !HW_I8254_H */