diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-02-23 13:45:17 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-24 13:36:02 -0600 |
| commit | 2886be1b01c274570fa139748a402207482405bd (patch) | |
| tree | 70d84e49036bfbd3b81466cda464baca7998e841 | |
| parent | 355bf2e5bac7be1b7516e88307f5507e74e8ce79 (diff) | |
| download | qemu-2886be1b01c274570fa139748a402207482405bd.tar.gz qemu-2886be1b01c274570fa139748a402207482405bd.tar.bz2 qemu-2886be1b01c274570fa139748a402207482405bd.zip | |
acpi: don't pass overflow_time to acpi_pm1_evt_get_sts
Pretty pointless, can easily be reached via ACPIREGS now.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/acpi.c | 6 | ||||
| -rw-r--r-- | hw/acpi.h | 2 | ||||
| -rw-r--r-- | hw/acpi_piix4.c | 4 | ||||
| -rw-r--r-- | hw/vt82c686.c | 4 |
4 files changed, 8 insertions, 8 deletions
@@ -249,10 +249,10 @@ int acpi_table_add(const char *t) } /* ACPI PM1a EVT */ -uint16_t acpi_pm1_evt_get_sts(ACPIREGS *ar, int64_t overflow_time) +uint16_t acpi_pm1_evt_get_sts(ACPIREGS *ar) { int64_t d = acpi_pm_tmr_get_clock(); - if (d >= overflow_time) { + if (d >= ar->tmr.overflow_time) { ar->pm1.evt.sts |= ACPI_BITMASK_TIMER_STATUS; } return ar->pm1.evt.sts; @@ -260,7 +260,7 @@ uint16_t acpi_pm1_evt_get_sts(ACPIREGS *ar, int64_t overflow_time) void acpi_pm1_evt_write_sts(ACPIREGS *ar, uint16_t val) { - uint16_t pm1_sts = acpi_pm1_evt_get_sts(ar, ar->tmr.overflow_time); + uint16_t pm1_sts = acpi_pm1_evt_get_sts(ar); if (pm1_sts & val & ACPI_BITMASK_TIMER_STATUS) { /* if TMRSTS is reset, then compute the new overflow time */ acpi_pm_tmr_calc_overflow_time(ar); @@ -131,7 +131,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, int64_t overflow_time); +uint16_t acpi_pm1_evt_get_sts(ACPIREGS *ar); void acpi_pm1_evt_write_sts(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 68d5eabdc6..5b16d2039c 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -80,7 +80,7 @@ static void pm_update_sci(PIIX4PMState *s) { int sci_level, pmsts; - pmsts = acpi_pm1_evt_get_sts(&s->ar, s->ar.tmr.overflow_time); + pmsts = acpi_pm1_evt_get_sts(&s->ar); sci_level = (((pmsts & s->ar.pm1.evt.en) & (ACPI_BITMASK_RT_CLOCK_ENABLE | ACPI_BITMASK_POWER_BUTTON_ENABLE | @@ -138,7 +138,7 @@ static void pm_ioport_read(IORange *ioport, uint64_t addr, unsigned width, switch(addr) { case 0x00: - val = acpi_pm1_evt_get_sts(&s->ar, s->ar.tmr.overflow_time); + val = acpi_pm1_evt_get_sts(&s->ar); break; case 0x02: val = s->ar.pm1.evt.en; diff --git a/hw/vt82c686.c b/hw/vt82c686.c index c65928342b..1b083de097 100644 --- a/hw/vt82c686.c +++ b/hw/vt82c686.c @@ -177,7 +177,7 @@ static void pm_update_sci(VT686PMState *s) { int sci_level, pmsts; - pmsts = acpi_pm1_evt_get_sts(&s->ar, s->ar.tmr.overflow_time); + pmsts = acpi_pm1_evt_get_sts(&s->ar); sci_level = (((pmsts & s->ar.pm1.evt.en) & (ACPI_BITMASK_RT_CLOCK_ENABLE | ACPI_BITMASK_POWER_BUTTON_ENABLE | @@ -226,7 +226,7 @@ static uint32_t pm_ioport_readw(void *opaque, uint32_t addr) addr &= 0x0f; switch (addr) { case 0x00: - val = acpi_pm1_evt_get_sts(&s->ar, s->ar.tmr.overflow_time); + val = acpi_pm1_evt_get_sts(&s->ar); break; case 0x02: val = s->ar.pm1.evt.en; |