diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-11-22 13:17:57 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-12-04 13:52:42 +0100 |
| commit | afafe4bbe0cf7d3318e1ac7b40925561f86a6bd4 (patch) | |
| tree | 2a60fad66478806872933bca752d76e3af13df52 /hw/acpi_ich9.c | |
| parent | 77d58b1e47c8d1c661f98f12b47ab519d3561488 (diff) | |
| download | focaccia-qemu-afafe4bbe0cf7d3318e1ac7b40925561f86a6bd4.tar.gz focaccia-qemu-afafe4bbe0cf7d3318e1ac7b40925561f86a6bd4.zip | |
apci: switch cnt 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 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index ec6d5f2b5a..7b6c2ef4dc 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c @@ -116,9 +116,6 @@ static void pm_ioport_writew(void *opaque, uint32_t addr, uint32_t val) pm->acpi_regs.pm1.evt.en = val; pm_update_sci(pm); break; - case ICH9_PMIO_PM1_CNT: - acpi_pm1_cnt_write(&pm->acpi_regs, val, 0); - break; default: pm_ioport_write_fallback(opaque, addr, 2, val); break; @@ -138,9 +135,6 @@ static uint32_t pm_ioport_readw(void *opaque, uint32_t addr) case ICH9_PMIO_PM1_EN: val = pm->acpi_regs.pm1.evt.en; break; - case ICH9_PMIO_PM1_CNT: - val = pm->acpi_regs.pm1.cnt.cnt; - break; default: val = pm_ioport_read_fallback(opaque, addr, 2); break; @@ -318,7 +312,7 @@ void ich9_pm_init(ICH9LPCPMRegs *pm, qemu_irq sci_irq, qemu_irq cmos_s3) memory_region_add_subregion(get_system_io(), 0, &pm->io); acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io); - acpi_pm1_cnt_init(&pm->acpi_regs); + acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io); acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN); acpi_gpe_blk(&pm->acpi_regs, ICH9_PMIO_GPE0_STS); |