From da027ff6223326f5c07a99dd46fe1eebde4b7dd6 Mon Sep 17 00:00:00 2001 From: Qian Wang Date: Mon, 30 Mar 2020 10:51:38 +0800 Subject: [PATCH] HV: Changed enum to marco to pass MISRA-C check hv: acpi: changed the enum "acpi_dmar_type" to macros to pass the MISRA-C check Tracked-On: #4535 Signed-off-by: Qian Wang Reviewed-by: Binbin Wu Acked-by: Eddie Dong --- hypervisor/boot/include/acpi.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/hypervisor/boot/include/acpi.h b/hypervisor/boot/include/acpi.h index 027827c46..d4fcf8735 100644 --- a/hypervisor/boot/include/acpi.h +++ b/hypervisor/boot/include/acpi.h @@ -22,6 +22,13 @@ #define ACPI_MADT_ENABLED 1U #define ACPI_MADT_TYPE_LOCAL_APIC_NMI 4U +#define ACPI_DMAR_TYPE_HARDWARE_UNIT 0U +#define ACPI_DMAR_TYPE_RESERVED_MEMORY 1U +#define ACPI_DMAR_TYPE_ROOT_ATS 2U +#define ACPI_DMAR_TYPE_HARDWARE_AFFINITY 3U +#define ACPI_DMAR_TYPE_NAMESPACE 4U +#define ACPI_DMAR_TYPE_RESERVED 5U + /* FACP field offsets */ #define OFFSET_FACS_ADDR 36U #define OFFSET_RESET_REGISTER 116U @@ -152,15 +159,6 @@ struct acpi_madt_ioapic { uint32_t gsi_base; } __packed; -enum acpi_dmar_type { - ACPI_DMAR_TYPE_HARDWARE_UNIT = 0, - ACPI_DMAR_TYPE_RESERVED_MEMORY = 1, - ACPI_DMAR_TYPE_ROOT_ATS = 2, - ACPI_DMAR_TYPE_HARDWARE_AFFINITY = 3, - ACPI_DMAR_TYPE_NAMESPACE = 4, - ACPI_DMAR_TYPE_RESERVED = 5 -}; - struct acpi_table_dmar { /* Common ACPI table header */ struct acpi_table_header header; @@ -198,7 +196,6 @@ struct acpi_dmar_device_scope { uint8_t bus; } __packed; - void *get_acpi_tbl(const char *signature); struct ioapic_info;