diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-11-22 12:12:30 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-12-04 13:52:42 +0100 |
| commit | 77d58b1e47c8d1c661f98f12b47ab519d3561488 (patch) | |
| tree | c4bd95e2af7f7c6c4dc41e4753e08e260cb855d7 /hw/acpi_ich9.c | |
| parent | a29028214c1d5d3571b27e6745f14534e6d8a662 (diff) | |
apci: switch timer to memory api
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/acpi_ich9.c')
| -rw-r--r-- | hw/acpi_ich9.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index bf361ece5d..ec6d5f2b5a 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c @@ -170,9 +170,6 @@ static uint32_t pm_ioport_readl(void *opaque, uint32_t addr) uint32_t val; switch (addr & ICH9_PMIO_MASK) { - case ICH9_PMIO_PM1_TMR: - val = acpi_pm_tmr_get(&pm->acpi_regs); - break; case ICH9_PMIO_SMI_EN: val = pm->smi_en; break; @@ -320,7 +317,7 @@ void ich9_pm_init(ICH9LPCPMRegs *pm, qemu_irq sci_irq, qemu_irq cmos_s3) memory_region_set_enabled(&pm->io, false); memory_region_add_subregion(get_system_io(), 0, &pm->io); - acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn); + acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io); acpi_pm1_cnt_init(&pm->acpi_regs); acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN); acpi_gpe_blk(&pm->acpi_regs, ICH9_PMIO_GPE0_STS); |