From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvXRW-0005qz-MS for qemu-devel@nongnu.org; Thu, 09 Feb 2012 12:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvXRM-0003ax-KC for qemu-devel@nongnu.org; Thu, 09 Feb 2012 12:05:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvXRM-0003al-DS for qemu-devel@nongnu.org; Thu, 09 Feb 2012 12:05:48 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q19H5lvJ024664 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 9 Feb 2012 12:05:47 -0500 From: Gerd Hoffmann Date: Thu, 9 Feb 2012 18:05:36 +0100 Message-Id: <1328807143-29499-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1328807143-29499-1-git-send-email-kraxel@redhat.com> References: <1328807143-29499-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v4 04/11] acpi: add acpi_pm1_evt_write_en List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , gleb@redhat.com Signed-off-by: Gerd Hoffmann --- 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 b6899f4..9c72e62 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 10e066b..d8f4e26 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