[PATCH 4/6] lib: acpi: unify naming style by removing "ACPI"
Alex Hung
alex.hung at canonical.com
Fri May 14 19:21:53 UTC 2021
This is also for better readability.
There are no functional changes.
Signed-off-by: Alex Hung <alex.hung at canonical.com>
---
src/acpi/hmat/hmat.c | 8 +-
src/acpi/madt/madt.c | 46 +++----
src/acpi/nfit/nfit.c | 58 ++++-----
src/acpi/phat/phat.c | 6 +-
src/acpi/pmtt/pmtt.c | 8 +-
src/acpi/pptt/pptt.c | 8 +-
src/acpi/sdev/sdev.c | 6 +-
src/lib/include/fwts_acpi.h | 218 ++++++++++++++++-----------------
src/lib/src/fwts_acpi_tables.c | 2 +-
9 files changed, 180 insertions(+), 180 deletions(-)
diff --git a/src/acpi/hmat/hmat.c b/src/acpi/hmat/hmat.c
index 01b76100..3f900814 100644
--- a/src/acpi/hmat/hmat.c
+++ b/src/acpi/hmat/hmat.c
@@ -164,21 +164,21 @@ static int hmat_test1(fwts_framework *fw)
break;
}
- if (entry->type == FWTS_ACPI_HMAT_TYPE_PROXIMITY_DOMAIN) {
+ if (entry->type == FWTS_HMAT_TYPE_PROXIMITY_DOMAIN) {
hmat_proximity_domain_test(fw, (fwts_acpi_table_hmat_proximity_domain *) entry, &passed);
type_length = sizeof(fwts_acpi_table_hmat_proximity_domain);
- } else if (entry->type == FWTS_ACPI_HMAT_TYPE_LOCALITY) {
+ } else if (entry->type == FWTS_HMAT_TYPE_LOCALITY) {
fwts_acpi_table_hmat_locality *locality = (fwts_acpi_table_hmat_locality *) entry;
hmat_locality_test(fw, (fwts_acpi_table_hmat_locality *) entry, &passed);
type_length = sizeof(fwts_acpi_table_hmat_locality) +
(locality->num_initiator + locality->num_target) * 4 +
(locality->num_initiator * locality->num_target * 2);
- } else if (entry->type == FWTS_ACPI_HMAT_TYPE_CACHE) {
+ } else if (entry->type == FWTS_HMAT_TYPE_CACHE) {
hmat_cache_test(fw, (fwts_acpi_table_hmat_cache *) entry, &passed);
type_length = sizeof(fwts_acpi_table_hmat_cache) +
((fwts_acpi_table_hmat_cache *) entry)->num_smbios * 2;
} else {
- fwts_acpi_reserved_type_check(fw, "HMAT", entry->type, 0, FWTS_ACPI_HMAT_TYPE_RESERVED - 1, &passed);
+ fwts_acpi_reserved_type_check(fw, "HMAT", entry->type, 0, FWTS_HMAT_TYPE_RESERVED - 1, &passed);
break;
}
diff --git a/src/acpi/madt/madt.c b/src/acpi/madt/madt.c
index ec99c524..b811376d 100644
--- a/src/acpi/madt/madt.c
+++ b/src/acpi/madt/madt.c
@@ -1526,9 +1526,9 @@ static int madt_subtables(fwts_framework *fw)
/* check for OEM and reserved entries */
if (hdr->type >= NUM_SUBTABLE_TYPES) {
if (hdr->type < 0x80)
- type = FWTS_ACPI_MADT_RESERVED;
+ type = FWTS_MADT_RESERVED;
else
- type = FWTS_ACPI_MADT_OEM;
+ type = FWTS_MADT_OEM;
len = hdr->length;
} else {
/* this subtable is defined */
@@ -1552,7 +1552,7 @@ static int madt_subtables(fwts_framework *fw)
/* verify that the length is what we expect */
if (len == SUBTABLE_VARIABLE) {
- if (hdr->type == FWTS_ACPI_MADT_LOCAL_SAPIC) {
+ if (hdr->type == FWTS_MADT_LOCAL_SAPIC) {
lsapic = (fwts_acpi_madt_local_sapic *)hdr;
proper_len =
sizeof(fwts_acpi_madt_local_sapic) +
@@ -1586,77 +1586,77 @@ static int madt_subtables(fwts_framework *fw)
/* perform checks specific to subtable types */
switch (type) {
- case FWTS_ACPI_MADT_LOCAL_APIC:
+ case FWTS_MADT_LOCAL_APIC:
skip = madt_local_apic(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_IO_APIC:
+ case FWTS_MADT_IO_APIC:
skip = madt_io_apic(fw, hdr, data);
num_ioapics++;
break;
- case FWTS_ACPI_MADT_INTERRUPT_OVERRIDE:
+ case FWTS_MADT_INTERRUPT_OVERRIDE:
skip = madt_interrupt_override(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_NMI_SOURCE:
+ case FWTS_MADT_NMI_SOURCE:
skip = madt_nmi_source(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_LOCAL_APIC_NMI:
+ case FWTS_MADT_LOCAL_APIC_NMI:
skip = madt_local_apic_nmi(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_LOCAL_APIC_OVERRIDE:
+ case FWTS_MADT_LOCAL_APIC_OVERRIDE:
skip = madt_lapic_addr_override(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_IO_SAPIC:
+ case FWTS_MADT_IO_SAPIC:
skip = madt_io_sapic(fw, hdr, data);
num_iosapics++;
break;
- case FWTS_ACPI_MADT_LOCAL_SAPIC:
+ case FWTS_MADT_LOCAL_SAPIC:
skip = madt_local_sapic(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_INTERRUPT_SOURCE:
+ case FWTS_MADT_INTERRUPT_SOURCE:
skip = madt_platform_int_source(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_LOCAL_X2APIC:
+ case FWTS_MADT_LOCAL_X2APIC:
skip = madt_local_x2apic(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_LOCAL_X2APIC_NMI:
+ case FWTS_MADT_LOCAL_X2APIC_NMI:
skip = madt_local_x2apic_nmi(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_GIC_C_CPU_INTERFACE:
+ case FWTS_MADT_GIC_C_CPU_INTERFACE:
skip = madt_gicc(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_GIC_D_GOC_DISTRIBUTOR:
+ case FWTS_MADT_GIC_D_GOC_DISTRIBUTOR:
skip = madt_gicd(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_GIC_V2M_MSI_FRAME:
+ case FWTS_MADT_GIC_V2M_MSI_FRAME:
skip = madt_gic_msi_frame(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_GIC_R_REDISTRIBUTOR:
+ case FWTS_MADT_GIC_R_REDISTRIBUTOR:
skip = madt_gicr(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_GIC_ITS:
+ case FWTS_MADT_GIC_ITS:
skip = madt_gic_its(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_MP_WAKEUP:
+ case FWTS_MADT_MP_WAKEUP:
skip = madt_mp_wakup(fw, hdr, data);
break;
- case FWTS_ACPI_MADT_RESERVED:
+ case FWTS_MADT_RESERVED:
fwts_failed(fw, LOG_LEVEL_MEDIUM,
"SPECMADTSubReservedID",
"MADT subtable %d (offset 0x%x) is "
@@ -1664,11 +1664,11 @@ static int madt_subtables(fwts_framework *fw)
"type. Subtable type values 0x%" PRIx8 "..0x7f "
"are reserved; 0x80..0xff can be "
"used by OEMs.",
- ii, offset, hdr->type, FWTS_ACPI_MADT_RESERVED);
+ ii, offset, hdr->type, FWTS_MADT_RESERVED);
skip = (hdr->length -
sizeof(fwts_acpi_madt_sub_table_header));
break;
- case FWTS_ACPI_MADT_OEM:
+ case FWTS_MADT_OEM:
/* OEM entries must be assumed to be valid */
skip = (hdr->length -
sizeof(fwts_acpi_madt_sub_table_header));
diff --git a/src/acpi/nfit/nfit.c b/src/acpi/nfit/nfit.c
index d7436166..b1e70567 100644
--- a/src/acpi/nfit/nfit.c
+++ b/src/acpi/nfit/nfit.c
@@ -143,15 +143,15 @@ static int nfit_test1(fwts_framework *fw)
break;
}
- if (entry->type == FWTS_ACPI_NFIT_TYPE_SYSTEM_ADDRESS) {
+ if (entry->type == FWTS_NFIT_TYPE_SYSTEM_ADDRESS) {
fwts_acpi_table_nfit_system_memory *nfit_struct = (fwts_acpi_table_nfit_system_memory *) entry;
char guid_str[37];
bool guid_skip = false;
size_t i;
bool ret = check_length(fw, entry->length,
- FWTS_ACPI_NFIT_MINLEN_SYSTEM_ADDRESS,
- FWTS_ACPI_NFIT_NAME_SYSTEM_ADDRESS);
+ FWTS_NFIT_MINLEN_SYSTEM_ADDRESS,
+ FWTS_NFIT_NAME_SYSTEM_ADDRESS);
if (!ret) {
passed = false;
break;
@@ -244,12 +244,12 @@ static int nfit_test1(fwts_framework *fw)
"0x%16.16" PRIx64 " instead", nfit_struct->memory_mapping);
}
- } else if (entry->type == FWTS_ACPI_NFIT_TYPE_MEMORY_MAP) {
+ } else if (entry->type == FWTS_NFIT_TYPE_MEMORY_MAP) {
fwts_acpi_table_nfit_memory_map *nfit_struct = (fwts_acpi_table_nfit_memory_map *) entry;
bool ret = check_length(fw, entry->length,
- FWTS_ACPI_NFIT_MINLEN_MEMORY_MAP,
- FWTS_ACPI_NFIT_NAME_MEMORY_MAP);
+ FWTS_NFIT_MINLEN_MEMORY_MAP,
+ FWTS_NFIT_NAME_MEMORY_MAP);
if (!ret) {
passed = false;
break;
@@ -273,13 +273,13 @@ static int nfit_test1(fwts_framework *fw)
if (nfit_struct->reserved != 0)
reserved_passed = nfit_struct->reserved;
- } else if (entry->type == FWTS_ACPI_NFIT_TYPE_INTERLEAVE) {
+ } else if (entry->type == FWTS_NFIT_TYPE_INTERLEAVE) {
fwts_acpi_table_nfit_interleave *nfit_struct = (fwts_acpi_table_nfit_interleave *) entry;
uint32_t i;
bool ret = check_length(fw, entry->length,
- FWTS_ACPI_NFIT_MINLEN_INTERLEAVE,
- FWTS_ACPI_NFIT_NAME_INTERLEAVE);
+ FWTS_NFIT_MINLEN_INTERLEAVE,
+ FWTS_NFIT_NAME_INTERLEAVE);
if (!ret) {
passed = false;
break;
@@ -291,9 +291,9 @@ static int nfit_test1(fwts_framework *fw)
fwts_log_info_simp_int(fw, " Line Size: ", nfit_struct->line_size);
ret = check_length(fw, entry->length,
- FWTS_ACPI_NFIT_MINLEN_INTERLEAVE +
+ FWTS_NFIT_MINLEN_INTERLEAVE +
nfit_struct->line_count * sizeof nfit_struct->line_offset[0],
- FWTS_ACPI_NFIT_NAME_INTERLEAVE);
+ FWTS_NFIT_NAME_INTERLEAVE);
if (!ret) {
passed = false;
break;
@@ -315,12 +315,12 @@ static int nfit_test1(fwts_framework *fw)
"NFIT Number of Lines must not be zero");
}
- } else if (entry->type == FWTS_ACPI_NFIT_TYPE_SMBIOS) {
+ } else if (entry->type == FWTS_NFIT_TYPE_SMBIOS) {
fwts_acpi_table_nfit_smbios *nfit_struct = (fwts_acpi_table_nfit_smbios *) entry;
bool ret = check_length(fw, entry->length,
- FWTS_ACPI_NFIT_MINLEN_SMBIOS,
- FWTS_ACPI_NFIT_NAME_SMBIOS);
+ FWTS_NFIT_MINLEN_SMBIOS,
+ FWTS_NFIT_NAME_SMBIOS);
if (!ret) {
passed = false;
break;
@@ -337,11 +337,11 @@ static int nfit_test1(fwts_framework *fw)
if (!ret)
passed = false;
- } else if (entry->type == FWTS_ACPI_NFIT_TYPE_CONTROL_REGION) {
+ } else if (entry->type == FWTS_NFIT_TYPE_CONTROL_REGION) {
fwts_acpi_table_nfit_control_range *nfit_struct = (fwts_acpi_table_nfit_control_range *) entry;
bool ret = check_length(fw, entry->length,
- FWTS_ACPI_NFIT_MINLEN_CONTROL_REGION,
- FWTS_ACPI_NFIT_NAME_CONTROL_REGION);
+ FWTS_NFIT_MINLEN_CONTROL_REGION,
+ FWTS_NFIT_NAME_CONTROL_REGION);
if (!ret) {
passed = false;
break;
@@ -407,12 +407,12 @@ static int nfit_test1(fwts_framework *fw)
fwts_log_info_simp_int(fw, " NVDIMM Control Region Structure Index: ", nfit_struct->region_index);
}
- } else if (entry->type == FWTS_ACPI_NFIT_TYPE_DATA_REGION) {
+ } else if (entry->type == FWTS_NFIT_TYPE_DATA_REGION) {
fwts_acpi_table_nfit_data_range *nfit_struct = (fwts_acpi_table_nfit_data_range *) entry;
bool ret = check_length(fw, entry->length,
- FWTS_ACPI_NFIT_MINLEN_DATA_REGION,
- FWTS_ACPI_NFIT_NAME_DATA_REGION);
+ FWTS_NFIT_MINLEN_DATA_REGION,
+ FWTS_NFIT_NAME_DATA_REGION);
if (!ret) {
passed = false;
break;
@@ -432,14 +432,14 @@ static int nfit_test1(fwts_framework *fw)
"NFIT NVDIMM Control Region Structure Index must not be zero");
}
- } else if (entry->type == FWTS_ACPI_NFIT_TYPE_FLUSH_ADDRESS) {
+ } else if (entry->type == FWTS_NFIT_TYPE_FLUSH_ADDRESS) {
fwts_acpi_table_nfit_flush_addr *nfit_struct = (fwts_acpi_table_nfit_flush_addr *) entry;
uint64_t reserved;
uint16_t i;
bool ret = check_length(fw, entry->length,
- FWTS_ACPI_NFIT_MINLEN_FLUSH_ADDRESS,
- FWTS_ACPI_NFIT_NAME_FLUSH_ADDRESS);
+ FWTS_NFIT_MINLEN_FLUSH_ADDRESS,
+ FWTS_NFIT_NAME_FLUSH_ADDRESS);
if (!ret) {
passed = false;
break;
@@ -454,9 +454,9 @@ static int nfit_test1(fwts_framework *fw)
fwts_log_info_simp_int(fw, " Reserved: ", reserved);
ret = check_length(fw, entry->length,
- FWTS_ACPI_NFIT_MINLEN_FLUSH_ADDRESS +
+ FWTS_NFIT_MINLEN_FLUSH_ADDRESS +
nfit_struct->hint_count * sizeof nfit_struct->hint_address[0],
- FWTS_ACPI_NFIT_NAME_FLUSH_ADDRESS);
+ FWTS_NFIT_NAME_FLUSH_ADDRESS);
if (!ret) {
passed = false;
break;
@@ -468,13 +468,13 @@ static int nfit_test1(fwts_framework *fw)
if (reserved != 0)
reserved_passed = reserved;
- } else if (entry->type == FWTS_ACPI_NFIT_TYPE_PLATFORM_CAPABILITY) {
+ } else if (entry->type == FWTS_NFIT_TYPE_PLATFORM_CAPABILITY) {
fwts_acpi_table_nfit_platform_cap *nfit_struct = (fwts_acpi_table_nfit_platform_cap *) entry;
uint32_t reserved1;
bool ret = check_length(fw, entry->length,
- FWTS_ACPI_NFIT_MINLEN_PLATFORM_CAPABILITY,
- FWTS_ACPI_NFIT_NAME_PLATFORM_CAPABILITY);
+ FWTS_NFIT_MINLEN_PLATFORM_CAPABILITY,
+ FWTS_NFIT_NAME_PLATFORM_CAPABILITY);
if (!ret) {
passed = false;
break;
@@ -503,7 +503,7 @@ static int nfit_test1(fwts_framework *fw)
reserved_passed = nfit_struct->reserved2;
} else {
- fwts_acpi_reserved_type_check(fw, "NFIT", entry->type, 0, FWTS_ACPI_NFIT_TYPE_RESERVED - 1, &passed);
+ fwts_acpi_reserved_type_check(fw, "NFIT", entry->type, 0, FWTS_NFIT_TYPE_RESERVED - 1, &passed);
break;
}
diff --git a/src/acpi/phat/phat.c b/src/acpi/phat/phat.c
index 804e464f..d75c6164 100644
--- a/src/acpi/phat/phat.c
+++ b/src/acpi/phat/phat.c
@@ -130,12 +130,12 @@ static int phat_test1(fwts_framework *fw)
break;
}
- if (entry->type == FWTS_ACPI_PHAT_VERSION) {
+ if (entry->type == FWTS_PHAT_VERSION) {
phat_version_test(fw, (fwts_acpi_table_phat_version *) entry, offset, &passed);
- } else if (entry->type == FWTS_ACPI_PHAT_HEALTH) {
+ } else if (entry->type == FWTS_PHAT_HEALTH) {
phat_health_test(fw, (fwts_acpi_table_phat_health *) entry, offset, &passed);
} else {
- fwts_acpi_reserved_type_check(fw, "PHAT", entry->type, 0, FWTS_ACPI_PHAT_RESERVED - 1, &passed);
+ fwts_acpi_reserved_type_check(fw, "PHAT", entry->type, 0, FWTS_PHAT_RESERVED - 1, &passed);
break;
}
diff --git a/src/acpi/pmtt/pmtt.c b/src/acpi/pmtt/pmtt.c
index f0ad0df1..d6145e38 100644
--- a/src/acpi/pmtt/pmtt.c
+++ b/src/acpi/pmtt/pmtt.c
@@ -149,16 +149,16 @@ static void pmtt_memory_device(
bool *passed)
{
switch(entry->type) {
- case FWTS_ACPI_PMTT_TYPE_SOCKET:
+ case FWTS_PMTT_TYPE_SOCKET:
pmtt_socket_test(fw, (fwts_acpi_table_pmtt_socket *) entry, offset, passed);
break;
- case FWTS_ACPI_PMTT_TYPE_CONTROLLER:
+ case FWTS_PMTT_TYPE_CONTROLLER:
pmtt_controller_test(fw, (fwts_acpi_table_pmtt_controller *) entry, offset, passed);
break;
- case FWTS_ACPI_PMTT_TYPE_DIMM:
+ case FWTS_PMTT_TYPE_DIMM:
pmtt_physical_component_test(fw, (fwts_acpi_table_pmtt_physical_component *) entry, passed);
break;
- case FWTS_ACPI_PMTT_TYPE_VENDOR_SPECIFIC:
+ case FWTS_PMTT_TYPE_VENDOR_SPECIFIC:
/* no tests for vendor-specific type */
break;
default:
diff --git a/src/acpi/pptt/pptt.c b/src/acpi/pptt/pptt.c
index 8656e979..d73dca5e 100644
--- a/src/acpi/pptt/pptt.c
+++ b/src/acpi/pptt/pptt.c
@@ -128,21 +128,21 @@ static int pptt_test1(fwts_framework *fw)
break;
}
- if (entry->type == FWTS_ACPI_PPTT_PROCESSOR) {
+ if (entry->type == FWTS_PPTT_PROCESSOR) {
pptt_processor_test(fw, (fwts_acpi_table_pptt_processor *) entry, pptt->header.revision, &passed);
type_length = sizeof(fwts_acpi_table_pptt_processor) +
((fwts_acpi_table_pptt_processor *) entry)->number_priv_resources * 4;
- } else if (entry->type == FWTS_ACPI_PPTT_CACHE) {
+ } else if (entry->type == FWTS_PPTT_CACHE) {
pptt_cache_test(fw, (fwts_acpi_table_pptt_cache *) entry, pptt->header.revision, &passed);
type_length = sizeof(fwts_acpi_table_pptt_cache);
if (pptt->header.revision < 3)
type_length -= sizeof(((fwts_acpi_table_pptt_cache *) entry)->cache_id);
- } else if (entry->type == FWTS_ACPI_PPTT_ID) {
+ } else if (entry->type == FWTS_PPTT_ID) {
fwts_log_warning(fw, "PPTT type 2 is depreciated since ACPI 6.3 Errata A.");
pptt_id_test(fw, (fwts_acpi_table_pptt_id *) entry, &passed);
type_length = sizeof(fwts_acpi_table_pptt_id);
} else {
- fwts_acpi_reserved_type_check(fw, "PPTT", entry->type, 0, FWTS_ACPI_PPTT_RESERVED - 1, &passed);
+ fwts_acpi_reserved_type_check(fw, "PPTT", entry->type, 0, FWTS_PPTT_RESERVED - 1, &passed);
break;
}
diff --git a/src/acpi/sdev/sdev.c b/src/acpi/sdev/sdev.c
index ef868df6..ac3b6be2 100644
--- a/src/acpi/sdev/sdev.c
+++ b/src/acpi/sdev/sdev.c
@@ -81,18 +81,18 @@ static int sdev_test1(fwts_framework *fw)
break;
}
- if (entry->type == FWTS_ACPI_SDEV_TYPE_ACPI_NAMESPACE) {
+ if (entry->type == FWTS_SDEV_TYPE_ACPI_NAMESPACE) {
fwts_acpi_table_sdev_acpi *acpi = (fwts_acpi_table_sdev_acpi *) entry;
sdev_acpi_namespace_device_test(fw, acpi, &passed);
type_length = sizeof(fwts_acpi_table_sdev_acpi) + acpi->device_id_length +
acpi->vendor_length + acpi->secure_access_length;
- } else if (entry->type == FWTS_ACPI_SDEV_TYPE_PCIE_ENDPOINT) {
+ } else if (entry->type == FWTS_SDEV_TYPE_PCIE_ENDPOINT) {
fwts_acpi_table_sdev_pcie *pcie = (fwts_acpi_table_sdev_pcie *) entry;
sdev_pcie_endpoint_device_test(fw, pcie, &passed);
type_length = sizeof(fwts_acpi_table_sdev_pcie) + pcie->path_length + pcie->vendor_length;
} else {
- fwts_acpi_reserved_type_check(fw, "SDEV", entry->type, 0, FWTS_ACPI_SDEV_TYPE_RESERVED, &passed);
+ fwts_acpi_reserved_type_check(fw, "SDEV", entry->type, 0, FWTS_SDEV_TYPE_RESERVED, &passed);
break;
}
diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h
index 0bad5452..ff95324b 100644
--- a/src/lib/include/fwts_acpi.h
+++ b/src/lib/include/fwts_acpi.h
@@ -109,7 +109,7 @@
const char *fwts_acpi_fadt_preferred_pm_profile(const int profile);
-#define FWTS_ACPI_FADT_FLAGS_HW_REDUCED_ACPI (1<<20)
+#define FWTS_FADT_FLAGS_HW_REDUCED_ACPI (1<<20)
/*
* ACPI GAS (Generic Address Structure), 5.2.3.1
@@ -508,35 +508,35 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_table_madt;
typedef enum {
- FWTS_ACPI_MADT_LOCAL_APIC = 0,
- FWTS_ACPI_MADT_IO_APIC,
- FWTS_ACPI_MADT_INTERRUPT_OVERRIDE,
- FWTS_ACPI_MADT_NMI_SOURCE,
- FWTS_ACPI_MADT_LOCAL_APIC_NMI,
- FWTS_ACPI_MADT_LOCAL_APIC_OVERRIDE,
- FWTS_ACPI_MADT_IO_SAPIC,
- FWTS_ACPI_MADT_LOCAL_SAPIC,
- FWTS_ACPI_MADT_INTERRUPT_SOURCE,
- FWTS_ACPI_MADT_LOCAL_X2APIC,
- FWTS_ACPI_MADT_LOCAL_X2APIC_NMI,
- FWTS_ACPI_MADT_GIC_C_CPU_INTERFACE,
- FWTS_ACPI_MADT_GIC_D_GOC_DISTRIBUTOR,
- FWTS_ACPI_MADT_GIC_V2M_MSI_FRAME,
- FWTS_ACPI_MADT_GIC_R_REDISTRIBUTOR,
- FWTS_ACPI_MADT_GIC_ITS,
- FWTS_ACPI_MADT_MP_WAKEUP,
- FWTS_ACPI_MADT_RESERVED, /* does not have defined structure */
- FWTS_ACPI_MADT_OEM /* does not have defined structure */
+ FWTS_MADT_LOCAL_APIC = 0,
+ FWTS_MADT_IO_APIC,
+ FWTS_MADT_INTERRUPT_OVERRIDE,
+ FWTS_MADT_NMI_SOURCE,
+ FWTS_MADT_LOCAL_APIC_NMI,
+ FWTS_MADT_LOCAL_APIC_OVERRIDE,
+ FWTS_MADT_IO_SAPIC,
+ FWTS_MADT_LOCAL_SAPIC,
+ FWTS_MADT_INTERRUPT_SOURCE,
+ FWTS_MADT_LOCAL_X2APIC,
+ FWTS_MADT_LOCAL_X2APIC_NMI,
+ FWTS_MADT_GIC_C_CPU_INTERFACE,
+ FWTS_MADT_GIC_D_GOC_DISTRIBUTOR,
+ FWTS_MADT_GIC_V2M_MSI_FRAME,
+ FWTS_MADT_GIC_R_REDISTRIBUTOR,
+ FWTS_MADT_GIC_ITS,
+ FWTS_MADT_MP_WAKEUP,
+ FWTS_MADT_RESERVED, /* does not have defined structure */
+ FWTS_MADT_OEM /* does not have defined structure */
} fwts_acpi_madt_type;
-/* Type 0, FWTS_ACPI_MADT_LOCAL_APIC */
+/* Type 0, FWTS_MADT_LOCAL_APIC */
typedef struct {
uint8_t acpi_processor_id;
uint8_t apic_id;
uint32_t flags;
} __attribute__ ((packed)) fwts_acpi_madt_processor_local_apic;
-/* Type 1, FWTS_ACPI_MADT_IO_APIC */
+/* Type 1, FWTS_MADT_IO_APIC */
typedef struct {
uint8_t io_apic_id;
uint8_t reserved;
@@ -544,7 +544,7 @@ typedef struct {
uint32_t global_irq_base;
} __attribute__ ((packed)) fwts_acpi_madt_io_apic;
-/* Type 2, FWTS_ACPI_MADT_INTERRUPT_OVERRIDE */
+/* Type 2, FWTS_MADT_INTERRUPT_OVERRIDE */
typedef struct {
uint8_t bus;
uint8_t source;
@@ -552,26 +552,26 @@ typedef struct {
uint16_t flags;
} __attribute__ ((packed)) fwts_acpi_madt_interrupt_override;
-/* Type 3, FWTS_ACPI_MADT_NMI_SOURCE */
+/* Type 3, FWTS_MADT_NMI_SOURCE */
typedef struct {
uint16_t flags;
uint32_t gsi;
} __attribute__ ((packed)) fwts_acpi_madt_nmi;
-/* Type 4, FWTS_ACPI_MADT_LOCAL_APIC_NMI */
+/* Type 4, FWTS_MADT_LOCAL_APIC_NMI */
typedef struct {
uint8_t acpi_processor_id;
uint16_t flags;
uint8_t local_apic_lint;
} __attribute__ ((packed)) fwts_acpi_madt_local_apic_nmi;
-/* Type 5, FWTS_ACPI_MADT_LOCAL_APIC_OVERRIDE */
+/* Type 5, FWTS_MADT_LOCAL_APIC_OVERRIDE */
typedef struct {
uint16_t reserved;
uint64_t address;
} __attribute__ ((packed)) fwts_acpi_madt_local_apic_addr_override;
-/* Type 6, FWTS_ACPI_MADT_IO_SAPIC */
+/* Type 6, FWTS_MADT_IO_SAPIC */
typedef struct {
uint8_t io_sapic_id;
uint8_t reserved;
@@ -579,7 +579,7 @@ typedef struct {
uint64_t address;
} __attribute__ ((packed)) fwts_acpi_madt_io_sapic;
-/* Type 7, FWTS_ACPI_MADT_LOCAL_SAPIC */
+/* Type 7, FWTS_MADT_LOCAL_SAPIC */
typedef struct {
uint8_t acpi_processor_id;
uint8_t local_sapic_id;
@@ -590,7 +590,7 @@ typedef struct {
char uid_string[0];
} __attribute__ ((packed)) fwts_acpi_madt_local_sapic;
-/* Type 8, FWTS_ACPI_MADT_INTERRUPT_SOURCE */
+/* Type 8, FWTS_MADT_INTERRUPT_SOURCE */
typedef struct {
uint16_t flags;
uint8_t type;
@@ -601,7 +601,7 @@ typedef struct {
uint32_t pis_flags;
} __attribute__ ((packed)) fwts_acpi_madt_platform_int_source;
-/* Type 9, FWTS_ACPI_MADT_LOCAL_X2APIC */
+/* Type 9, FWTS_MADT_LOCAL_X2APIC */
typedef struct {
uint16_t reserved;
uint32_t x2apic_id;
@@ -609,7 +609,7 @@ typedef struct {
uint32_t processor_uid;
} __attribute__ ((packed)) fwts_acpi_madt_local_x2apic;
-/* Type 10, FWTS_ACPI_MADT_LOCAL_X2APIC_NMI */
+/* Type 10, FWTS_MADT_LOCAL_X2APIC_NMI */
typedef struct {
uint16_t flags;
uint32_t processor_uid;
@@ -617,7 +617,7 @@ typedef struct {
uint8_t reserved[3];
} __attribute__ ((packed)) fwts_acpi_madt_local_x2apic_nmi;
-/* Type 11, FWTS_ACPI_MADT_GIC_C_CPU_INTERFACE */
+/* Type 11, FWTS_MADT_GIC_C_CPU_INTERFACE */
/* New in ACPI 5.0, GIC, section 5.2.12.14 */
typedef struct {
uint16_t reserved;
@@ -638,7 +638,7 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_madt_gic;
/* New in ACPI 5.0, GICD, section 5.2.12.15 */
-/* Type 12, FWTS_ACPI_MADT_GIC_D_GOC_DISTRIBUTOR */
+/* Type 12, FWTS_MADT_GIC_D_GOC_DISTRIBUTOR */
typedef struct {
uint16_t reserved;
uint32_t gic_id;
@@ -649,7 +649,7 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_madt_gicd;
/* New in ACPI 5.1, GIC MSI Frame structure, 5.2.12.16 */
-/* Type 13, FWTS_ACPI_MADT_GIC_V2M_MSI_FRAME */
+/* Type 13, FWTS_MADT_GIC_V2M_MSI_FRAME */
typedef struct {
uint16_t reserved;
uint32_t frame_id;
@@ -661,7 +661,7 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_madt_gic_msi;
/* New in ACPI 5.1, GICR structure, 5.2.12.17 */
-/* Type 14, FWTS_ACPI_MADT_GIC_R_REDISTRIBUTOR */
+/* Type 14, FWTS_MADT_GIC_R_REDISTRIBUTOR */
typedef struct {
uint16_t reserved;
uint64_t discovery_range_base_address;
@@ -669,7 +669,7 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_madt_gicr;
/* New in ACPI 6.0, GIC ITS structure, 5.2.12.18 */
-/* Type 15, FWTS_ACPI_MADT_GIC_ITS */
+/* Type 15, FWTS_MADT_GIC_ITS */
typedef struct {
uint16_t reserved;
uint32_t its_id;
@@ -678,7 +678,7 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_madt_gic_its;
/* New in ACPI 6.4, Multiprocessor Wakeup structure, 5.2.12.19 */
-/* Type 16, FWTS_ACPI_MADT_MP_WAKEUP */
+/* Type 16, FWTS_MADT_MP_WAKEUP */
typedef struct {
uint16_t mail_box_version;
uint32_t reserved;
@@ -695,26 +695,26 @@ typedef struct {
uint16_t platform_class;
union {
struct client_hdr {
- uint32_t log_zone_length;
- uint64_t log_zone_addr;
+ uint32_t log_zone_length;
+ uint64_t log_zone_addr;
} __attribute__ ((packed)) client;
struct server_hdr {
- uint16_t reserved;
- uint64_t log_zone_length;
- uint64_t log_zone_addr;
- uint16_t spec_revision;
- uint8_t device_flag;
- uint8_t interrupt_flag;
- uint8_t gpe;
- uint8_t reserved2[3];
- uint32_t global_sys_interrupt;
- fwts_acpi_gas base_addr;
- uint32_t reserved3;
- fwts_acpi_gas config_addr;
- uint8_t pci_seg_number;
- uint8_t pci_bus_number;
- uint8_t pci_dev_number;
- uint8_t pci_func_number;
+ uint16_t reserved;
+ uint64_t log_zone_length;
+ uint64_t log_zone_addr;
+ uint16_t spec_revision;
+ uint8_t device_flag;
+ uint8_t interrupt_flag;
+ uint8_t gpe;
+ uint8_t reserved2[3];
+ uint32_t global_sys_interrupt;
+ fwts_acpi_gas base_addr;
+ uint32_t reserved3;
+ fwts_acpi_gas config_addr;
+ uint8_t pci_seg_number;
+ uint8_t pci_bus_number;
+ uint8_t pci_dev_number;
+ uint8_t pci_func_number;
} __attribute__ ((packed)) server;
};
} __attribute__ ((packed)) fwts_acpi_table_tcpa;
@@ -1147,11 +1147,11 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_table_pmtt_header;
typedef enum {
- FWTS_ACPI_PMTT_TYPE_SOCKET = 0,
- FWTS_ACPI_PMTT_TYPE_CONTROLLER = 1,
- FWTS_ACPI_PMTT_TYPE_DIMM = 2,
- FWTS_ACPI_PMTT_TYPE_RESERVED = 3, /* 0x03-0xFE are reserved */
- FWTS_ACPI_PMTT_TYPE_VENDOR_SPECIFIC = 0xFF
+ FWTS_PMTT_TYPE_SOCKET = 0,
+ FWTS_PMTT_TYPE_CONTROLLER = 1,
+ FWTS_PMTT_TYPE_DIMM = 2,
+ FWTS_PMTT_TYPE_RESERVED = 3, /* 0x03-0xFE are reserved */
+ FWTS_PMTT_TYPE_VENDOR_SPECIFIC = 0xFF
} fwts_acpi_pmtt_type;
typedef struct {
@@ -1185,34 +1185,34 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_table_nfit_struct_header;
typedef enum {
- FWTS_ACPI_NFIT_TYPE_SYSTEM_ADDRESS = 0,
- FWTS_ACPI_NFIT_TYPE_MEMORY_MAP = 1,
- FWTS_ACPI_NFIT_TYPE_INTERLEAVE = 2,
- FWTS_ACPI_NFIT_TYPE_SMBIOS = 3,
- FWTS_ACPI_NFIT_TYPE_CONTROL_REGION = 4,
- FWTS_ACPI_NFIT_TYPE_DATA_REGION = 5,
- FWTS_ACPI_NFIT_TYPE_FLUSH_ADDRESS = 6,
- FWTS_ACPI_NFIT_TYPE_PLATFORM_CAPABILITY = 7,
- FWTS_ACPI_NFIT_TYPE_RESERVED = 8 /* >= 8 are reserved */
+ FWTS_NFIT_TYPE_SYSTEM_ADDRESS = 0,
+ FWTS_NFIT_TYPE_MEMORY_MAP = 1,
+ FWTS_NFIT_TYPE_INTERLEAVE = 2,
+ FWTS_NFIT_TYPE_SMBIOS = 3,
+ FWTS_NFIT_TYPE_CONTROL_REGION = 4,
+ FWTS_NFIT_TYPE_DATA_REGION = 5,
+ FWTS_NFIT_TYPE_FLUSH_ADDRESS = 6,
+ FWTS_NFIT_TYPE_PLATFORM_CAPABILITY = 7,
+ FWTS_NFIT_TYPE_RESERVED = 8 /* >= 8 are reserved */
} fwts_acpi_nfit_type;
-#define FWTS_ACPI_NFIT_NAME_SYSTEM_ADDRESS "SPA Range structure"
-#define FWTS_ACPI_NFIT_NAME_MEMORY_MAP "NVDIMM Region Mapping structure"
-#define FWTS_ACPI_NFIT_NAME_INTERLEAVE "Interleave structure"
-#define FWTS_ACPI_NFIT_NAME_SMBIOS "SMBIOS Management Information structure"
-#define FWTS_ACPI_NFIT_NAME_CONTROL_REGION "NVDIMM Control Region structure"
-#define FWTS_ACPI_NFIT_NAME_DATA_REGION "NVDIMM Block Data Window Region structure"
-#define FWTS_ACPI_NFIT_NAME_FLUSH_ADDRESS "Flush Hint Address structure"
-#define FWTS_ACPI_NFIT_NAME_PLATFORM_CAPABILITY "Platform Capabilities structure"
-
-#define FWTS_ACPI_NFIT_MINLEN_SYSTEM_ADDRESS 56
-#define FWTS_ACPI_NFIT_MINLEN_MEMORY_MAP 48
-#define FWTS_ACPI_NFIT_MINLEN_INTERLEAVE 16
-#define FWTS_ACPI_NFIT_MINLEN_SMBIOS 8
-#define FWTS_ACPI_NFIT_MINLEN_CONTROL_REGION 32
-#define FWTS_ACPI_NFIT_MINLEN_DATA_REGION 32
-#define FWTS_ACPI_NFIT_MINLEN_FLUSH_ADDRESS 16
-#define FWTS_ACPI_NFIT_MINLEN_PLATFORM_CAPABILITY 16
+#define FWTS_NFIT_NAME_SYSTEM_ADDRESS "SPA Range structure"
+#define FWTS_NFIT_NAME_MEMORY_MAP "NVDIMM Region Mapping structure"
+#define FWTS_NFIT_NAME_INTERLEAVE "Interleave structure"
+#define FWTS_NFIT_NAME_SMBIOS "SMBIOS Management Information structure"
+#define FWTS_NFIT_NAME_CONTROL_REGION "NVDIMM Control Region structure"
+#define FWTS_NFIT_NAME_DATA_REGION "NVDIMM Block Data Window Region structure"
+#define FWTS_NFIT_NAME_FLUSH_ADDRESS "Flush Hint Address structure"
+#define FWTS_NFIT_NAME_PLATFORM_CAPABILITY "Platform Capabilities structure"
+
+#define FWTS_NFIT_MINLEN_SYSTEM_ADDRESS 56
+#define FWTS_NFIT_MINLEN_MEMORY_MAP 48
+#define FWTS_NFIT_MINLEN_INTERLEAVE 16
+#define FWTS_NFIT_MINLEN_SMBIOS 8
+#define FWTS_NFIT_MINLEN_CONTROL_REGION 32
+#define FWTS_NFIT_MINLEN_DATA_REGION 32
+#define FWTS_NFIT_MINLEN_FLUSH_ADDRESS 16
+#define FWTS_NFIT_MINLEN_PLATFORM_CAPABILITY 16
typedef struct {
fwts_acpi_table_nfit_struct_header header;
@@ -1249,7 +1249,7 @@ typedef struct {
uint16_t reserved;
uint32_t line_count;
uint32_t line_size;
- uint32_t line_offset[];
+ uint32_t line_offset[];
} __attribute__ ((packed)) fwts_acpi_table_nfit_interleave;
typedef struct {
@@ -1317,9 +1317,9 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_table_sdev;
typedef enum {
- FWTS_ACPI_SDEV_TYPE_ACPI_NAMESPACE = 0,
- FWTS_ACPI_SDEV_TYPE_PCIE_ENDPOINT = 1,
- FWTS_ACPI_SDEV_TYPE_RESERVED = 2,
+ FWTS_SDEV_TYPE_ACPI_NAMESPACE = 0,
+ FWTS_SDEV_TYPE_PCIE_ENDPOINT = 1,
+ FWTS_SDEV_TYPE_RESERVED = 2,
} fwts_acpi_sdev_type;
typedef struct {
@@ -1349,9 +1349,9 @@ typedef struct {
} fwts_acpi_table_sdev_pcie;
typedef enum {
- FWTS_ACPI_SDEV_ID_BASE_SECURE_ACCESS = 0,
- FWTS_ACPI_SDEV_MEM_BASE_SECURE_ACCESS = 1,
- FWTS_ACPI_SDEV_RESERVED_SECURE_ACCESS = 2,
+ FWTS_SDEV_ID_BASE_SECURE_ACCESS = 0,
+ FWTS_SDEV_MEM_BASE_SECURE_ACCESS = 1,
+ FWTS_SDEV_RESERVED_SECURE_ACCESS = 2,
} fwts_acpi_sdev_acpi_type;
typedef struct {
@@ -1390,10 +1390,10 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_table_hmat;
typedef enum {
- FWTS_ACPI_HMAT_TYPE_PROXIMITY_DOMAIN = 0,
- FWTS_ACPI_HMAT_TYPE_LOCALITY = 1,
- FWTS_ACPI_HMAT_TYPE_CACHE = 2,
- FWTS_ACPI_HMAT_TYPE_RESERVED
+ FWTS_HMAT_TYPE_PROXIMITY_DOMAIN = 0,
+ FWTS_HMAT_TYPE_LOCALITY = 1,
+ FWTS_HMAT_TYPE_CACHE = 2,
+ FWTS_HMAT_TYPE_RESERVED
} fwts_acpi_hmat_type;
typedef struct {
@@ -1417,8 +1417,8 @@ typedef struct {
fwts_acpi_table_hmat_header header;
uint8_t flags;
uint8_t data_type;
- uint8_t min_transfer_size;
- uint8_t reserved1;
+ uint8_t min_transfer_size;
+ uint8_t reserved1;
uint32_t num_initiator;
uint32_t num_target;
uint32_t reserved2;
@@ -1458,10 +1458,10 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_table_pptt;
typedef enum {
- FWTS_ACPI_PPTT_PROCESSOR = 0,
- FWTS_ACPI_PPTT_CACHE = 1,
- FWTS_ACPI_PPTT_ID = 2,
- FWTS_ACPI_PPTT_RESERVED
+ FWTS_PPTT_PROCESSOR = 0,
+ FWTS_PPTT_CACHE = 1,
+ FWTS_PPTT_ID = 2,
+ FWTS_PPTT_RESERVED
} fwts_acpi_pptt_type;
typedef struct {
@@ -1511,9 +1511,9 @@ typedef struct {
} __attribute__ ((packed)) fwts_acpi_table_phat;
typedef enum {
- FWTS_ACPI_PHAT_VERSION = 0,
- FWTS_ACPI_PHAT_HEALTH = 1,
- FWTS_ACPI_PHAT_RESERVED
+ FWTS_PHAT_VERSION = 0,
+ FWTS_PHAT_HEALTH = 1,
+ FWTS_PHAT_RESERVED
} fwts_acpi_phat_type;
typedef struct {
@@ -1953,9 +1953,9 @@ typedef struct {
uint8_t silicon_vendor_info[0];
} __attribute__ ((packed)) fwts_acpi_table_csrt_resource_descriptor;
-#define FWTS_ACPI_TABLE_CSRT_TYPE_INTERRUPT (0x0001)
-#define FWTS_ACPI_TABLE_CSRT_TYPE_TIMER (0x0002)
-#define FWTS_ACPI_TABLE_CSRT_TYPE_DMA (0x0003)
+#define FWTS_TABLE_CSRT_TYPE_INTERRUPT (0x0001)
+#define FWTS_TABLE_CSRT_TYPE_TIMER (0x0002)
+#define FWTS_TABLE_CSRT_TYPE_DMA (0x0003)
/*
* ACPI LPTI (Low Power Idle Table)
diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
index b9ff40cc..68752564 100644
--- a/src/lib/src/fwts_acpi_tables.c
+++ b/src/lib/src/fwts_acpi_tables.c
@@ -317,7 +317,7 @@ fwts_bool fwts_acpi_is_reduced_hardware(fwts_framework *fw)
if ((fadt->header.revision >= 5) &&
(fadt->header.length >= 116) &&
- (fadt->flags & FWTS_ACPI_FADT_FLAGS_HW_REDUCED_ACPI)) {
+ (fadt->flags & FWTS_FADT_FLAGS_HW_REDUCED_ACPI)) {
return FWTS_TRUE;
}
return FWTS_FALSE;
--
2.31.1
More information about the fwts-devel
mailing list