From 04762841d8803429fd9bf71eff481d3c5915fa3e Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Fri, 14 May 2010 16:29:00 +0900 Subject: acpi: split out apm register emulation from acpi.c Split out apm register emulation for acpi.c into apm.c. The apm emulation will be used later. Signed-off-by: Isaku Yamahata Acked-by: Gerd Hoffmann Cc: Aurelien Jarno Signed-off-by: Blue Swirl --- hw/acpi.c | 61 ++++++++++++++------------------------------- hw/apm.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/apm.h | 22 +++++++++++++++++ 3 files changed, 125 insertions(+), 43 deletions(-) create mode 100644 hw/apm.c create mode 100644 hw/apm.h (limited to 'hw') diff --git a/hw/acpi.c b/hw/acpi.c index ad8f4c79d..8dc9538dd 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -17,6 +17,7 @@ */ #include "hw.h" #include "pc.h" +#include "apm.h" #include "pm_smbus.h" #include "pci.h" #include "qemu-timer.h" @@ -36,8 +37,9 @@ typedef struct PIIX4PMState { uint16_t pmsts; uint16_t pmen; uint16_t pmcntrl; - uint8_t apmc; - uint8_t apms; + + APMState apm; + QEMUTimer *tmr_timer; int64_t tmr_overflow_time; @@ -218,48 +220,22 @@ static uint32_t pm_ioport_readl(void *opaque, uint32_t addr) return val; } -static void pm_smi_writeb(void *opaque, uint32_t addr, uint32_t val) +static void apm_ctrl_changed(uint32_t val, void *arg) { - PIIX4PMState *s = opaque; - addr &= 1; -#ifdef DEBUG - printf("pm_smi_writeb addr=0x%x val=0x%02x\n", addr, val); -#endif - if (addr == 0) { - s->apmc = val; - - /* ACPI specs 3.0, 4.7.2.5 */ - if (val == ACPI_ENABLE) { - s->pmcntrl |= SCI_EN; - } else if (val == ACPI_DISABLE) { - s->pmcntrl &= ~SCI_EN; - } + PIIX4PMState *s = arg; - if (s->dev.config[0x5b] & (1 << 1)) { - if (s->smi_irq) { - qemu_irq_raise(s->smi_irq); - } - } - } else { - s->apms = val; + /* ACPI specs 3.0, 4.7.2.5 */ + if (val == ACPI_ENABLE) { + s->pmcntrl |= SCI_EN; + } else if (val == ACPI_DISABLE) { + s->pmcntrl &= ~SCI_EN; } -} -static uint32_t pm_smi_readb(void *opaque, uint32_t addr) -{ - PIIX4PMState *s = opaque; - uint32_t val; - - addr &= 1; - if (addr == 0) { - val = s->apmc; - } else { - val = s->apms; + if (s->dev.config[0x5b] & (1 << 1)) { + if (s->smi_irq) { + qemu_irq_raise(s->smi_irq); + } } -#ifdef DEBUG - printf("pm_smi_readb addr=0x%x val=0x%02x\n", addr, val); -#endif - return val; } static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val) @@ -315,8 +291,7 @@ static const VMStateDescription vmstate_acpi = { VMSTATE_UINT16(pmsts, PIIX4PMState), VMSTATE_UINT16(pmen, PIIX4PMState), VMSTATE_UINT16(pmcntrl, PIIX4PMState), - VMSTATE_UINT8(apmc, PIIX4PMState), - VMSTATE_UINT8(apms, PIIX4PMState), + VMSTATE_STRUCT(apm, PIIX4PMState, 0, vmstate_apm, APMState), VMSTATE_TIMER(tmr_timer, PIIX4PMState), VMSTATE_INT64(tmr_overflow_time, PIIX4PMState), VMSTATE_END_OF_LIST() @@ -375,8 +350,8 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, pci_conf[0x40] = 0x01; /* PM io base read only bit */ - register_ioport_write(0xb2, 2, 1, pm_smi_writeb, s); - register_ioport_read(0xb2, 2, 1, pm_smi_readb, s); + /* APM */ + apm_init(&s->apm, apm_ctrl_changed, s); register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, s); diff --git a/hw/apm.c b/hw/apm.c new file mode 100644 index 000000000..d20db3d16 --- /dev/null +++ b/hw/apm.c @@ -0,0 +1,85 @@ +/* + * QEMU PC APM controller Emulation + * This is split out from acpi.c + * + * Copyright (c) 2006 Fabrice Bellard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + */ + +#include "apm.h" +#include "hw.h" +#include "isa.h" + +//#define DEBUG + +/* fixed I/O location */ +#define APM_CNT_IOPORT 0xb2 +#define APM_STS_IOPORT 0xb3 + +static void apm_ioport_writeb(void *opaque, uint32_t addr, uint32_t val) +{ + APMState *apm = opaque; + addr &= 1; +#ifdef DEBUG + printf("apm_ioport_writeb addr=0x%x val=0x%02x\n", addr, val); +#endif + if (addr == 0) { + apm->apmc = val; + + if (apm->callback) { + (apm->callback)(val, apm->arg); + } + } else { + apm->apms = val; + } +} + +static uint32_t apm_ioport_readb(void *opaque, uint32_t addr) +{ + APMState *apm = opaque; + uint32_t val; + + addr &= 1; + if (addr == 0) { + val = apm->apmc; + } else { + val = apm->apms; + } +#ifdef DEBUG + printf("apm_ioport_readb addr=0x%x val=0x%02x\n", addr, val); +#endif + return val; +} + +const VMStateDescription vmstate_apm = { + .name = "APM State", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT8(apmc, APMState), + VMSTATE_UINT8(apms, APMState), + VMSTATE_END_OF_LIST() + } +}; + +void apm_init(APMState *apm, apm_ctrl_changed_t callback, void *arg) +{ + apm->callback = callback; + apm->arg = arg; + + /* ioport 0xb2, 0xb3 */ + register_ioport_write(APM_CNT_IOPORT, 2, 1, apm_ioport_writeb, apm); + register_ioport_read(APM_CNT_IOPORT, 2, 1, apm_ioport_readb, apm); +} diff --git a/hw/apm.h b/hw/apm.h new file mode 100644 index 000000000..f7c741e32 --- /dev/null +++ b/hw/apm.h @@ -0,0 +1,22 @@ +#ifndef APM_H +#define APM_H + +#include +#include "qemu-common.h" +#include "hw.h" + +typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg); + +typedef struct APMState { + uint8_t apmc; + uint8_t apms; + + apm_ctrl_changed_t callback; + void *arg; +} APMState; + +void apm_init(APMState *s, apm_ctrl_changed_t callback, void *arg); + +extern const VMStateDescription vmstate_apm; + +#endif /* APM_H */ -- cgit v1.2.3