# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID b025491f0ba8ccb9e383379d914fb5ed5ca3ab69
# Parent 58b374f76a7165319a07c353a5a74ee8b9638d10
[HVM] Clean up formatting of new piix acpi file.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
tools/ioemu/hw/piix4acpi.c | 378 ++++++++++++++++++++++-----------------------
1 files changed, 185 insertions(+), 193 deletions(-)
diff -r 58b374f76a71 -r b025491f0ba8 tools/ioemu/hw/piix4acpi.c
--- a/tools/ioemu/hw/piix4acpi.c Sat Jun 17 09:08:14 2006 +0100
+++ b/tools/ioemu/hw/piix4acpi.c Sat Jun 17 09:19:16 2006 +0100
@@ -1,9 +1,9 @@
/*
* PIIX4 ACPI controller emulation
- *
+ *
* Winston liwen Wang, winston.l.wang@xxxxxxxxx
* Copyright (c) 2006 , Intel Corporation.
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
deal
* in the Software without restriction, including without limitation the rights
@@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+
#include "vl.h"
#define FREQUENCE_PMTIMER 3753425
/* acpi register bit define here */
@@ -44,15 +45,15 @@
#define GBL_RLS (1 << 2)
#define SLP_EN (1 << 13)
-/* Bits of PM1a register define here */
+/* Bits of PM1a register define here */
#define SLP_TYP_MASK 0x1C00
#define SLP_VAL 0x1C00
typedef struct AcpiDeviceState AcpiDeviceState;
AcpiDeviceState *acpi_device_table;
-/* Bits of PM1a register define here */
-typedef struct PMTState {
+/* Bits of PM1a register define here */
+typedef struct PMTState {
uint32_t count;
int irq;
uint64_t next_pm_time;
@@ -66,7 +67,7 @@ typedef struct PM1Event_BLK {
typedef struct PCIAcpiState {
PCIDevice dev;
- uint16_t irq;
+ uint16_t irq;
uint16_t pm1_status; /* pm1a_EVT_BLK */
uint16_t pm1_enable; /* pm1a_EVT_BLK+2 */
uint16_t pm1_control; /* pm1a_ECNT_BLK */
@@ -75,64 +76,58 @@ typedef struct PCIAcpiState {
static PMTState *pmtimer_state;
static PCIAcpiState *acpi_state;
-
-static void pmtimer_save(QEMUFile *f, void *opaque)
-{
- PMTState *s = opaque;
-
- qemu_put_be32s(f, &s->count);
- qemu_put_be32s(f, &s->irq);
- qemu_put_be64s(f, &s->next_pm_time);
- qemu_put_timer(f, s->pm_timer);
-
+
+static void pmtimer_save(QEMUFile *f, void *opaque)
+{
+ PMTState *s = opaque;
+
+ qemu_put_be32s(f, &s->count);
+ qemu_put_be32s(f, &s->irq);
+ qemu_put_be64s(f, &s->next_pm_time);
+ qemu_put_timer(f, s->pm_timer);
}
static int pmtimer_load(QEMUFile *f, void *opaque, int version_id)
{
PMTState *s = opaque;
- if (version_id != 1)
- return -EINVAL;
- qemu_get_be32s(f, &s->count);
- qemu_get_be32s(f, &s->irq);
- qemu_get_be64s(f, &s->next_pm_time);
- qemu_get_timer(f, s->pm_timer);
- return 0;
-
+ if (version_id != 1)
+ return -EINVAL;
+ qemu_get_be32s(f, &s->count);
+ qemu_get_be32s(f, &s->irq);
+ qemu_get_be64s(f, &s->next_pm_time);
+ qemu_get_timer(f, s->pm_timer);
+ return 0;
+
}
static inline void acpi_set_irq(PCIAcpiState *s)
{
-
/* no real SCI event need for now, so comment the following line out */
-/* pic_set_irq(s->irq, 1); */
- printf("acpi_set_irq: s->irq %x \n",s->irq);
-
+/* pic_set_irq(s->irq, 1); */
+ printf("acpi_set_irq: s->irq %x \n",s->irq);
}
static void pm_timer_update(void *opaque)
{
- PMTState *s = opaque;
- s->next_pm_time += muldiv64(1, ticks_per_sec,FREQUENCE_PMTIMER);
- qemu_mod_timer(s->pm_timer, s->next_pm_time);
- acpi_state->pm1_timer ++;
-
-
- /* if pm timer is zero reset it to zero; */
- if (acpi_state->pm1_timer >= 0x1000000)
- {
-/* printf("pm_timerupdate: timer overflow: %x \n",
acpi_state->pm1_timer); */
-
- acpi_state->pm1_timer = 0;
- acpi_state->pm1_status = acpi_state->pm1_status | TMROF_STS;
- //if TMROF_EN is set send the irq
- if ((acpi_state->pm1_enable & TMROF_EN) == TMROF_EN)
- {
- acpi_set_irq(acpi_state);
- acpi_state->pm1_enable = 0x00; /* only need one time...*/
- }
+ PMTState *s = opaque;
+ s->next_pm_time += muldiv64(1, ticks_per_sec,FREQUENCE_PMTIMER);
+ qemu_mod_timer(s->pm_timer, s->next_pm_time);
+ acpi_state->pm1_timer ++;
+
+ /* If pm timer is zero then reset it to zero. */
+ if (acpi_state->pm1_timer >= 0x1000000) {
+/* printf("pm_timerupdate: timer overflow: %x \n",
acpi_state->pm1_timer); */
+
+ acpi_state->pm1_timer = 0;
+ acpi_state->pm1_status = acpi_state->pm1_status | TMROF_STS;
+ /* If TMROF_EN is set then send the irq. */
+ if ((acpi_state->pm1_enable & TMROF_EN) == TMROF_EN) {
+ acpi_set_irq(acpi_state);
+ acpi_state->pm1_enable = 0x00; /* only need one time...*/
}
- s->count = acpi_state->pm1_timer;
+ }
+ s->count = acpi_state->pm1_timer;
}
static PMTState *pmtimer_init(void)
@@ -141,31 +136,31 @@ static PMTState *pmtimer_init(void)
s = qemu_mallocz(sizeof(PMTState));
if (!s)
- return NULL;
+ return NULL;
/* s->irq = irq; */
-
+
s->pm_timer = qemu_new_timer(vm_clock, pm_timer_update, s);
-
+
s->count = 0;
s->next_pm_time = qemu_get_clock(vm_clock) + muldiv64(1,
ticks_per_sec,FREQUENCE_PMTIMER) + 1;
qemu_mod_timer(s->pm_timer, s->next_pm_time);
-
+
register_savevm("pm timer", 1, 1, pmtimer_save, pmtimer_load, s);
return s;
}
static void acpi_reset(PCIAcpiState *s)
{
- uint8_t *pci_conf;
+ uint8_t *pci_conf;
pci_conf = s->dev.config;
- pci_conf[0x42] = 0x00;
- pci_conf[0x43] = 0x00;
- s->irq = 9;
- s->pm1_status = 0;
- s->pm1_enable = 0x00; /*TMROF_EN should cleared */
- s->pm1_control = SCI_EN;/*SCI_EN */
+ pci_conf[0x42] = 0x00;
+ pci_conf[0x43] = 0x00;
+ s->irq = 9;
+ s->pm1_status = 0;
+ s->pm1_enable = 0x00; /* TMROF_EN should cleared */
+ s->pm1_control = SCI_EN; /* SCI_EN */
s->pm1_timer = 0;
}
@@ -173,131 +168,129 @@ static void acpiPm1Status_writeb(void *o
static void acpiPm1Status_writeb(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
+
if ((val&TMROF_STS)==TMROF_STS)
- s->pm1_status = s->pm1_status&!TMROF_STS;
-
+ s->pm1_status = s->pm1_status&!TMROF_STS;
+
if ((val&GBL_STS)==GBL_STS)
- s->pm1_status = s->pm1_status&!GBL_STS;
-
+ s->pm1_status = s->pm1_status&!GBL_STS;
+
/* printf("acpiPm1Status_writeb \n addr %x val:%x pm1_status:%x \n", addr,
val,s->pm1_status); */
-
-}
+}
static uint32_t acpiPm1Status_readb(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
- val = s->pm1_status;
+ val = s->pm1_status;
/* printf("acpiPm1Status_readb \n addr %x val:%x\n", addr, val); */
-
+
return val;
}
static void acpiPm1StatusP1_writeb(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
-
- s->pm1_status = (val<<8)||(s->pm1_status);
+
+ s->pm1_status = (val<<8)||(s->pm1_status);
/* printf("acpiPm1StatusP1_writeb \n addr %x val:%x\n", addr, val); */
-
-}
+}
static uint32_t acpiPm1StatusP1_readb(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
- val = (s->pm1_status)>>8;
+ val = (s->pm1_status)>>8;
printf("acpiPm1StatusP1_readb \n addr %x val:%x\n", addr, val);
-
- return val;
+
+ return val;
}
static void acpiPm1Enable_writeb(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
-
- s->pm1_enable = val;
+
+ s->pm1_enable = val;
/* printf("acpiPm1Enable_writeb \n addr %x val:%x\n", addr, val); */
-
-}
+}
static uint32_t acpiPm1Enable_readb(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
- val = (s->pm1_enable)||0x1;
-/* printf("acpiPm1Enable_readb \n addr %x val:%x\n", addr, val); */
-
- return val;
-}
-
+ val = (s->pm1_enable)||0x1;
+/* printf("acpiPm1Enable_readb \n addr %x val:%x\n", addr, val); */
+
+ return val;
+}
+
static void acpiPm1EnableP1_writeb(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
-
- s->pm1_enable = (val<<8)||(s->pm1_enable);
+
+ s->pm1_enable = (val<<8)||(s->pm1_enable);
/* printf("acpiPm1EnableP1_writeb \n addr %x val:%x\n", addr, val); */
-}
+}
static uint32_t acpiPm1EnableP1_readb(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
- val = (s->pm1_enable)>>8;
+ val = (s->pm1_enable)>>8;
/* printf("acpiPm1EnableP1_readb \n addr %x val:%x\n", addr, val); */
-
+
return val;
}
static void acpiPm1Control_writeb(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
-
- s->pm1_control = val;
+
+ s->pm1_control = val;
/* printf("acpiPm1Control_writeb \n addr %x val:%x\n", addr, val); */
-}
+}
static uint32_t acpiPm1Control_readb(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
- val = s->pm1_control;
+ val = s->pm1_control;
/* printf("acpiPm1Control_readb \n addr %x val:%x\n", addr, val); */
-
+
return val;
}
static void acpiPm1ControlP1_writeb(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
-
- s->pm1_control = (val<<8)||(s->pm1_control);
+
+ s->pm1_control = (val<<8)||(s->pm1_control);
/* printf("acpiPm1ControlP1_writeb \n addr %x val:%x\n", addr, val); */
// Check for power off request
- if ( ( (val & SLP_EN) != 0) &&
- ( (val & SLP_TYP_MASK) == SLP_VAL) ) {
- s->pm1_timer=0x0; //clear ACPI timer
- qemu_system_shutdown_request();
- }
-}
+ if (((val & SLP_EN) != 0) &&
+ ((val & SLP_TYP_MASK) == SLP_VAL)) {
+ s->pm1_timer=0x0; //clear ACPI timer
+ qemu_system_shutdown_request();
+ }
+}
static uint32_t acpiPm1ControlP1_readb(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
- val = (s->pm1_control)>>8;
+ val = (s->pm1_control)>>8;
/* printf("acpiPm1ControlP1_readb \n addr %x val:%x\n", addr, val); */
-
+
return val;
}
@@ -307,91 +300,91 @@ static void acpiPm1Status_writew(void *o
static void acpiPm1Status_writew(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
+
if ((val&TMROF_STS)==TMROF_STS)
- s->pm1_status = s->pm1_status&!TMROF_STS;
-
+ s->pm1_status = s->pm1_status&!TMROF_STS;
+
if ((val&GBL_STS)==GBL_STS)
- s->pm1_status = s->pm1_status&!GBL_STS;
-
+ s->pm1_status = s->pm1_status&!GBL_STS;
+
/* printf("acpiPm1Status_writew \n addr %x val:%x pm1_status:%x \n", addr,
val,s->pm1_status); */
-
-}
+}
static uint32_t acpiPm1Status_readw(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
- val = s->pm1_status;
+ val = s->pm1_status;
/* printf("acpiPm1Status_readw \n addr %x val:%x\n", addr, val); */
-
+
return val;
}
static void acpiPm1Enable_writew(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
-
- s->pm1_enable = val;
+
+ s->pm1_enable = val;
/* printf("acpiPm1Enable_writew \n addr %x val:%x\n", addr, val); */
-}
+}
static uint32_t acpiPm1Enable_readw(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
- val = s->pm1_enable;
+ val = s->pm1_enable;
/* printf("acpiPm1Enable_readw \n addr %x val:%x\n", addr, val); */
-
+
return val;
}
static void acpiPm1Control_writew(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
-
- s->pm1_control = val;
+
+ s->pm1_control = val;
/* printf("acpiPm1Control_writew \n addr %x val:%x\n", addr, val); */
// Check for power off request
- if ( ( (val & SLP_EN) != 0) &&
- ( (val & SLP_TYP_MASK) == SLP_VAL) ) {
- qemu_system_shutdown_request();
- }
-
-}
+ if (((val & SLP_EN) != 0) &&
+ ((val & SLP_TYP_MASK) == SLP_VAL)) {
+ qemu_system_shutdown_request();
+ }
+
+}
static uint32_t acpiPm1Control_readw(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
- val = s->pm1_control;
+ val = s->pm1_control;
/* printf("acpiPm1Control_readw \n addr %x val:%x\n", addr, val); */
-
+
return val;
}
/* dword access */
-
+
static void acpiPm1Event_writel(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
-
- s->pm1_status = val;
+
+ s->pm1_status = val;
s->pm1_enable = val>>16;
/* printf("acpiPm1Event_writel \n addr %x val:%x \n", addr, val); */
-
-}
+
+}
static uint32_t acpiPm1Event_readl(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
-
+
val = s->pm1_status|(s->pm1_enable<<16);
/* printf("acpiPm1Event_readl \n addr %x val:%x\n", addr, val); */
@@ -401,89 +394,88 @@ static void acpiPm1Timer_writel(void *op
static void acpiPm1Timer_writel(void *opaque, uint32_t addr, uint32_t val)
{
PCIAcpiState *s = opaque;
-
- s->pm1_timer = val;
+
+ s->pm1_timer = val;
/* printf("acpiPm1Timer_writel \n addr %x val:%x\n", addr, val); */
-
-}
+}
static uint32_t acpiPm1Timer_readl(void *opaque, uint32_t addr)
{
PCIAcpiState *s = opaque;
uint32_t val;
- val = s->pm1_timer;
+ val = s->pm1_timer;
/* printf("acpiPm1Timer_readl \n addr %x val:%x\n", addr, val); */
return val;
}
-static void acpi_map(PCIDevice *pci_dev, int region_num,
+static void acpi_map(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type)
{
- PCIAcpiState *d = (PCIAcpiState *)pci_dev;
- printf("register acpi io \n ");
- /*Byte access */
- register_ioport_write(addr, 1, 1, acpiPm1Status_writeb, d);
- register_ioport_read(addr, 1, 1, acpiPm1Status_readb, d);
- register_ioport_write(addr+1, 1, 1, acpiPm1StatusP1_writeb, d);
- register_ioport_read(addr+1, 1, 1, acpiPm1StatusP1_readb, d);
-
- register_ioport_write(addr + 2, 1, 1, acpiPm1Enable_writeb, d);
- register_ioport_read(addr + 2, 1, 1, acpiPm1Enable_readb, d);
- register_ioport_write(addr + 2 +1, 1, 1, acpiPm1EnableP1_writeb, d);
- register_ioport_read(addr + 2 +1, 1, 1, acpiPm1EnableP1_readb, d);
-
- register_ioport_write(addr + 4, 1, 1, acpiPm1Control_writeb, d);
- register_ioport_read(addr + 4, 1, 1, acpiPm1Control_readb, d);
- register_ioport_write(addr + 4 + 1, 1, 1, acpiPm1ControlP1_writeb, d);
- register_ioport_read(addr + 4 +1, 1, 1, acpiPm1ControlP1_readb, d);
-
- /* word access */
- register_ioport_write(addr, 2, 2, acpiPm1Status_writew, d);
- register_ioport_read(addr, 2, 2, acpiPm1Status_readw, d);
-
- register_ioport_write(addr + 2, 2, 2, acpiPm1Enable_writew, d);
- register_ioport_read(addr + 2, 2, 2, acpiPm1Enable_readw, d);
-
- register_ioport_write(addr + 4, 2, 2, acpiPm1Control_writew, d);
- register_ioport_read(addr + 4, 2, 2, acpiPm1Control_readw, d);
-
- /* dword access */
- register_ioport_write(addr, 4, 4, acpiPm1Event_writel, d);
- register_ioport_read(addr, 4, 4, acpiPm1Event_readl, d);
-
- register_ioport_write(addr + 8, 4, 4, acpiPm1Timer_writel, d);
- register_ioport_read(addr + 8, 4, 4, acpiPm1Timer_readl, d);
-}
-
-
-/* PIIX4 acpi pci configuration space, func 3 */
+ PCIAcpiState *d = (PCIAcpiState *)pci_dev;
+
+ printf("register acpi io\n");
+
+ /* Byte access */
+ register_ioport_write(addr, 1, 1, acpiPm1Status_writeb, d);
+ register_ioport_read(addr, 1, 1, acpiPm1Status_readb, d);
+ register_ioport_write(addr+1, 1, 1, acpiPm1StatusP1_writeb, d);
+ register_ioport_read(addr+1, 1, 1, acpiPm1StatusP1_readb, d);
+
+ register_ioport_write(addr + 2, 1, 1, acpiPm1Enable_writeb, d);
+ register_ioport_read(addr + 2, 1, 1, acpiPm1Enable_readb, d);
+ register_ioport_write(addr + 2 +1, 1, 1, acpiPm1EnableP1_writeb, d);
+ register_ioport_read(addr + 2 +1, 1, 1, acpiPm1EnableP1_readb, d);
+
+ register_ioport_write(addr + 4, 1, 1, acpiPm1Control_writeb, d);
+ register_ioport_read(addr + 4, 1, 1, acpiPm1Control_readb, d);
+ register_ioport_write(addr + 4 + 1, 1, 1, acpiPm1ControlP1_writeb, d);
+ register_ioport_read(addr + 4 +1, 1, 1, acpiPm1ControlP1_readb, d);
+
+ /* Word access */
+ register_ioport_write(addr, 2, 2, acpiPm1Status_writew, d);
+ register_ioport_read(addr, 2, 2, acpiPm1Status_readw, d);
+
+ register_ioport_write(addr + 2, 2, 2, acpiPm1Enable_writew, d);
+ register_ioport_read(addr + 2, 2, 2, acpiPm1Enable_readw, d);
+
+ register_ioport_write(addr + 4, 2, 2, acpiPm1Control_writew, d);
+ register_ioport_read(addr + 4, 2, 2, acpiPm1Control_readw, d);
+
+ /* DWord access */
+ register_ioport_write(addr, 4, 4, acpiPm1Event_writel, d);
+ register_ioport_read(addr, 4, 4, acpiPm1Event_readl, d);
+
+ register_ioport_write(addr + 8, 4, 4, acpiPm1Timer_writel, d);
+ register_ioport_read(addr + 8, 4, 4, acpiPm1Timer_readl, d);
+}
+
+/* PIIX4 acpi pci configuration space, func 3 */
void pci_piix4_acpi_init(PCIBus *bus)
{
- PCIAcpiState *d;//,*s;
- uint8_t *pci_conf;//,*pci_conf_usb;
+ PCIAcpiState *d;
+ uint8_t *pci_conf;
/* register a function 3 of PIIX4 */
- d = (PCIAcpiState *)pci_register_device(bus, "PIIX4 ACPI",
- sizeof(PCIAcpiState),
- ((PCIDevice *)piix3_state)->devfn +
3,
- NULL, NULL);
+ d = (PCIAcpiState *)pci_register_device(
+ bus, "PIIX4 ACPI", sizeof(PCIAcpiState),
+ ((PCIDevice *)piix3_state)->devfn + 3, NULL, NULL);
+
acpi_state = d;
pci_conf = d->dev.config;
- pci_conf[0x00] = 0x86; // Intel
+ pci_conf[0x00] = 0x86; /* Intel */
pci_conf[0x01] = 0x80;
pci_conf[0x02] = 0x13;
pci_conf[0x03] = 0x71;
- pci_conf[0x08] = 0x01; //B0 stepping
- pci_conf[0x09] = 0x00; //base class
- pci_conf[0x0a] = 0x80; //Sub class
+ pci_conf[0x08] = 0x01; /* B0 stepping */
+ pci_conf[0x09] = 0x00; /* base class */
+ pci_conf[0x0a] = 0x80; /* Sub class */
pci_conf[0x0b] = 0x06;
pci_conf[0x0e] = 0x00;
- pci_conf[0x3d] = 0x01; // Hardwired to PIRQA is used
-
- pci_register_io_region((PCIDevice *)d, 4, 0x10,
+ pci_conf[0x3d] = 0x01; /* Hardwired to PIRQA is used */
+
+ pci_register_io_region((PCIDevice *)d, 4, 0x10,
PCI_ADDRESS_SPACE_IO, acpi_map);
pmtimer_state = pmtimer_init();
- acpi_reset (d);
-
-}
+ acpi_reset (d);
+}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home