[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 04/12] acpi: add acpi_pm1_evt_write_en
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v6 04/12] acpi: add acpi_pm1_evt_write_en |
Date: |
Thu, 23 Feb 2012 13:45:18 +0100 |
Do APCIREGS->pm1.evt.en updates using the new acpi_pm1_evt_write_en
function, so the acpi code will see those updates.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/acpi.c | 5 +++++
hw/acpi.h | 1 +
hw/acpi_piix4.c | 2 +-
hw/vt82c686.c | 2 +-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/acpi.c b/hw/acpi.c
index 1129335..407949b 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -268,6 +268,11 @@ void acpi_pm1_evt_write_sts(ACPIREGS *ar, uint16_t val)
ar->pm1.evt.sts &= ~val;
}
+void acpi_pm1_evt_write_en(ACPIREGS *ar, uint16_t val)
+{
+ ar->pm1.evt.en = val;
+}
+
void acpi_pm1_evt_power_down(ACPIREGS *ar)
{
if (ar->pm1.evt.en & ACPI_BITMASK_POWER_BUTTON_ENABLE) {
diff --git a/hw/acpi.h b/hw/acpi.h
index e1d5e3b..88f8051 100644
--- a/hw/acpi.h
+++ b/hw/acpi.h
@@ -133,6 +133,7 @@ static inline int64_t acpi_pm_tmr_get_clock(void)
/* PM1a_EVT: piix and ich9 don't implement PM1b. */
uint16_t acpi_pm1_evt_get_sts(ACPIREGS *ar);
void acpi_pm1_evt_write_sts(ACPIREGS *ar, uint16_t val);
+void acpi_pm1_evt_write_en(ACPIREGS *ar, uint16_t val);
void acpi_pm1_evt_power_down(ACPIREGS *ar);
void acpi_pm1_evt_reset(ACPIREGS *ar);
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 5b16d20..1641229 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -117,7 +117,7 @@ static void pm_ioport_write(IORange *ioport, uint64_t addr,
unsigned width,
pm_update_sci(s);
break;
case 0x02:
- s->ar.pm1.evt.en = val;
+ acpi_pm1_evt_write_en(&s->ar, val);
pm_update_sci(s);
break;
case 0x04:
diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index 1b083de..a53bd8a 100644
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -206,7 +206,7 @@ static void pm_ioport_writew(void *opaque, uint32_t addr,
uint32_t val)
pm_update_sci(s);
break;
case 0x02:
- s->ar.pm1.evt.en = val;
+ acpi_pm1_evt_write_en(&s->ar, val);
pm_update_sci(s);
break;
case 0x04:
--
1.7.1
- [Qemu-devel] [PATCH v6 00/12] initial suspend support, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 01/12] acpi: move around structs, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 04/12] acpi: add acpi_pm1_evt_write_en,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v6 10/12] suspend: make rtc alarm wakeup the guest., Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 03/12] acpi: don't pass overflow_time to acpi_pm1_evt_get_sts, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 02/12] acpi: add ACPIREGS, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 12/12] suspend: add qmp events, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 09/12] suspend: make serial ports wakeup the guest., Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 11/12] suspend: make acpi timer wakeup the guest., Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 06/12] suspend: switch acpi s3 to new infrastructure., Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 08/12] suspend: make ps/2 devices wakeup the guest, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 07/12] suspend: add system_wakeup monitor command, Gerd Hoffmann, 2012/02/23
- [Qemu-devel] [PATCH v6 05/12] suspend: add infrastructure, Gerd Hoffmann, 2012/02/23