Commit f8eaef67 authored by Igor Mammedov's avatar Igor Mammedov Committed by Michael S. Tsirkin
Browse files

acpi: move ACPI_PORT_SMI_CMD define to header it belongs to 



ACPI_PORT_SMI_CMD is alias for APM_CNT_IOPORT,
so make it really one instead of duplicating its value.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Tested-by: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent d0384d90

hw/i386/acpi-build.c

+0 −2
Original line number Diff line number Diff line
@@ -255,8 +255,6 @@ static void acpi_get_pci_holes(Range *hole, Range *hole64) 
                                               NULL));

}



#define ACPI_PORT_SMI_CMD           0x00b2 /* TODO: this is APM_CNT_IOPORT */



static void acpi_align_size(GArray *blob, unsigned align)

{

    /* Align size to multiple of given size. This reduces the chance

hw/isa/apm.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#endif



/* fixed I/O location */

#define APM_CNT_IOPORT  0xb2

#define APM_STS_IOPORT  0xb3



static void apm_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,

include/hw/isa/apm.h

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
#include "hw/hw.h"

#include "exec/memory.h"



#define APM_CNT_IOPORT  0xb2

#define ACPI_PORT_SMI_CMD APM_CNT_IOPORT



typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg);



typedef struct APMState {