[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/20] apci: switch timer to memory api [ich9]
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 05/20] apci: switch timer to memory api [ich9] |
Date: |
Fri, 23 Nov 2012 16:48:16 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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 e03b1a6..b3022c0 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;
@@ -323,7 +320,7 @@ static void pm_powerdown_req(Notifier *n, void *opaque)
void ich9_pm_init(ICH9LPCPMRegs *pm, qemu_irq sci_irq, qemu_irq cmos_s3)
{
memory_region_init_io(&pm->io, &pm_io_ops, pm, "ich9-pm", ICH9_PMIO_SIZE);
- 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);
--
1.7.1
- [Qemu-devel] [PATCH 00/20] acpi: switch to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 02/20] apci: switch ich9 to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 05/20] apci: switch timer to memory api [ich9],
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 03/20] apci: switch vt82c686 to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 17/20] apci: switch piix4 gpe to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 07/20] apci: switch cnt to memory api [ich9], Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 12/20] apci: switch ich9 gpe to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 08/20] apci: switch evt to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 01/20] apci: switch piix4 to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 16/20] acpi: fix piix4 smbus mapping, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 06/20] apci: switch cnt to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 18/20] acpi: remove acpi_gpe_blk, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 20/20] q35: update lpc pci config space according to configured devices, Gerd Hoffmann, 2012/11/23