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

acpi: reuse AcpiGenericAddress instead of Acpi20GenericAddress 



Drop duplicate in form of Acpi20GenericAddress and reuse
AcpiGenericAddress.

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 697155cd

include/hw/acpi/acpi-defs.h

+3 −14
Original line number Diff line number Diff line
@@ -40,18 +40,6 @@ enum { 
    ACPI_FADT_F_LOW_POWER_S0_IDLE_CAPABLE,

};



/*

 * ACPI 2.0 Generic Address Space definition.

 */

struct Acpi20GenericAddress {

    uint8_t  address_space_id;

    uint8_t  register_bit_width;

    uint8_t  register_bit_offset;

    uint8_t  reserved;

    uint64_t address;

} QEMU_PACKED;

typedef struct Acpi20GenericAddress Acpi20GenericAddress;



struct AcpiRsdpDescriptor {        /* Root System Descriptor Pointer */

    uint64_t signature;              /* ACPI signature, contains "RSD PTR " */

    uint8_t  checksum;               /* To make sum of struct == 0 */
@@ -167,7 +155,8 @@ struct AcpiGenericAddress { 
    uint8_t space_id;        /* Address space where struct or register exists */

    uint8_t bit_width;       /* Size in bits of given register */

    uint8_t bit_offset;      /* Bit offset within the register */

    uint8_t access_width;    /* Minimum Access size (ACPI 3.0) */

    uint8_t access_width;    /* ACPI 3.0: Minimum Access size (ACPI 3.0),

                                ACPI 2.0: Reserved, Table 5-1 */

    uint64_t address;        /* 64-bit address of struct or register */

} QEMU_PACKED;
@@ -456,7 +445,7 @@ typedef struct AcpiGenericTimerTable AcpiGenericTimerTable; 
struct Acpi20Hpet {

    ACPI_TABLE_HEADER_DEF                    /* ACPI common table header */

    uint32_t           timer_block_id;

    Acpi20GenericAddress addr;

    struct AcpiGenericAddress addr;

    uint8_t            hpet_number;

    uint16_t           min_tick;

    uint8_t            page_protect;