Commit 9dc047ce authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Michael Tokarev
Browse files

hw/acpi: ACPI_PM_* defines are not restricted to i386 arch 



this allows to remove the old i386/pc dependency on acpi/core.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 6c646a11

hw/acpi/core.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include "qemu/osdep.h"

#include "sysemu/sysemu.h"

#include "hw/hw.h"

#include "hw/i386/pc.h"

#include "hw/acpi/acpi.h"

#include "hw/nvram/fw_cfg.h"

#include "qemu/config-file.h"

include/hw/acpi/acpi.h

+11 −0
Original line number Diff line number Diff line
@@ -39,6 +39,17 @@ 
#define ACPI_PM2_REGISTER_WIDTH         8

#define ACPI_PM_TIMER_WIDTH             32



/* PC-style peripherals (also used by other machines).  */

#define ACPI_PM_PROP_S3_DISABLED "disable_s3"

#define ACPI_PM_PROP_S4_DISABLED "disable_s4"

#define ACPI_PM_PROP_S4_VAL "s4_val"

#define ACPI_PM_PROP_SCI_INT "sci_int"

#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd"

#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd"

#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base"

#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk"

#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len"



/* PM Timer ticks per second (HZ) */

#define PM_TIMER_FREQUENCY  3579545

include/hw/i386/pc.h

+0 −11
Original line number Diff line number Diff line
@@ -151,17 +151,6 @@ struct PCMachineClass { 
#define PC_MACHINE_CLASS(klass) \

    OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE)



/* PC-style peripherals (also used by other machines).  */



#define ACPI_PM_PROP_S3_DISABLED "disable_s3"

#define ACPI_PM_PROP_S4_DISABLED "disable_s4"

#define ACPI_PM_PROP_S4_VAL "s4_val"

#define ACPI_PM_PROP_SCI_INT "sci_int"

#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd"

#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd"

#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base"

#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk"

#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len"

#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"



/* parallel.c */