diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-11-23 15:37:05 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-12-04 13:52:43 +0100 |
| commit | c84649ca66a32aadba20a8202062b02247270ee5 (patch) | |
| tree | 07a03290b679584c89ef7954ed940f00573f77ab | |
| parent | b65b93f24cb84923d2d7d43cf87d40bc88b6bdcd (diff) | |
| download | qemu-c84649ca66a32aadba20a8202062b02247270ee5.tar.gz qemu-c84649ca66a32aadba20a8202062b02247270ee5.tar.bz2 qemu-c84649ca66a32aadba20a8202062b02247270ee5.zip | |
acpi: remove acpi_gpe_blk
With gpe being switched to memory api this is no longer needed.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | hw/acpi.c | 7 | ||||
| -rw-r--r-- | hw/acpi.h | 2 | ||||
| -rw-r--r-- | hw/acpi_ich9.c | 1 | ||||
| -rw-r--r-- | hw/acpi_piix4.c | 1 |
4 files changed, 0 insertions, 11 deletions
@@ -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) { @@ -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 db0d7a5063..c5978d33cc 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 c1a58d32c7..d2ba56e5bf 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); |