[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/18] acpi: remove acpi_gpe_blk
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 15/18] acpi: remove acpi_gpe_blk |
Date: |
Tue, 27 Nov 2012 09:59:25 +0100 |
With gpe being switched to memory api this is no longer needed.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/acpi.c | 7 -------
hw/acpi.h | 2 --
hw/acpi_ich9.c | 1 -
hw/acpi_piix4.c | 1 -
4 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/hw/acpi.c b/hw/acpi.c
index e58e45f..ae29a59 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -493,11 +493,6 @@ void acpi_gpe_init(ACPIREGS *ar, uint8_t len)
ar->gpe.en = g_malloc0(len / 2);
}
-void acpi_gpe_blk(ACPIREGS *ar, uint32_t blk)
-{
- ar->gpe.blk = blk;
-}
-
void acpi_gpe_reset(ACPIREGS *ar)
{
memset(ar->gpe.sts, 0, ar->gpe.len / 2);
@@ -523,7 +518,6 @@ void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr,
uint32_t val)
{
uint8_t *cur;
- addr -= ar->gpe.blk;
cur = acpi_gpe_ioport_get_ptr(ar, addr);
if (addr < ar->gpe.len / 2) {
/* GPE_STS */
@@ -541,7 +535,6 @@ uint32_t acpi_gpe_ioport_readb(ACPIREGS *ar, uint32_t addr)
uint8_t *cur;
uint32_t val;
- addr -= ar->gpe.blk;
cur = acpi_gpe_ioport_get_ptr(ar, addr);
val = 0;
if (cur != NULL) {
diff --git a/hw/acpi.h b/hw/acpi.h
index 918d7f5..afda153 100644
--- a/hw/acpi.h
+++ b/hw/acpi.h
@@ -104,7 +104,6 @@ struct ACPIPM1CNT {
};
struct ACPIGPE {
- uint32_t blk;
uint8_t len;
uint8_t *sts;
@@ -150,7 +149,6 @@ void acpi_pm1_cnt_reset(ACPIREGS *ar);
/* GPE0 */
void acpi_gpe_init(ACPIREGS *ar, uint8_t len);
-void acpi_gpe_blk(ACPIREGS *ar, uint32_t blk);
void acpi_gpe_reset(ACPIREGS *ar);
void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr, uint32_t val);
diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c
index db0d7a5..c5978d3 100644
--- a/hw/acpi_ich9.c
+++ b/hw/acpi_ich9.c
@@ -212,7 +212,6 @@ void ich9_pm_init(ICH9LPCPMRegs *pm, qemu_irq sci_irq,
qemu_irq cmos_s3)
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, 0);
memory_region_init_io(&pm->io_gpe, &ich9_gpe_ops, pm, "apci-gpe0",
ICH9_PMIO_GPE0_LEN);
memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe);
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index c1a58d3..d2ba56e 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -582,7 +582,6 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus,
PIIX4PMState *s)
memory_region_init_io(&s->io_gpe, &piix4_gpe_ops, s, "apci-gpe0",
GPE_LEN);
memory_region_add_subregion(get_system_io(), GPE_BASE, &s->io_gpe);
- acpi_gpe_blk(&s->ar, 0);
register_ioport_read(PCI_UP_BASE, 4, 4, pci_up_read, s);
register_ioport_read(PCI_DOWN_BASE, 4, 4, pci_down_read, s);
--
1.7.1
- [Qemu-devel] [PATCH v2 00/18] acpi: switch to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 07/18] acpi: cleanup piix4 memory region, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 03/18] apci: switch vt82c686 to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 02/18] apci: switch ich9 to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 18/18] acpi: drop debug port, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 08/18] acpi: cleanup vt82c686 memory region, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 16/18] apci: switch piix4 pci hotplug to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 15/18] acpi: remove acpi_gpe_blk,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 14/18] apci: switch piix4 gpe to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 01/18] apci: switch piix4 to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 12/18] acpi: switch smbus to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 10/18] apci: switch ich9 smi to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 06/18] apci: switch evt to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 04/18] apci: switch timer to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 11/18] acpi: cleanup ich9 memory region, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 05/18] apci: switch cnt to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 17/18] q35: update lpc pci config space according to configured devices, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 13/18] acpi: fix piix4 smbus mapping, Gerd Hoffmann, 2012/11/27