ACK: [PATCH 5/6] acpi: shorten helper function names by removing "check"
ivanhu
ivan.hu at canonical.com
Mon May 17 06:23:19 UTC 2021
On 5/15/21 3:21 AM, Alex Hung wrote:
> This is for better readability and for shortening lines.
>
> There are no functional changes.
>
> Signed-off-by: Alex Hung <alex.hung at canonical.com>
> ---
> src/acpi/asf/asf.c | 10 ++---
> src/acpi/aspt/aspt.c | 2 +-
> src/acpi/bgrt/bgrt.c | 6 +--
> src/acpi/boot/boot.c | 2 +-
> src/acpi/cpep/cpep.c | 6 +--
> src/acpi/dbg2/dbg2.c | 6 +--
> src/acpi/dbgp/dbgp.c | 4 +-
> src/acpi/drtm/drtm.c | 2 +-
> src/acpi/ecdt/ecdt.c | 8 ++--
> src/acpi/einj/einj.c | 10 ++---
> src/acpi/erst/erst.c | 2 +-
> src/acpi/facs/facs.c | 6 +--
> src/acpi/fpdt/fpdt.c | 10 ++---
> src/acpi/gtdt/gtdt.c | 10 ++---
> src/acpi/hest/hest.c | 34 +++++++--------
> src/acpi/hmat/hmat.c | 38 ++++++++--------
> src/acpi/iort/iort.c | 18 ++++----
> src/acpi/lpit/lpit.c | 4 +-
> src/acpi/madt/madt.c | 2 +-
> src/acpi/mchi/mchi.c | 14 +++---
> src/acpi/mpst/mpst.c | 16 +++----
> src/acpi/msdm/msdm.c | 8 ++--
> src/acpi/nfit/nfit.c | 22 +++++-----
> src/acpi/pcct/pcct.c | 22 +++++-----
> src/acpi/pdtt/pdtt.c | 4 +-
> src/acpi/phat/phat.c | 14 +++---
> src/acpi/pmtt/pmtt.c | 22 +++++-----
> src/acpi/pptt/pptt.c | 24 +++++-----
> src/acpi/rsdp/rsdp.c | 2 +-
> src/acpi/sdev/sdev.c | 12 ++---
> src/acpi/slic/slic.c | 2 +-
> src/acpi/slit/slit.c | 2 +-
> src/acpi/spcr/spcr.c | 14 +++---
> src/acpi/spmi/spmi.c | 18 ++++----
> src/acpi/srat/srat.c | 34 +++++++--------
> src/acpi/tcpa/tcpa.c | 26 +++++------
> src/acpi/tpm2/tpm2.c | 2 +-
> src/acpi/uefi/uefi.c | 2 +-
> src/acpi/waet/waet.c | 4 +-
> src/acpi/wdat/wdat.c | 2 +-
> src/acpi/wpbt/wpbt.c | 4 +-
> src/acpi/wsmt/wsmt.c | 2 +-
> src/acpi/xenv/xenv.c | 2 +-
> src/lib/include/fwts_acpi_tables.h | 30 ++++++-------
> src/lib/src/fwts_acpi_object_eval.c | 68 ++++++++++++++---------------
> src/lib/src/fwts_acpi_tables.c | 40 ++++++++---------
> 46 files changed, 296 insertions(+), 296 deletions(-)
>
> diff --git a/src/acpi/asf/asf.c b/src/acpi/asf/asf.c
> index f660ca28..452769bb 100644
> --- a/src/acpi/asf/asf.c
> +++ b/src/acpi/asf/asf.c
> @@ -96,10 +96,10 @@ static void asf_check_info(
> info->min_sensor_poll_wait_time);
> }
>
> - fwts_acpi_reserved_bits_check("ASF!", "ASF_INFO Feature Flags", info->flags, 1, 7, passed);
> - fwts_acpi_reserved_zero_check("ASF!", "ASF_INFO Reserved1", info->reserved1, passed);
> - fwts_acpi_reserved_zero_check("ASF!", "ASF_INFO Reserved2", info->reserved2, passed);
> - fwts_acpi_reserved_zero_check("ASF!", "ASF_INFO Reserved3", info->reserved3, passed);
> + fwts_acpi_reserved_bits("ASF!", "ASF_INFO Feature Flags", info->flags, 1, 7, passed);
> + fwts_acpi_reserved_zero("ASF!", "ASF_INFO Reserved1", info->reserved1, passed);
> + fwts_acpi_reserved_zero("ASF!", "ASF_INFO Reserved2", info->reserved2, passed);
> + fwts_acpi_reserved_zero("ASF!", "ASF_INFO Reserved3", info->reserved3, passed);
>
> if (*passed)
> fwts_passed(fw, "No issues found in ASF! ASF_INFO record.");
> @@ -457,7 +457,7 @@ static int asf_test1(fwts_framework *fw)
> fwts_log_info_verbatim(fw, "Length: 0x%4.4" PRIx16, asf_hdr->length);
> #endif
>
> - fwts_acpi_reserved_zero_check("ASF!", "Information Record Reserved", asf_hdr->reserved, &passed);
> + fwts_acpi_reserved_zero("ASF!", "Information Record Reserved", asf_hdr->reserved, &passed);
>
> if (asf_hdr->length > (uint32_t)length) {
> passed = false;
> diff --git a/src/acpi/aspt/aspt.c b/src/acpi/aspt/aspt.c
> index 9b92214c..7c7947df 100644
> --- a/src/acpi/aspt/aspt.c
> +++ b/src/acpi/aspt/aspt.c
> @@ -38,7 +38,7 @@ static int aspt_test1(fwts_framework *fw)
> bool passed = true;
> fwts_acpi_table_aspt *aspt = (fwts_acpi_table_aspt *)table->data;
>
> - if (!fwts_acpi_table_length_check(fw, "ASPT", table->length, sizeof(fwts_acpi_table_aspt))) {
> + if (!fwts_acpi_table_length(fw, "ASPT", table->length, sizeof(fwts_acpi_table_aspt))) {
> passed = false;
> goto done;
> }
> diff --git a/src/acpi/bgrt/bgrt.c b/src/acpi/bgrt/bgrt.c
> index 8fbdf9a1..cede8ced 100644
> --- a/src/acpi/bgrt/bgrt.c
> +++ b/src/acpi/bgrt/bgrt.c
> @@ -46,9 +46,9 @@ static int bgrt_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Image Offset X: ", bgrt->image_offset_x);
> fwts_log_info_simp_int(fw, " Image Offset Y: ", bgrt->image_offset_y);
>
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_MEDIUM, "BGRT", "Version", bgrt->version, 1, &passed);
> - fwts_acpi_reserved_bits_check("BGRT", "BGRT Status", bgrt->status, 3, 7, &passed);
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_MEDIUM, "BGRT", "Image Type", bgrt->image_type, 0, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_MEDIUM, "BGRT", "Version", bgrt->version, 1, &passed);
> + fwts_acpi_reserved_bits("BGRT", "BGRT Status", bgrt->status, 3, 7, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_MEDIUM, "BGRT", "Image Type", bgrt->image_type, 0, &passed);
>
> if (passed)
> fwts_passed(fw, "No issues found in BGRT table.");
> diff --git a/src/acpi/boot/boot.c b/src/acpi/boot/boot.c
> index 68bdd599..8de2207f 100644
> --- a/src/acpi/boot/boot.c
> +++ b/src/acpi/boot/boot.c
> @@ -56,7 +56,7 @@ static int boot_test1(fwts_framework *fw)
> bool passed = true;
> fwts_acpi_table_boot *boot = (fwts_acpi_table_boot *)table->data;
>
> - if (!fwts_acpi_table_length_check(fw, "BOOT", table->length, sizeof(fwts_acpi_table_boot))) {
> + if (!fwts_acpi_table_length(fw, "BOOT", table->length, sizeof(fwts_acpi_table_boot))) {
> passed = false;
> goto done;
> }
> diff --git a/src/acpi/cpep/cpep.c b/src/acpi/cpep/cpep.c
> index 3eaacf7d..f76b6b5e 100644
> --- a/src/acpi/cpep/cpep.c
> +++ b/src/acpi/cpep/cpep.c
> @@ -51,7 +51,7 @@ static int cpep_test1(fwts_framework *fw)
> ((uint64_t) cpep->reserved[2] << 16) + ((uint64_t) cpep->reserved[3] << 24) +
> ((uint64_t) cpep->reserved[4] << 32) + ((uint64_t) cpep->reserved[5] << 40) +
> ((uint64_t) cpep->reserved[6] << 48) + ((uint64_t) cpep->reserved[7] << 56);
> - fwts_acpi_reserved_zero_check("CPEP", "Reserved", reserved, &passed);
> + fwts_acpi_reserved_zero("CPEP", "Reserved", reserved, &passed);
>
> n = (table->length - sizeof(fwts_acpi_table_cpep)) /
> sizeof(fwts_acpi_cpep_processor_info);
> @@ -63,10 +63,10 @@ static int cpep_test1(fwts_framework *fw)
> fwts_acpi_cpep_processor_info *info = &cpep->cpep_info[i];
>
> snprintf(label, 40, "Processor Structure %d Type", i);
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_HIGH, "CPEP", label, info->type, 0, &cpep_passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_HIGH, "CPEP", label, info->type, 0, &cpep_passed);
>
> snprintf(label, 40, "Processor Structure %d Length", i);
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_MEDIUM, "CPEP", label, info->length, 8, &cpep_passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_MEDIUM, "CPEP", label, info->length, 8, &cpep_passed);
>
> /* Should probably sanity check processor UID, EIDs at a later date */
>
> diff --git a/src/acpi/dbg2/dbg2.c b/src/acpi/dbg2/dbg2.c
> index b36c60ac..d345a65a 100644
> --- a/src/acpi/dbg2/dbg2.c
> +++ b/src/acpi/dbg2/dbg2.c
> @@ -148,7 +148,7 @@ static int dbg2_test1(fwts_framework *fw)
> size_t total_size;
>
> /* Enough length for the initial dbg2 header? */
> - if (!fwts_acpi_table_length_check(fw, "DBG2", table->length, sizeof(fwts_acpi_table_dbg2))) {
> + if (!fwts_acpi_table_length(fw, "DBG2", table->length, sizeof(fwts_acpi_table_dbg2))) {
> passed = false;
> goto done;
> }
> @@ -260,7 +260,7 @@ static int dbg2_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Address Size Offset: ", info->address_size_offset);
> fwts_log_nl(fw);
>
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_HIGH, "DBG2", "Info Structure Revision", info->revision, 0, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_HIGH, "DBG2", "Info Structure Revision", info->revision, 0, &passed);
>
> if (port == NULL) {
> passed = false;
> @@ -279,7 +279,7 @@ static int dbg2_test1(fwts_framework *fw)
> info->port_subtype);
> }
>
> - fwts_acpi_reserved_zero_check("DBG2", "Info Structure Reserved", info->reserved, &passed);
> + fwts_acpi_reserved_zero("DBG2", "Info Structure Reserved", info->reserved, &passed);
>
> length_ok = true;
> dbg2_check_offset(fw, table->length, offset + info->length,
> diff --git a/src/acpi/dbgp/dbgp.c b/src/acpi/dbgp/dbgp.c
> index 15c992a0..800b044b 100644
> --- a/src/acpi/dbgp/dbgp.c
> +++ b/src/acpi/dbgp/dbgp.c
> @@ -40,7 +40,7 @@ static int dbgp_test1(fwts_framework *fw)
> bool passed = true;
> uint32_t reserved;
>
> - if (!fwts_acpi_table_length_check(fw, "DBGP", table->length, sizeof(fwts_acpi_table_dbgp))) {
> + if (!fwts_acpi_table_length(fw, "DBGP", table->length, sizeof(fwts_acpi_table_dbgp))) {
> passed = false;
> goto done;
> }
> @@ -82,7 +82,7 @@ static int dbgp_test1(fwts_framework *fw)
> dbgp->interface_type);
> }
>
> - fwts_acpi_reserved_zero_check("DBGP", "Reserved", reserved, &passed);
> + fwts_acpi_reserved_zero("DBGP", "Reserved", reserved, &passed);
>
> if (dbgp->base_address.register_bit_width == 0) {
> passed = false;
> diff --git a/src/acpi/drtm/drtm.c b/src/acpi/drtm/drtm.c
> index 66b95695..cbfa2076 100644
> --- a/src/acpi/drtm/drtm.c
> +++ b/src/acpi/drtm/drtm.c
> @@ -54,7 +54,7 @@ static int drtm_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Architecture_Dependent: ", drtm->arch_dependent_address);
> fwts_log_info_simp_int(fw, " DRT_Flags: ", drtm->flags);
>
> - fwts_acpi_reserved_bits_check("DRTM", "DRT_Flags", drtm->flags, 4, 31, &passed);
> + fwts_acpi_reserved_bits("DRTM", "DRT_Flags", drtm->flags, 4, 31, &passed);
> fwts_log_nl(fw);
>
> offset = sizeof(fwts_acpi_table_drtm);
> diff --git a/src/acpi/ecdt/ecdt.c b/src/acpi/ecdt/ecdt.c
> index 58e2efa3..359a817b 100644
> --- a/src/acpi/ecdt/ecdt.c
> +++ b/src/acpi/ecdt/ecdt.c
> @@ -42,8 +42,8 @@ static int ecdt_test1(fwts_framework *fw)
> int i;
>
> /* Must be I/O Address Space or a Memory Space */
> - fwts_acpi_space_id_check(fw, "ECDT", "EC_CONTROL", &passed, ecdt->ec_control.address_space_id, 2,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY, FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
> + fwts_acpi_space_id(fw, "ECDT", "EC_CONTROL", &passed, ecdt->ec_control.address_space_id, 2,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY, FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
> /* Must be correct Access Size */
> if (ecdt->ec_control.access_width > 4) {
> fwts_failed(fw, LOG_LEVEL_MEDIUM,
> @@ -54,8 +54,8 @@ static int ecdt_test1(fwts_framework *fw)
> passed = false;
> }
> /* Must be I/O Address Space or a Memory Space */
> - fwts_acpi_space_id_check(fw, "ECDT", "EC_DATA", &passed, ecdt->ec_control.address_space_id, 2,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY, FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
> + fwts_acpi_space_id(fw, "ECDT", "EC_DATA", &passed, ecdt->ec_control.address_space_id, 2,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY, FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
> /* Must be correct Access Size */
> if (ecdt->ec_data.access_width > 4) {
> fwts_failed(fw, LOG_LEVEL_MEDIUM,
> diff --git a/src/acpi/einj/einj.c b/src/acpi/einj/einj.c
> index 414de501..36fa01dd 100644
> --- a/src/acpi/einj/einj.c
> +++ b/src/acpi/einj/einj.c
> @@ -47,8 +47,8 @@ static int einj_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Reserved: ", reserved);
> fwts_log_info_simp_int(fw, " Injection Entry Count: ", einj->count);
>
> - fwts_acpi_reserved_bits_check("EINJ", "Injection Flags", einj->flags, 0, 31, &passed);
> - fwts_acpi_reserved_zero_check("EINJ", "Reserved", reserved, &passed);
> + fwts_acpi_reserved_bits("EINJ", "Injection Flags", einj->flags, 0, 31, &passed);
> + fwts_acpi_reserved_zero("EINJ", "Reserved", reserved, &passed);
>
> fwts_log_nl(fw);
>
> @@ -99,9 +99,9 @@ static int einj_test1(fwts_framework *fw)
> passed = false;
> }
>
> - fwts_acpi_reserved_zero_check("EINJ", "Reserved", entry->reserved, &passed);
> - fwts_acpi_space_id_check(fw, "EINJ", "Register Region", &passed, gas.address_space_id, 2,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY, FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
> + fwts_acpi_reserved_zero("EINJ", "Reserved", entry->reserved, &passed);
> + fwts_acpi_space_id(fw, "EINJ", "Register Region", &passed, gas.address_space_id, 2,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY, FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
>
> fwts_log_nl(fw);
> }
> diff --git a/src/acpi/erst/erst.c b/src/acpi/erst/erst.c
> index 9e6480c6..b67e5691 100644
> --- a/src/acpi/erst/erst.c
> +++ b/src/acpi/erst/erst.c
> @@ -44,7 +44,7 @@ static int erst_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Reserved: ", erst->reserved);
> fwts_log_info_simp_int(fw, " Instruction Entry Count: ", erst->instruction_entry_count);
>
> - fwts_acpi_reserved_zero_check("ERST", "Reserved", erst->reserved, &passed);
> + fwts_acpi_reserved_zero("ERST", "Reserved", erst->reserved, &passed);
>
> if (erst->serialization_header_size > table->length) {
> passed = false;
> diff --git a/src/acpi/facs/facs.c b/src/acpi/facs/facs.c
> index 3dbc92d6..335253fb 100644
> --- a/src/acpi/facs/facs.c
> +++ b/src/acpi/facs/facs.c
> @@ -114,9 +114,9 @@ static int facs_test1(fwts_framework *fw)
> facs->length);
> }
>
> - fwts_acpi_reserved_zero_check("FACS", "Reserved", reserved, &passed);
> - fwts_acpi_reserved_bits_check("FACS", "Flags", facs->flags, 2, 31, &passed);
> - fwts_acpi_reserved_bits_check("FACS", "OSPM Flags", facs->ospm_flags, 1, 31, &passed);
> + fwts_acpi_reserved_zero("FACS", "Reserved", reserved, &passed);
> + fwts_acpi_reserved_bits("FACS", "Flags", facs->flags, 2, 31, &passed);
> + fwts_acpi_reserved_bits("FACS", "OSPM Flags", facs->ospm_flags, 1, 31, &passed);
>
> for (i = 0; i < 24; i++) {
> if (facs->reserved2[i]) {
> diff --git a/src/acpi/fpdt/fpdt.c b/src/acpi/fpdt/fpdt.c
> index 074428d6..ce3257e5 100644
> --- a/src/acpi/fpdt/fpdt.c
> +++ b/src/acpi/fpdt/fpdt.c
> @@ -66,7 +66,7 @@ static int fpdt_test1(fwts_framework *fw)
> const size_t fpdt_hdr_len = sizeof(fwts_acpi_table_fpdt_header);
>
> /* Size sanity, got enough table to get initial header */
> - if (!fwts_acpi_table_length_check(fw, "FPDT", table->length, sizeof(fwts_acpi_table_header))) {
> + if (!fwts_acpi_table_length(fw, "FPDT", table->length, sizeof(fwts_acpi_table_header))) {
> passed = false;
> goto done;
> }
> @@ -103,7 +103,7 @@ static int fpdt_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Reserved: ", fbbpr->reserved);
> fwts_log_info_simp_int(fw, " FBPT Pointer: ", fbbpr->fbpt_addr);
>
> - fwts_acpi_reserved_zero_check("FPDT", "Reserved", fbbpr->reserved, &passed);
> + fwts_acpi_reserved_zero("FPDT", "Reserved", fbbpr->reserved, &passed);
>
> /*
> * For the moment, only dump the 64-bit processor-relative physical address
> @@ -113,7 +113,7 @@ static int fpdt_test1(fwts_framework *fw)
> fwts_log_info(fw, "Note: currently fwts does not check FBPT validity and the associated data");
> }
>
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_MEDIUM, "FPDT", "FBPT Revision", fbbpr->fpdt.revision, 1, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_MEDIUM, "FPDT", "FBPT Revision", fbbpr->fpdt.revision, 1, &passed);
>
> /* Spec doesn't mention Reserved field should be 0 or not, skip checking the reserved field */
> break;
> @@ -130,7 +130,7 @@ static int fpdt_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Reserved: ", s3ptpr->reserved);
> fwts_log_info_simp_int(fw, " S3PT Pointer: ", s3ptpr->s3pt_addr);
>
> - fwts_acpi_reserved_zero_check("FPDT", "Reserved", s3ptpr->reserved, &passed);
> + fwts_acpi_reserved_zero("FPDT", "Reserved", s3ptpr->reserved, &passed);
>
> /*
> * For the moment, only dump 64-bit processor-relative physical
> @@ -140,7 +140,7 @@ static int fpdt_test1(fwts_framework *fw)
> fwts_log_info(fw, "Note: currently fwts does not check S3PT validity and the associated data");
> }
>
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_MEDIUM, "FPDT", "S3PT Revision", s3ptpr->fpdt.revision, 1, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_MEDIUM, "FPDT", "S3PT Revision", s3ptpr->fpdt.revision, 1, &passed);
>
> /* Spec doesn't mention Reserved field should be 0 or not, skip checking the reserved field */
> break;
> diff --git a/src/acpi/gtdt/gtdt.c b/src/acpi/gtdt/gtdt.c
> index 1642c1e8..270ade37 100644
> --- a/src/acpi/gtdt/gtdt.c
> +++ b/src/acpi/gtdt/gtdt.c
> @@ -74,7 +74,7 @@ static int gtdt_test1(fwts_framework *fw)
> "If not provided, this field must be 0xFFFFFFFFFFFFFFFF");
> }
>
> - fwts_acpi_reserved_bits_check("GTDT", "Flags", gtdt->virtual_timer_flags, 3, 31, &passed);
> + fwts_acpi_reserved_bits("GTDT", "Flags", gtdt->virtual_timer_flags, 3, 31, &passed);
>
> ptr = (uint8_t *)table->data + gtdt->platform_timer_offset;
> n = gtdt->platform_timer_count;
> @@ -188,13 +188,13 @@ static int gtdt_test1(fwts_framework *fw)
> }
>
> snprintf(field, sizeof(field), "block %" PRIu32 " physical timer flags", i);
> - fwts_acpi_reserved_bits_check("GTDT", field, block_timer->phys_timer_flags, 2, 31, &passed);
> + fwts_acpi_reserved_bits("GTDT", field, block_timer->phys_timer_flags, 2, 31, &passed);
>
> snprintf(field, sizeof(field), "block %" PRIu32 " virtual timer flags", i);
> - fwts_acpi_reserved_bits_check("GTDT", field, block_timer->virt_timer_flags, 2, 31, &passed);
> + fwts_acpi_reserved_bits("GTDT", field, block_timer->virt_timer_flags, 2, 31, &passed);
>
> snprintf(field, sizeof(field), "block %" PRIu32 " common flags", i);
> - fwts_acpi_reserved_bits_check("GTDT", field, block_timer->common_flags, 2, 31, &passed);
> + fwts_acpi_reserved_bits("GTDT", field, block_timer->common_flags, 2, 31, &passed);
> }
> ptr += block->length;
> break;
> @@ -242,7 +242,7 @@ static int gtdt_test1(fwts_framework *fw)
> }
>
> snprintf(field, sizeof(field), "SBSA generic watchdog timer %" PRIu32 " flags", i);
> - fwts_acpi_reserved_bits_check("GTDT", field, watchdog->watchdog_timer_flags, 3, 31, &passed);
> + fwts_acpi_reserved_bits("GTDT", field, watchdog->watchdog_timer_flags, 3, 31, &passed);
>
> ptr += watchdog->length;
> break;
> diff --git a/src/acpi/hest/hest.c b/src/acpi/hest/hest.c
> index ae7343f4..ce502cd4 100644
> --- a/src/acpi/hest/hest.c
> +++ b/src/acpi/hest/hest.c
> @@ -85,7 +85,7 @@ static void hest_check_ia32_arch_machine_check_exception(
> fwts_log_info_simp_int(fw, " Reserved: ", reserved2);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_zero_check("HEST", "MCE Reserved1", exception->reserved1, passed);
> + fwts_acpi_reserved_zero("HEST", "MCE Reserved1", exception->reserved1, passed);
>
> if (exception->flags & ~0x5) {
> fwts_failed(fw, LOG_LEVEL_MEDIUM,
> @@ -103,7 +103,7 @@ static void hest_check_ia32_arch_machine_check_exception(
> *passed = false;
> }
>
> - fwts_acpi_reserved_zero_check("HEST", "MCE Reserved2", reserved2, passed);
> + fwts_acpi_reserved_zero("HEST", "MCE Reserved2", reserved2, passed);
>
> for (i = 0; i < exception->number_of_hardware_banks; i++) {
> fwts_acpi_table_hest_machine_check_bank *bank = &exception->bank[i];
> @@ -214,7 +214,7 @@ static void hest_check_ia32_arch_corrected_machine_check(
> fwts_log_info_simp_int(fw, " Reserved: ", reserved2);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_zero_check("HEST", "Machine Check Reserved1", check->reserved1, passed);
> + fwts_acpi_reserved_zero("HEST", "Machine Check Reserved1", check->reserved1, passed);
>
> if (check->flags & ~0x5) {
> fwts_failed(fw, LOG_LEVEL_MEDIUM,
> @@ -242,7 +242,7 @@ static void hest_check_ia32_arch_corrected_machine_check(
> check->notification.type);
> }
>
> - fwts_acpi_reserved_zero_check("HEST", "Machine Check Reserved2", reserved2, passed);
> + fwts_acpi_reserved_zero("HEST", "Machine Check Reserved2", reserved2, passed);
>
> for (i = 0; i < check->number_of_hardware_banks; i++) {
> fwts_acpi_table_hest_machine_check_bank *bank = &check->bank[i];
> @@ -319,7 +319,7 @@ static void hest_check_acpi_table_hest_nmi_error(
> fwts_log_info_simp_int(fw, " Max Raw Data Length: ", err->max_raw_data_length);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_zero_check("HEST", "NMI Reserved", err->reserved1, passed);
> + fwts_acpi_reserved_zero("HEST", "NMI Reserved", err->reserved1, passed);
>
> if (err->number_of_records_to_preallocate < 1) {
> *passed = false;
> @@ -388,9 +388,9 @@ static void hest_check_pci_express_root_port_aer(
> fwts_log_info_simp_int(fw, " Root Error Command: ", aer->root_error_command);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_zero_check("HEST", "PCI Express Root Port Reserved1", aer->reserved1, passed);
> - fwts_acpi_reserved_bits_check("HEST", "PCI Express Root Port Flags", aer->flags, 2, 7, passed);
> - fwts_acpi_reserved_zero_check("HEST", "PCI Express Root Port Reserved2", aer->reserved2, passed);
> + fwts_acpi_reserved_zero("HEST", "PCI Express Root Port Reserved1", aer->reserved1, passed);
> + fwts_acpi_reserved_bits("HEST", "PCI Express Root Port Flags", aer->flags, 2, 7, passed);
> + fwts_acpi_reserved_zero("HEST", "PCI Express Root Port Reserved2", aer->reserved2, passed);
>
> if (aer->number_of_records_to_preallocate < 1) {
> *passed = false;
> @@ -456,9 +456,9 @@ static void hest_check_pci_express_device_aer(
> fwts_log_info_simp_int(fw, " Advanced Capabilities: ", aer->advanced_error_capabilities_and_control);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_zero_check("HEST", "PCI Express Device Reserved1", aer->reserved1, passed);
> - fwts_acpi_reserved_bits_check("HEST", "PCI Express Device Flags", aer->flags, 2, 7, passed);
> - fwts_acpi_reserved_zero_check("HEST", "PCI Express Device Reserved2", aer->reserved2, passed);
> + fwts_acpi_reserved_zero("HEST", "PCI Express Device Reserved1", aer->reserved1, passed);
> + fwts_acpi_reserved_bits("HEST", "PCI Express Device Flags", aer->flags, 2, 7, passed);
> + fwts_acpi_reserved_zero("HEST", "PCI Express Device Reserved2", aer->reserved2, passed);
>
> if (aer->number_of_records_to_preallocate < 1) {
> *passed = false;
> @@ -528,9 +528,9 @@ static void hest_heck_pci_express_bridge_aer(
> fwts_log_info_simp_int(fw, " 2nd Advanced Capabilities:", aer->secondary_advanced_error_capabilities_and_control);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_zero_check("HEST", "PCI Express Bridge Reserved1", aer->reserved1, passed);
> - fwts_acpi_reserved_bits_check("HEST", "PCI Express Bridge Flags", aer->flags, 2, 7, passed);
> - fwts_acpi_reserved_zero_check("HEST", "PCI Express Bridge Reserved2", aer->reserved2, passed);
> + fwts_acpi_reserved_zero("HEST", "PCI Express Bridge Reserved1", aer->reserved1, passed);
> + fwts_acpi_reserved_bits("HEST", "PCI Express Bridge Flags", aer->flags, 2, 7, passed);
> + fwts_acpi_reserved_zero("HEST", "PCI Express Bridge Reserved2", aer->reserved2, passed);
>
> if (aer->number_of_records_to_preallocate < 1) {
> *passed = false;
> @@ -649,7 +649,7 @@ static void hest_check_generic_error_source(
> source->notification.type);
> }
>
> - fwts_acpi_reserved_bits_check("HEST", "HEST Configuration Write Enabled",
> + fwts_acpi_reserved_bits("HEST", "HEST Configuration Write Enabled",
> source->notification.configuration_write_enable, 6, 31, passed);
>
> *length -= sizeof(fwts_acpi_table_hest_generic_hardware_error_source);
> @@ -763,7 +763,7 @@ static void hest_check_generic_error_source_v2(
> source->notification.type);
> }
>
> - fwts_acpi_reserved_bits_check("HEST", "HEST Configuration Write Enabled",
> + fwts_acpi_reserved_bits("HEST", "HEST Configuration Write Enabled",
> source->notification.configuration_write_enable, 6, 31, passed);
>
> *length -= sizeof(fwts_acpi_table_hest_generic_hardware_error_source_v2);
> @@ -789,7 +789,7 @@ static int hest_test1(fwts_framework *fw)
> hest_type_02_count = 0,
> hest_type_11_count = 0;
>
> - if (!fwts_acpi_table_length_check(fw, "HEST", table->length, sizeof(fwts_acpi_table_hest))) {
> + if (!fwts_acpi_table_length(fw, "HEST", table->length, sizeof(fwts_acpi_table_hest))) {
> passed = false;
> goto done;
> }
> diff --git a/src/acpi/hmat/hmat.c b/src/acpi/hmat/hmat.c
> index 3f900814..86037152 100644
> --- a/src/acpi/hmat/hmat.c
> +++ b/src/acpi/hmat/hmat.c
> @@ -40,12 +40,12 @@ static void hmat_proximity_domain_test(fwts_framework *fw, const fwts_acpi_table
> fwts_log_info_simp_int(fw, " Reserved: ", entry->reserved3);
> fwts_log_info_simp_int(fw, " Reserved: ", entry->reserved4);
>
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->header.reserved, passed);
> - fwts_acpi_reserved_bits_check("HMAT", "Flags", entry->flags, 1, 15, passed);
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->reserved1, passed);
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->reserved2, passed);
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->reserved3, passed);
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->reserved4, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->header.reserved, passed);
> + fwts_acpi_reserved_bits("HMAT", "Flags", entry->flags, 1, 15, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->reserved1, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->reserved2, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->reserved3, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->reserved4, passed);
> }
>
> static void hmat_locality_test(fwts_framework *fw, const fwts_acpi_table_hmat_locality *entry, bool *passed)
> @@ -69,8 +69,8 @@ static void hmat_locality_test(fwts_framework *fw, const fwts_acpi_table_hmat_lo
> fwts_log_info_simp_int(fw, " Reserved: ", entry->reserved2);
> fwts_log_info_simp_int(fw, " Entry Base Unit: ", entry->entry_base_unit);
>
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->header.reserved, passed);
> - fwts_acpi_reserved_bits_check("HMAT", "Flags", entry->flags, 6, 7, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->header.reserved, passed);
> + fwts_acpi_reserved_bits("HMAT", "Flags", entry->flags, 6, 7, passed);
>
> if (entry->data_type > 5) {
> *passed = false;
> @@ -81,10 +81,10 @@ static void hmat_locality_test(fwts_framework *fw, const fwts_acpi_table_hmat_lo
> }
>
> if (fwts_get_acpi_version(fw) >= FWTS_ACPI_VERSION_64)
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->reserved1, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->reserved1, passed);
> else
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", reserved1, passed);
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->reserved2, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", reserved1, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->reserved2, passed);
>
> pd_size = (entry->num_initiator + entry->num_target) * 4 +
> (entry->num_initiator * entry->num_target * 2);
> @@ -116,7 +116,7 @@ static void hmat_cache_test(fwts_framework *fw, const fwts_acpi_table_hmat_cache
> fwts_log_info_simp_int(fw, " Reserved: ", entry->reserved2);
> fwts_log_info_simp_int(fw, " Number of SMBIOS Handles: ", entry->num_smbios);
>
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->header.reserved, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->header.reserved, passed);
>
> if ((entry->cache_attr & 0xf) > 3 ||
> ((entry->cache_attr >> 4) & 0xf) > 3 ||
> @@ -129,8 +129,8 @@ static void hmat_cache_test(fwts_framework *fw, const fwts_acpi_table_hmat_cache
> "0x%8.8" PRIx32 " instead", entry->cache_attr);
> }
>
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->reserved1, passed);
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", entry->reserved2, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->reserved1, passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", entry->reserved2, passed);
>
> if ((entry->header.length - sizeof(fwts_acpi_table_hmat_cache)) / 2 != entry->num_smbios) {
> *passed = false;
> @@ -152,14 +152,14 @@ static int hmat_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Reserved: ", hmat->reserved);
>
>
> - fwts_acpi_reserved_zero_check("HMAT", "Reserved", hmat->reserved, &passed);
> + fwts_acpi_reserved_zero("HMAT", "Reserved", hmat->reserved, &passed);
>
> entry = (fwts_acpi_table_hmat_header *) (table->data + sizeof(fwts_acpi_table_hmat));
> offset = sizeof(fwts_acpi_table_hmat);
> while (offset < table->length) {
> uint32_t type_length;
>
> - if (fwts_acpi_structure_length_zero_check(fw, "HMAT", entry->length, offset)) {
> + if (fwts_acpi_structure_length_zero(fw, "HMAT", entry->length, offset)) {
> passed = false;
> break;
> }
> @@ -178,17 +178,17 @@ static int hmat_test1(fwts_framework *fw)
> 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_HMAT_TYPE_RESERVED - 1, &passed);
> + fwts_acpi_reserved_type(fw, "HMAT", entry->type, 0, FWTS_HMAT_TYPE_RESERVED - 1, &passed);
> break;
> }
>
> - if (!fwts_acpi_structure_length_check(fw, "HMAT", entry->type, entry->length, type_length)) {
> + if (!fwts_acpi_structure_length(fw, "HMAT", entry->type, entry->length, type_length)) {
> passed = false;
> break;
> }
>
> offset += entry->length;
> - if (fwts_acpi_structure_range_check(fw, "HMAT", table->length, offset)) {
> + if (fwts_acpi_structure_range(fw, "HMAT", table->length, offset)) {
> passed = false;
> break;
> }
> diff --git a/src/acpi/iort/iort.c b/src/acpi/iort/iort.c
> index 3ee16abe..0a828de6 100644
> --- a/src/acpi/iort/iort.c
> +++ b/src/acpi/iort/iort.c
> @@ -71,9 +71,9 @@ static void iort_node_check(
> }
>
> } else
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_MEDIUM, "IORT", "IORT Node Revision", node->revision, 0, passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_MEDIUM, "IORT", "IORT Node Revision", node->revision, 0, passed);
>
> - fwts_acpi_reserved_zero_check("IORT", "Node Reserved", node->reserved, passed);
> + fwts_acpi_reserved_zero("IORT", "Node Reserved", node->reserved, passed);
>
> if (no_id_mappings && node->id_mappings_count) {
> *passed = false;
> @@ -166,7 +166,7 @@ static void iort_id_mappings_check(
> }
>
> snprintf(field, sizeof(field), "ID Mapping %" PRIu32 " flags", i);
> - fwts_acpi_reserved_bits_check("IORT", field, id_mapping->flags, 1, 31, passed);
> + fwts_acpi_reserved_bits("IORT", field, id_mapping->flags, 1, 31, passed);
> }
> }
>
> @@ -209,7 +209,7 @@ static void iort_smmu_interrupt_flags_check(
> uint32_t flags,
> bool *passed)
> {
> - fwts_acpi_reserved_bits_check("IORT", name, flags, 1, 31, passed);
> + fwts_acpi_reserved_bits("IORT", name, flags, 1, 31, passed);
> }
>
> /*
> @@ -366,13 +366,13 @@ static void iort_memory_access_properties_check(
> }
>
> snprintf(field, sizeof(field), "%s Allocation Hints", name);
> - fwts_acpi_reserved_bits_check("IORT", field, properties->allocation_hints, 4, 7, passed);
> + fwts_acpi_reserved_bits("IORT", field, properties->allocation_hints, 4, 7, passed);
>
> snprintf(field, sizeof(field), "%s Reserved", name);
> - fwts_acpi_reserved_zero_check("IORT", field, properties->reserved, passed);
> + fwts_acpi_reserved_zero("IORT", field, properties->reserved, passed);
>
> snprintf(field, sizeof(field), "%s Memory Access Flags", name);
> - fwts_acpi_reserved_bits_check("IORT", field, properties->memory_access_flags, 2, 7, passed);
> + fwts_acpi_reserved_bits("IORT", field, properties->memory_access_flags, 2, 7, passed);
>
> cca = properties->cache_coherent & 1;
> cpm = properties->memory_access_flags & 1;
> @@ -540,7 +540,7 @@ static void iort_check_smmu(
> "a model value 0 to 5.", node->model);
> }
>
> - fwts_acpi_reserved_bits_check("IORT", "SMMU Reserved Flags", node->flags, 2, 31, passed);
> + fwts_acpi_reserved_bits("IORT", "SMMU Reserved Flags", node->flags, 2, 31, passed);
> fwts_log_nl(fw);
> }
>
> @@ -580,7 +580,7 @@ static void iort_check_smmuv3(
> "a model value of 0.", node->model);
> }
>
> - fwts_acpi_reserved_bits_check("IORT", "SMMUv3 Reserved Flags", node->flags, 2, 31, passed);
> + fwts_acpi_reserved_bits("IORT", "SMMUv3 Reserved Flags", node->flags, 2, 31, passed);
> fwts_log_nl(fw);
> }
>
> diff --git a/src/acpi/lpit/lpit.c b/src/acpi/lpit/lpit.c
> index 7e5996fd..40fbe687 100644
> --- a/src/acpi/lpit/lpit.c
> +++ b/src/acpi/lpit/lpit.c
> @@ -80,8 +80,8 @@ static void lpit_check_type_0(
> }
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_zero_check("LPIT", "Native C-state based LPI structure reserved", lpi->reserved, passed);
> - fwts_acpi_reserved_bits_check("LPIT", "LPI structure flags", lpi->flags, 2, 31, passed);
> + fwts_acpi_reserved_zero("LPIT", "Native C-state based LPI structure reserved", lpi->reserved, passed);
> + fwts_acpi_reserved_bits("LPIT", "LPI structure flags", lpi->flags, 2, 31, passed);
>
> /* 2.2.1.2, if FFH, then it is a MSR, check GAS fields */
> if (((lpi->flags & 2) == 0) &&
> diff --git a/src/acpi/madt/madt.c b/src/acpi/madt/madt.c
> index b811376d..7455c964 100644
> --- a/src/acpi/madt/madt.c
> +++ b/src/acpi/madt/madt.c
> @@ -576,7 +576,7 @@ static void check_madt_apic_flags(fwts_framework *fw, uint8_t type, uint32_t fla
> if (madt->header.revision < 5)
> head = 1;
>
> - fwts_acpi_reserved_bits_check("MADT", "Local APIC Flags", flags, head, 31, &passed);
> + fwts_acpi_reserved_bits("MADT", "Local APIC Flags", flags, head, 31, &passed);
>
> if (passed)
> fwts_passed(fw, "MADT %s flags field, bits %" PRIu8
> diff --git a/src/acpi/mchi/mchi.c b/src/acpi/mchi/mchi.c
> index 45041bce..2a1732d9 100644
> --- a/src/acpi/mchi/mchi.c
> +++ b/src/acpi/mchi/mchi.c
> @@ -40,7 +40,7 @@ static int mchi_test1(fwts_framework *fw)
> bool passed = true;
> fwts_acpi_table_mchi *mchi = (fwts_acpi_table_mchi *)table->data;
>
> - if (!fwts_acpi_table_length_check(fw, "MCHI", table->length, sizeof(fwts_acpi_table_mchi))) {
> + if (!fwts_acpi_table_length(fw, "MCHI", table->length, sizeof(fwts_acpi_table_mchi))) {
> passed = false;
> goto done;
> }
> @@ -98,7 +98,7 @@ static int mchi_test1(fwts_framework *fw)
> "255 (OEM defined)", mchi->protocol_identifier);
> }
>
> - fwts_acpi_reserved_bits_check("MCHI", "Interrupt Type", mchi->interrupt_type, 2, 7, &passed);
> + fwts_acpi_reserved_bits("MCHI", "Interrupt Type", mchi->interrupt_type, 2, 7, &passed);
>
> if (((mchi->interrupt_type & 0x01) == 0) &&
> (mchi->gpe != 0)) {
> @@ -111,7 +111,7 @@ static int mchi_test1(fwts_framework *fw)
> mchi->gpe);
> }
>
> - fwts_acpi_reserved_bits_check("MCHI", "PCI Device Flag", mchi->pci_device_flag, 1, 7, &passed);
> + fwts_acpi_reserved_bits("MCHI", "PCI Device Flag", mchi->pci_device_flag, 1, 7, &passed);
>
> if (((mchi->interrupt_type & 0x02) == 0) &&
> (mchi->global_system_interrupt != 0)) {
> @@ -123,10 +123,10 @@ static int mchi_test1(fwts_framework *fw)
> mchi->global_system_interrupt);
> }
>
> - fwts_acpi_space_id_check(fw, "MCHI", "Base Address", &passed, mchi->base_address.address_space_id, 3,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO,
> - FWTS_GAS_ADDR_SPACE_ID_SMBUS);
> + fwts_acpi_space_id(fw, "MCHI", "Base Address", &passed, mchi->base_address.address_space_id, 3,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO,
> + FWTS_GAS_ADDR_SPACE_ID_SMBUS);
>
> /* SMBus specific checks */
> if (mchi->base_address.address_space_id == FWTS_GAS_ADDR_SPACE_ID_SMBUS) {
> diff --git a/src/acpi/mpst/mpst.c b/src/acpi/mpst/mpst.c
> index 3f366b54..4cf4bc10 100644
> --- a/src/acpi/mpst/mpst.c
> +++ b/src/acpi/mpst/mpst.c
> @@ -45,13 +45,13 @@ static int mpst_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Communication Channel ID: ", mpst->channel_id);
> fwts_log_info_simp_int(fw, " Reserved: ", reserved);
>
> - fwts_acpi_reserved_zero_check("MPST", "Reserved", reserved, &passed);
> + fwts_acpi_reserved_zero("MPST", "Reserved", reserved, &passed);
>
> node_list = (fwts_acpi_table_mpst_power_node_list *) (table->data + sizeof(fwts_acpi_table_mpst));
> fwts_log_info_simp_int(fw, " Memory Power Node Count: ", node_list->count);
> fwts_log_info_simp_int(fw, " Reserved: ", node_list->reserved);
>
> - fwts_acpi_reserved_zero_check("MPST", "Reserved", node_list->reserved, &passed);
> + fwts_acpi_reserved_zero("MPST", "Reserved", node_list->reserved, &passed);
>
> node_offset = sizeof(fwts_acpi_table_mpst) + (sizeof(fwts_acpi_table_mpst_power_node_list));
> if (mpst->header.length < node_offset + sizeof(fwts_acpi_table_mpst_power_node) * node_list->count) {
> @@ -75,8 +75,8 @@ static int mpst_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Number of Power States: ", power_node->num_states);
> fwts_log_info_simp_int(fw, " Number of Physical Components: ", power_node->num_components);
>
> - fwts_acpi_reserved_bits_check("MPST", "Power Node Flags", power_node->flags, 3, 7, &passed);
> - fwts_acpi_reserved_zero_check("MPST", "Reserved", power_node->reserved, &passed);
> + fwts_acpi_reserved_bits("MPST", "Power Node Flags", power_node->flags, 3, 7, &passed);
> + fwts_acpi_reserved_zero("MPST", "Reserved", power_node->reserved, &passed);
>
> node_length = sizeof(fwts_acpi_table_mpst_power_node) +
> sizeof(fwts_acpi_table_mpst_power_state) * power_node->num_states +
> @@ -123,7 +123,7 @@ static int mpst_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Memory Characteristics Count: ", char_list->count);
> fwts_log_info_simp_int(fw, " Reserved: ", char_list->reserved);
>
> - fwts_acpi_reserved_zero_check("MPST", "Reserved", char_list->reserved, &passed);
> + fwts_acpi_reserved_zero("MPST", "Reserved", char_list->reserved, &passed);
>
> node_offset += sizeof(fwts_acpi_table_mpst_power_char_list);
> if (mpst->header.length < node_offset + sizeof(fwts_acpi_table_mpst_power_char) * char_list->count) {
> @@ -161,9 +161,9 @@ static int mpst_test1(fwts_framework *fw)
> "0x%2.2" PRIx8 " instead", (power_char->structure_id & 0xC0) >> 6);
> }
>
> - fwts_acpi_reserved_bits_check("MPST", "Power Characteristics Flags", power_char->flags, 3, 7, &passed);
> - fwts_acpi_reserved_zero_check("MPST", "Reserved1", power_char->reserved1, &passed);
> - fwts_acpi_reserved_zero_check("MPST", "Reserved2", power_char->reserved2, &passed);
> + fwts_acpi_reserved_bits("MPST", "Power Characteristics Flags", power_char->flags, 3, 7, &passed);
> + fwts_acpi_reserved_zero("MPST", "Reserved1", power_char->reserved1, &passed);
> + fwts_acpi_reserved_zero("MPST", "Reserved2", power_char->reserved2, &passed);
>
> node_offset += sizeof(fwts_acpi_table_mpst_power_char);
> }
> diff --git a/src/acpi/msdm/msdm.c b/src/acpi/msdm/msdm.c
> index d8dfc124..b9b60ec6 100644
> --- a/src/acpi/msdm/msdm.c
> +++ b/src/acpi/msdm/msdm.c
> @@ -41,7 +41,7 @@ static int msdm_test1(fwts_framework *fw)
> bool passed = true;
>
> /* Size sanity check #1, got enough table to get initial header */
> - if (!fwts_acpi_table_length_check(fw, "MSDM", table->length, sizeof(fwts_acpi_table_msdm))) {
> + if (!fwts_acpi_table_length(fw, "MSDM", table->length, sizeof(fwts_acpi_table_msdm))) {
> passed = false;
> goto done;
> }
> @@ -50,8 +50,8 @@ static int msdm_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Data Reserved: ", msdm->data_reserved);
> fwts_log_info_simp_int(fw, " Data Length: ", msdm->data_length);
>
> - fwts_acpi_reserved_zero_check("MSDM", "Reserved", msdm->reserved, &passed);
> - fwts_acpi_reserved_zero_check("MSDM", "Data Reserved", msdm->data_reserved, &passed);
> + fwts_acpi_reserved_zero("MSDM", "Reserved", msdm->reserved, &passed);
> + fwts_acpi_reserved_zero("MSDM", "Data Reserved", msdm->data_reserved, &passed);
>
> /* Now check table is big enough for the data payload */
> if (table->length < sizeof(fwts_acpi_table_msdm) + msdm->data_length) {
> @@ -72,7 +72,7 @@ static int msdm_test1(fwts_framework *fw)
> case 0x0001:
> /* Check license key size */
> if (msdm->data_length != 0x1d)
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_HIGH, "MSDM", "Data Length", msdm->data_length, 29, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_HIGH, "MSDM", "Data Length", msdm->data_length, 29, &passed);
> else {
> size_t i;
> bool invalid = false;
> diff --git a/src/acpi/nfit/nfit.c b/src/acpi/nfit/nfit.c
> index b1e70567..71fb0bea 100644
> --- a/src/acpi/nfit/nfit.c
> +++ b/src/acpi/nfit/nfit.c
> @@ -126,7 +126,7 @@ static int nfit_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Reserved: ", nfit->reserved);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_zero_check("NFIT", "Reserved", nfit->reserved, &passed);
> + fwts_acpi_reserved_zero("NFIT", "Reserved", nfit->reserved, &passed);
>
> offset = sizeof(fwts_acpi_table_nfit);
> entry = (fwts_acpi_table_nfit_struct_header *)(nfit_table->data + offset);
> @@ -138,7 +138,7 @@ static int nfit_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Type: ", entry->type);
> fwts_log_info_simp_int(fw, " Length: ", entry->length);
>
> - if (fwts_acpi_structure_length_zero_check(fw, "NFIT", entry->length, offset)) {
> + if (fwts_acpi_structure_length_zero(fw, "NFIT", entry->length, offset)) {
> passed = false;
> break;
> }
> @@ -229,7 +229,7 @@ static int nfit_test1(fwts_framework *fw)
> }
> }
>
> - fwts_acpi_reserved_bits_check("NFIT", "Flags", nfit_struct->flags, 3, 15, &passed);
> + fwts_acpi_reserved_bits("NFIT", "Flags", nfit_struct->flags, 3, 15, &passed);
>
> if (nfit_struct->reserved != 0)
> reserved_passed = nfit_struct->reserved;
> @@ -268,7 +268,7 @@ static int nfit_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " NVDIMM State Flags: ", nfit_struct->flags);
> fwts_log_info_simp_int(fw, " Reserved: ", nfit_struct->reserved);
>
> - fwts_acpi_reserved_bits_check("NFIT", "NVDIMM State Flags", nfit_struct->flags, 7, 15, &passed);
> + fwts_acpi_reserved_bits("NFIT", "NVDIMM State Flags", nfit_struct->flags, 7, 15, &passed);
>
> if (nfit_struct->reserved != 0)
> reserved_passed = nfit_struct->reserved;
> @@ -380,7 +380,7 @@ static int nfit_test1(fwts_framework *fw)
> if (nfit_struct->reserved != 0)
> reserved_passed = nfit_struct->reserved;
>
> - fwts_acpi_reserved_bits_check("NFIT", "Valid", nfit_struct->valid_fields, 1, 7, &passed);
> + fwts_acpi_reserved_bits("NFIT", "Valid", nfit_struct->valid_fields, 1, 7, &passed);
>
> if (entry->length >= sizeof(*nfit_struct)) {
> uint64_t reserved1;
> @@ -403,7 +403,7 @@ static int nfit_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " NVDIMM Control Region Flag: ", nfit_struct->flags);
> fwts_log_info_simp_int(fw, " Reserved: ", reserved1);
>
> - fwts_acpi_reserved_bits_check("NFIT", "NVDIMM Control Region Flags", nfit_struct->flags, 1, 15, &passed);
> + fwts_acpi_reserved_bits("NFIT", "NVDIMM Control Region Flags", nfit_struct->flags, 1, 15, &passed);
> fwts_log_info_simp_int(fw, " NVDIMM Control Region Structure Index: ", nfit_struct->region_index);
> }
>
> @@ -488,8 +488,8 @@ static int nfit_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Capabilities: ", nfit_struct->cap);
> fwts_log_info_simp_int(fw, " Reserved2: ", nfit_struct->reserved2);
>
> - fwts_acpi_reserved_zero_check("NFIT", "Reserved1", reserved1, &passed);
> - fwts_acpi_reserved_bits_check("NFIT", "Capabilities", nfit_struct->cap, 3, 31, &passed);
> + fwts_acpi_reserved_zero("NFIT", "Reserved1", reserved1, &passed);
> + fwts_acpi_reserved_bits("NFIT", "Capabilities", nfit_struct->cap, 3, 31, &passed);
>
> if ((nfit_struct->cap & 0x1) && !(nfit_struct->cap & 0x2)) {
> passed = false;
> @@ -503,15 +503,15 @@ static int nfit_test1(fwts_framework *fw)
> reserved_passed = nfit_struct->reserved2;
>
> } else {
> - fwts_acpi_reserved_type_check(fw, "NFIT", entry->type, 0, FWTS_NFIT_TYPE_RESERVED - 1, &passed);
> + fwts_acpi_reserved_type(fw, "NFIT", entry->type, 0, FWTS_NFIT_TYPE_RESERVED - 1, &passed);
> break;
> }
>
> - fwts_acpi_reserved_zero_check("NFIT", "Reserved", reserved_passed, &passed);
> + fwts_acpi_reserved_zero("NFIT", "Reserved", reserved_passed, &passed);
> fwts_log_nl(fw);
>
> offset += entry->length;
> - if (fwts_acpi_structure_range_check(fw, "NFIT", nfit_table->length, offset)) {
> + if (fwts_acpi_structure_range(fw, "NFIT", nfit_table->length, offset)) {
> passed = false;
> break;
> }
> diff --git a/src/acpi/pcct/pcct.c b/src/acpi/pcct/pcct.c
> index c5c09a7a..9cbbc54b 100644
> --- a/src/acpi/pcct/pcct.c
> +++ b/src/acpi/pcct/pcct.c
> @@ -50,10 +50,10 @@ static void gas_messages(fwts_framework *fw, uint8_t type, fwts_acpi_gas *gas, b
> fwts_log_info_simp_int(fw, " Address ", gas->address);
>
> snprintf(label, sizeof(label), "Subspace Type % " PRId8, type);
> - fwts_acpi_space_id_check(fw, "PCCT", label, passed, gas->address_space_id, 3,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO,
> - FWTS_GAS_ADDR_SPACE_ID_FFH);
> + fwts_acpi_space_id(fw, "PCCT", label, passed, gas->address_space_id, 3,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO,
> + FWTS_GAS_ADDR_SPACE_ID_FFH);
> }
>
> static void gas_messages2(fwts_framework *fw, uint8_t type, fwts_acpi_gas *gas, bool *passed)
> @@ -67,8 +67,8 @@ static void gas_messages2(fwts_framework *fw, uint8_t type, fwts_acpi_gas *gas,
> fwts_log_info_simp_int(fw, " Address ", gas->address);
>
> snprintf(label, sizeof(label), "Subspace Type % " PRId8, type);
> - fwts_acpi_space_id_check(fw, "PCCT", label, passed, gas->address_space_id, 2,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY, FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
> + fwts_acpi_space_id(fw, "PCCT", label, passed, gas->address_space_id, 2,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY, FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
> }
>
> static void memory_length(fwts_framework *fw, uint8_t type, uint64_t memory_range, uint64_t min_length, bool *passed)
> @@ -132,7 +132,7 @@ static void hw_reduced_comm_test_type1(fwts_framework *fw, fwts_acpi_table_pcct_
> fwts_log_info_simp_int(fw, " Max Periodic Access Rate: ", entry->max_periodic_access_rate);
> fwts_log_info_simp_int(fw, " Min Request Turnaround Time: ", entry->min_request_turnaround_time);
>
> - fwts_acpi_reserved_bits_check("PCCT", "Platform Interrupt Flags", entry->platform_interrupt_flags, 2, 7, passed);
> + fwts_acpi_reserved_bits("PCCT", "Platform Interrupt Flags", entry->platform_interrupt_flags, 2, 7, passed);
> }
>
> static void hw_reduced_comm_test_type2(fwts_framework *fw, fwts_acpi_table_pcct_subspace_type_2 *entry, bool *passed)
> @@ -154,7 +154,7 @@ static void hw_reduced_comm_test_type2(fwts_framework *fw, fwts_acpi_table_pcct_
> fwts_log_info_simp_int(fw, " Platform Ack Preserve: ", entry->platform_ack_preserve);
> fwts_log_info_simp_int(fw, " Platform Ack Write: ", entry->platform_ack_write);
>
> - fwts_acpi_reserved_bits_check("PCCT", "Platform Interrupt Flags", entry->platform_interrupt_flags, 2, 7, passed);
> + fwts_acpi_reserved_bits("PCCT", "Platform Interrupt Flags", entry->platform_interrupt_flags, 2, 7, passed);
> }
>
> static void extended_pcc_test(fwts_framework *fw, fwts_acpi_table_pcct_subspace_type_3_4 *entry, bool *passed)
> @@ -187,7 +187,7 @@ static void extended_pcc_test(fwts_framework *fw, fwts_acpi_table_pcct_subspace_
> gas_messages(fw, entry->header.type, &entry->error_status_register, passed);
> fwts_log_info_simp_int(fw, " Error Status Mask: ", entry->error_status_mask);
>
> - fwts_acpi_reserved_bits_check("PCCT", "Platform Interrupt Flags", entry->platform_interrupt_flags, 2, 7, passed);
> + fwts_acpi_reserved_bits("PCCT", "Platform Interrupt Flags", entry->platform_interrupt_flags, 2, 7, passed);
> }
>
> static void hw_registers_based_comm_test(fwts_framework *fw, fwts_acpi_table_pcct_subspace_type_5 *entry, bool *passed)
> @@ -221,8 +221,8 @@ static int pcct_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Reserved: ", pcct->reserved);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_bits_check("PCCT", "Flags", pcct->flags, 1, 31, &passed);
> - fwts_acpi_reserved_zero_check("PCCT", "Reserved", pcct->reserved, &passed);
> + fwts_acpi_reserved_bits("PCCT", "Flags", pcct->flags, 1, 31, &passed);
> + fwts_acpi_reserved_zero("PCCT", "Reserved", pcct->reserved, &passed);
>
> offset = sizeof(fwts_acpi_table_pcct);
> pcct_sub = (fwts_acpi_table_pcct_subspace_header *) (table->data + offset);
> diff --git a/src/acpi/pdtt/pdtt.c b/src/acpi/pdtt/pdtt.c
> index dd2b31b0..93baacbf 100644
> --- a/src/acpi/pdtt/pdtt.c
> +++ b/src/acpi/pdtt/pdtt.c
> @@ -42,7 +42,7 @@ static int pdtt_test1(fwts_framework *fw)
> fwts_log_info_verbatim(fw, " Reserved[3]: 0x%6.6" PRIx32, reserved);
> fwts_log_info_simp_int(fw, " Trigger ID Array Offset: ", pdtt->array_offset);
>
> - fwts_acpi_reserved_zero_check("PDTT", "Reserved", reserved, &passed);
> + fwts_acpi_reserved_zero("PDTT", "Reserved", reserved, &passed);
>
> offset = pdtt->array_offset;
> entry = (fwts_acpi_table_pdtt_channel *) (table->data + offset);
> @@ -62,7 +62,7 @@ static int pdtt_test1(fwts_framework *fw)
> for (i = 0; i < pdtt->trigger_count; i++) {
> fwts_log_info_simp_int(fw, " Sub channel ID: ", entry->sub_channel_id);
> fwts_log_info_simp_int(fw, " Flags: ", entry->flags);
> - fwts_acpi_reserved_bits_check("PDTT", "Flags", entry->flags, 3, 7, &passed);
> + fwts_acpi_reserved_bits("PDTT", "Flags", entry->flags, 3, 7, &passed);
>
> if ((offset += sizeof(fwts_acpi_table_pdtt_channel)) > table->length) {
> passed = false;
> diff --git a/src/acpi/phat/phat.c b/src/acpi/phat/phat.c
> index d75c6164..e8ab09c7 100644
> --- a/src/acpi/phat/phat.c
> +++ b/src/acpi/phat/phat.c
> @@ -50,7 +50,7 @@ static void phat_version_test(fwts_framework *fw, fwts_acpi_table_phat_version *
>
> /* stop if element is outside the table */
> offset += sizeof(fwts_acpi_table_phat_version_elem);
> - if (fwts_acpi_structure_range_check(fw, "PHAT", table->length, offset)) {
> + if (fwts_acpi_structure_range(fw, "PHAT", table->length, offset)) {
> *passed = false;
> break;
> }
> @@ -66,7 +66,7 @@ static void phat_version_test(fwts_framework *fw, fwts_acpi_table_phat_version *
>
> }
>
> - fwts_acpi_reserved_zero_check("PHAT", "Reserved", reserved, passed);
> + fwts_acpi_reserved_zero("PHAT", "Reserved", reserved, passed);
> }
>
> static void phat_health_test(fwts_framework *fw, fwts_acpi_table_phat_health *entry, uint32_t offset, bool *passed)
> @@ -95,7 +95,7 @@ static void phat_health_test(fwts_framework *fw, fwts_acpi_table_phat_health *en
>
> /* stop if data is outside the table */
> offset += sizeof(uint8_t);
> - if (fwts_acpi_structure_range_check(fw, "PHAT", table->length, offset)) {
> + if (fwts_acpi_structure_range(fw, "PHAT", table->length, offset)) {
> *passed = false;
> break;
> }
> @@ -104,7 +104,7 @@ static void phat_health_test(fwts_framework *fw, fwts_acpi_table_phat_health *en
> }
> }
>
> - fwts_acpi_reserved_zero_check("PHAT", "Reserved", entry->reserved, passed);
> + fwts_acpi_reserved_zero("PHAT", "Reserved", entry->reserved, passed);
>
> if (entry->data_offset > entry->header.length) {
> fwts_failed(fw, LOG_LEVEL_CRITICAL,
> @@ -125,7 +125,7 @@ static int phat_test1(fwts_framework *fw)
> entry = (fwts_acpi_table_phat_header *) (table->data + sizeof(fwts_acpi_table_phat));
> offset = sizeof(fwts_acpi_table_phat);
> while (offset < table->length) {
> - if (fwts_acpi_structure_length_zero_check(fw, "PHAT", entry->length, offset)) {
> + if (fwts_acpi_structure_length_zero(fw, "PHAT", entry->length, offset)) {
> passed = false;
> break;
> }
> @@ -135,13 +135,13 @@ static int phat_test1(fwts_framework *fw)
> } 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_PHAT_RESERVED - 1, &passed);
> + fwts_acpi_reserved_type(fw, "PHAT", entry->type, 0, FWTS_PHAT_RESERVED - 1, &passed);
> break;
> }
>
> /* stop if sub structure is outside the table */
> offset += entry->length;
> - if (fwts_acpi_structure_range_check(fw, "PHAT", table->length, offset)) {
> + if (fwts_acpi_structure_range(fw, "PHAT", table->length, offset)) {
> passed = false;
> break;
> }
> diff --git a/src/acpi/pmtt/pmtt.c b/src/acpi/pmtt/pmtt.c
> index d6145e38..86e46c6d 100644
> --- a/src/acpi/pmtt/pmtt.c
> +++ b/src/acpi/pmtt/pmtt.c
> @@ -40,8 +40,8 @@ static void pmtt_subtable_header_test(
> fwts_log_info_simp_int(fw, " Flags: ", entry->flags);
> fwts_log_info_simp_int(fw, " Reserved: ", entry->reserved2);
>
> - fwts_acpi_reserved_zero_check("PMTT", "Reserved1", entry->reserved1, passed);
> - fwts_acpi_reserved_bits_check("PMTT", "Flags", entry->flags, 4, 15, passed);
> + fwts_acpi_reserved_zero("PMTT", "Reserved1", entry->reserved1, passed);
> + fwts_acpi_reserved_bits("PMTT", "Flags", entry->flags, 4, 15, passed);
>
> if ((entry->flags & 0x0C) == 0x0C) {
> *passed = false;
> @@ -50,7 +50,7 @@ static void pmtt_subtable_header_test(
> "PMTT Flags's Bits[3..2] must not be 11b");
> }
>
> - fwts_acpi_reserved_zero_check("PMTT", "Reserved2", entry->reserved2, passed);
> + fwts_acpi_reserved_zero("PMTT", "Reserved2", entry->reserved2, passed);
> }
>
> static void pmtt_physical_component_test(
> @@ -83,18 +83,18 @@ static void pmtt_controller_test(
> fwts_log_info_simp_int(fw, " Memory Controller ID ", entry->memory_controller_id);
> fwts_log_info_simp_int(fw, " Reserved: ", entry->reserved);
>
> - fwts_acpi_reserved_zero_check("PMTT", "Reserved", entry->reserved, passed);
> + fwts_acpi_reserved_zero("PMTT", "Reserved", entry->reserved, passed);
>
> offset = sizeof(fwts_acpi_table_pmtt_controller);
> header = (fwts_acpi_table_pmtt_header *) (((char *) entry) + offset);
> while (offset < entry->header.length) {
> /* stop if sub-structure is outside the table */
> - if (fwts_acpi_structure_range_check(fw, "PMTT", table->length, entry_offset + offset)) {
> + if (fwts_acpi_structure_range(fw, "PMTT", table->length, entry_offset + offset)) {
> *passed = false;
> break;
> }
>
> - if (fwts_acpi_structure_length_zero_check(fw, "PMTT", header->length, offset)) {
> + if (fwts_acpi_structure_length_zero(fw, "PMTT", header->length, offset)) {
> *passed = false;
> break;
> }
> @@ -119,18 +119,18 @@ static void pmtt_socket_test(
> fwts_log_info_simp_int(fw, " Socket Identifier: ", entry->socket_id);
> fwts_log_info_simp_int(fw, " Reserved: ", entry->reserved);
>
> - fwts_acpi_reserved_zero_check("PMTT", "Reserved", entry->reserved, passed);
> + fwts_acpi_reserved_zero("PMTT", "Reserved", entry->reserved, passed);
>
> offset = sizeof(fwts_acpi_table_pmtt_socket);
> header = (fwts_acpi_table_pmtt_header *) (((char *) entry) + offset);
> while (offset < entry->header.length) {
> /* stop if sub-structure is outside the table */
> - if (fwts_acpi_structure_range_check(fw, "PMTT", table->length, entry_offset + offset)) {
> + if (fwts_acpi_structure_range(fw, "PMTT", table->length, entry_offset + offset)) {
> *passed = false;
> break;
> }
>
> - if (fwts_acpi_structure_length_zero_check(fw, "PMTT", header->length, offset)) {
> + if (fwts_acpi_structure_length_zero(fw, "PMTT", header->length, offset)) {
> *passed = false;
> break;
> }
> @@ -191,7 +191,7 @@ static int pmtt_test1(fwts_framework *fw)
> offset = sizeof(fwts_acpi_table_pmtt);
> while (offset < table->length) {
>
> - if (fwts_acpi_structure_length_zero_check(fw, "PHAT", entry->length, offset)) {
> + if (fwts_acpi_structure_length_zero(fw, "PHAT", entry->length, offset)) {
> passed = false;
> break;
> }
> @@ -199,7 +199,7 @@ static int pmtt_test1(fwts_framework *fw)
> pmtt_memory_device(fw, entry, offset, &passed);
>
> offset += entry->length;
> - if (fwts_acpi_structure_range_check(fw, "PMTT", table->length, offset)) {
> + if (fwts_acpi_structure_range(fw, "PMTT", table->length, offset)) {
> passed = false;
> break;
> }
> diff --git a/src/acpi/pptt/pptt.c b/src/acpi/pptt/pptt.c
> index d73dca5e..bc11fcb0 100644
> --- a/src/acpi/pptt/pptt.c
> +++ b/src/acpi/pptt/pptt.c
> @@ -51,12 +51,12 @@ static void pptt_processor_test(fwts_framework *fw, const fwts_acpi_table_pptt_p
> entry->number_priv_resources);
> }
>
> - fwts_acpi_reserved_zero_check("PPTT", "Reserved", entry->reserved, passed);
> + fwts_acpi_reserved_zero("PPTT", "Reserved", entry->reserved, passed);
>
> if (rev == 1)
> - fwts_acpi_reserved_bits_check("PPTT", "Flags", entry->flags, 2, 31, passed);
> + fwts_acpi_reserved_bits("PPTT", "Flags", entry->flags, 2, 31, passed);
> else
> - fwts_acpi_reserved_bits_check("PPTT", "Flags", entry->flags, 5, 31, passed);
> + fwts_acpi_reserved_bits("PPTT", "Flags", entry->flags, 5, 31, passed);
>
> }
>
> @@ -77,14 +77,14 @@ static void pptt_cache_test(fwts_framework *fw, const fwts_acpi_table_pptt_cache
> if (rev >= 3)
> fwts_log_info_simp_int(fw, " Cache ID: ", entry->cache_id);
>
> - fwts_acpi_reserved_zero_check("PPTT", "Reserved", entry->reserved, passed);
> + fwts_acpi_reserved_zero("PPTT", "Reserved", entry->reserved, passed);
>
> if (rev == 1 || rev == 2)
> - fwts_acpi_reserved_bits_check("PPTT", "Flags", entry->flags, 7, 31, passed);
> + fwts_acpi_reserved_bits("PPTT", "Flags", entry->flags, 7, 31, passed);
> else
> - fwts_acpi_reserved_bits_check("PPTT", "Flags", entry->flags, 8, 31, passed);
> + fwts_acpi_reserved_bits("PPTT", "Flags", entry->flags, 8, 31, passed);
>
> - fwts_acpi_reserved_bits_check("PPTT", "Attributes", entry->attributes, 5, 7, passed);
> + fwts_acpi_reserved_bits("PPTT", "Attributes", entry->attributes, 5, 7, passed);
> }
>
> static void pptt_id_test(fwts_framework *fw, const fwts_acpi_table_pptt_id *entry, bool *passed)
> @@ -105,7 +105,7 @@ static void pptt_id_test(fwts_framework *fw, const fwts_acpi_table_pptt_id *entr
> fwts_log_info_simp_int(fw, " MINOR_REV: ", entry->minor_rev);
> fwts_log_info_simp_int(fw, " SPIN_REV: ", entry->spin_rev);
>
> - fwts_acpi_reserved_zero_check("PPTT", "Reserved", entry->reserved, passed);
> + fwts_acpi_reserved_zero("PPTT", "Reserved", entry->reserved, passed);
> }
>
> static int pptt_test1(fwts_framework *fw)
> @@ -123,7 +123,7 @@ static int pptt_test1(fwts_framework *fw)
> while (offset < table->length) {
> uint32_t type_length;
>
> - if (fwts_acpi_structure_length_zero_check(fw, "PPTT", entry->length, offset)) {
> + if (fwts_acpi_structure_length_zero(fw, "PPTT", entry->length, offset)) {
> passed = false;
> break;
> }
> @@ -142,17 +142,17 @@ static int pptt_test1(fwts_framework *fw)
> 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_PPTT_RESERVED - 1, &passed);
> + fwts_acpi_reserved_type(fw, "PPTT", entry->type, 0, FWTS_PPTT_RESERVED - 1, &passed);
> break;
> }
>
> - if (!fwts_acpi_structure_length_check(fw, "PPTT", entry->type, entry->length, type_length)) {
> + if (!fwts_acpi_structure_length(fw, "PPTT", entry->type, entry->length, type_length)) {
> passed = false;
> break;
> }
>
> offset += entry->length;
> - if (fwts_acpi_structure_range_check(fw, "PPTT", table->length, offset)) {
> + if (fwts_acpi_structure_range(fw, "PPTT", table->length, offset)) {
> passed = false;
> break;
> }
> diff --git a/src/acpi/rsdp/rsdp.c b/src/acpi/rsdp/rsdp.c
> index 2ccba240..ac53ece2 100644
> --- a/src/acpi/rsdp/rsdp.c
> +++ b/src/acpi/rsdp/rsdp.c
> @@ -207,7 +207,7 @@ static int rsdp_test1(fwts_framework *fw)
> value += *ptr++;
>
> passed = true;
> - fwts_acpi_reserved_zero_check("RSDP", "Reserved", value, &passed);
> + fwts_acpi_reserved_zero("RSDP", "Reserved", value, &passed);
> if (passed)
> fwts_passed(fw, "RSDP: the reserved field is zero.");
>
> diff --git a/src/acpi/sdev/sdev.c b/src/acpi/sdev/sdev.c
> index ac3b6be2..0542d858 100644
> --- a/src/acpi/sdev/sdev.c
> +++ b/src/acpi/sdev/sdev.c
> @@ -42,7 +42,7 @@ static void sdev_acpi_namespace_device_test(fwts_framework *fw, const fwts_acpi_
> fwts_log_info_simp_int(fw, " Secure Access Components Offset: ", entry->secure_access_offset);
> fwts_log_info_simp_int(fw, " Secure Access Components Length: ", entry->secure_access_length);
>
> - fwts_acpi_reserved_bits_check("SDEV", "Flags", entry->header.flags, 2, 15, passed);
> + fwts_acpi_reserved_bits("SDEV", "Flags", entry->header.flags, 2, 15, passed);
>
> /* TODO - check Secure Access Components - acpica (iasl) supports aren't complete */
> }
> @@ -60,7 +60,7 @@ static void sdev_pcie_endpoint_device_test(fwts_framework *fw, const fwts_acpi_t
> fwts_log_info_simp_int(fw, " Vendor Specific Data Offset: ", entry->vendor_offset);
> fwts_log_info_simp_int(fw, " Vendor Specific Data Length: ", entry->vendor_length);
>
> - fwts_acpi_reserved_bits_check("SDEV", "Flags", entry->header.flags, 1, 15, passed);
> + fwts_acpi_reserved_bits("SDEV", "Flags", entry->header.flags, 1, 15, passed);
> }
>
> static int sdev_test1(fwts_framework *fw)
> @@ -76,7 +76,7 @@ static int sdev_test1(fwts_framework *fw)
> while (offset < table->length) {
> uint32_t type_length;
>
> - if (fwts_acpi_structure_length_zero_check(fw, "SDEV", entry->length, offset)) {
> + if (fwts_acpi_structure_length_zero(fw, "SDEV", entry->length, offset)) {
> passed = false;
> break;
> }
> @@ -92,17 +92,17 @@ static int sdev_test1(fwts_framework *fw)
> 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_SDEV_TYPE_RESERVED, &passed);
> + fwts_acpi_reserved_type(fw, "SDEV", entry->type, 0, FWTS_SDEV_TYPE_RESERVED, &passed);
> break;
> }
>
> - if (!fwts_acpi_structure_length_check(fw, "SDEV", entry->type, entry->length, type_length)) {
> + if (!fwts_acpi_structure_length(fw, "SDEV", entry->type, entry->length, type_length)) {
> passed = false;
> break;
> }
>
> offset += entry->length;
> - if (fwts_acpi_structure_range_check(fw, "SDEV", table->length, offset)) {
> + if (fwts_acpi_structure_range(fw, "SDEV", table->length, offset)) {
> passed = false;
> break;
> }
> diff --git a/src/acpi/slic/slic.c b/src/acpi/slic/slic.c
> index abbf984a..f244b775 100644
> --- a/src/acpi/slic/slic.c
> +++ b/src/acpi/slic/slic.c
> @@ -45,7 +45,7 @@ static int slic_test1(fwts_framework *fw)
> size_t length = slic_min_hdr_size;
>
> /* Size sanity check #1, got enough table to get initial header */
> - if (!fwts_acpi_table_length_check(fw, "SLIC", table->length, slic_min_hdr_size)) {
> + if (!fwts_acpi_table_length(fw, "SLIC", table->length, slic_min_hdr_size)) {
> passed = false;
> goto done;
> }
> diff --git a/src/acpi/slit/slit.c b/src/acpi/slit/slit.c
> index 011c718c..8cdebb3f 100644
> --- a/src/acpi/slit/slit.c
> +++ b/src/acpi/slit/slit.c
> @@ -43,7 +43,7 @@ static int slit_test1(fwts_framework *fw)
> fwts_acpi_table_slit *slit = (fwts_acpi_table_slit *)table->data;
>
> /* Size sanity check #1, got enough table to at least get matrix size */
> - if (!fwts_acpi_table_length_check(fw, "SLIT", table->length, sizeof(fwts_acpi_table_slit))) {
> + if (!fwts_acpi_table_length(fw, "SLIT", table->length, sizeof(fwts_acpi_table_slit))) {
> passed = false;
> goto done;
> }
> diff --git a/src/acpi/spcr/spcr.c b/src/acpi/spcr/spcr.c
> index 2dbb9533..84cda3b0 100644
> --- a/src/acpi/spcr/spcr.c
> +++ b/src/acpi/spcr/spcr.c
> @@ -143,7 +143,7 @@ static int spcr_test1(fwts_framework *fw)
> }
>
> reserved1 = spcr->reserved1[0] + (spcr->reserved1[1] << 8) + (spcr->reserved1[2] << 16);
> - fwts_acpi_reserved_zero_check("SPCR", "Reserved1", reserved1, &passed);
> + fwts_acpi_reserved_zero("SPCR", "Reserved1", reserved1, &passed);
>
> if (spcr->interrupt_type == 0) {
> passed = false;
> @@ -202,9 +202,9 @@ static int spcr_test1(fwts_framework *fw)
> " is a reserved baud rate", spcr->baud_rate);
> }
>
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_HIGH, "SPCR", "Parity", spcr->parity, 0, &passed);
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_HIGH, "SPCR", "Stop", spcr->stop_bits, 1, &passed);
> - fwts_acpi_reserved_bits_check("SPCR", "Flow control", spcr->flow_control, 3, 7, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_HIGH, "SPCR", "Parity", spcr->parity, 0, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_HIGH, "SPCR", "Stop", spcr->stop_bits, 1, &passed);
> + fwts_acpi_reserved_bits("SPCR", "Flow control", spcr->flow_control, 3, 7, &passed);
>
> reserved = false;
> switch (spcr->terminal_type) {
> @@ -233,7 +233,7 @@ static int spcr_test1(fwts_framework *fw)
> " is a reserved terminal type", spcr->terminal_type);
> }
>
> - fwts_acpi_reserved_zero_check("SPCR", "Reserved2", spcr->reserved2, &passed);
> + fwts_acpi_reserved_zero("SPCR", "Reserved2", spcr->reserved2, &passed);
>
> /* According to the spec, these values indicate NOT a PCI device */
> if ((spcr->pci_device_id == 0xffff) &&
> @@ -271,8 +271,8 @@ static int spcr_test1(fwts_framework *fw)
> }
> }
>
> - fwts_acpi_reserved_bits_check("SPCR", "PCI Flags", spcr->pci_flags, 1, 31, &passed);
> - fwts_acpi_reserved_zero_check("SPCR", "Reserved3", spcr->reserved3, &passed);
> + fwts_acpi_reserved_bits("SPCR", "PCI Flags", spcr->pci_flags, 1, 31, &passed);
> + fwts_acpi_reserved_zero("SPCR", "Reserved3", spcr->reserved3, &passed);
>
> if (passed)
> fwts_passed(fw, "No issues found in SPCR table.");
> diff --git a/src/acpi/spmi/spmi.c b/src/acpi/spmi/spmi.c
> index 8215cf2f..3ab3d7fe 100644
> --- a/src/acpi/spmi/spmi.c
> +++ b/src/acpi/spmi/spmi.c
> @@ -41,7 +41,7 @@ static int spmi_test1(fwts_framework *fw)
> bool passed = true;
> fwts_acpi_table_spmi *spmi = (fwts_acpi_table_spmi *)table->data;
>
> - if (!fwts_acpi_table_length_check(fw, "SPMI", table->length, sizeof(fwts_acpi_table_spmi))) {
> + if (!fwts_acpi_table_length(fw, "SPMI", table->length, sizeof(fwts_acpi_table_spmi))) {
> passed = false;
> goto done;
> }
> @@ -96,8 +96,8 @@ static int spmi_test1(fwts_framework *fw)
> spmi->interface_type);
> }
>
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_MEDIUM, "SPMI", "Reserved1", spmi->reserved1, 1, &passed);
> - fwts_acpi_reserved_bits_check("SPMI", "Interrupt type", spmi->interrupt_type, 2, 7, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_MEDIUM, "SPMI", "Reserved1", spmi->reserved1, 1, &passed);
> + fwts_acpi_reserved_bits("SPMI", "Interrupt type", spmi->interrupt_type, 2, 7, &passed);
>
> /* Check for zero GPE on specific condition of interrupt type */
> if (((spmi->interrupt_type & 1) == 0) &&
> @@ -110,8 +110,8 @@ static int spmi_test1(fwts_framework *fw)
> spmi->gpe);
> }
>
> - fwts_acpi_reserved_zero_check("SPMI", "Reserved2", spmi->reserved2, &passed);
> - fwts_acpi_reserved_bits_check("SPMI", "PCI device flag", spmi->pci_device_flag, 1, 7, &passed);
> + fwts_acpi_reserved_zero("SPMI", "Reserved2", spmi->reserved2, &passed);
> + fwts_acpi_reserved_bits("SPMI", "PCI device flag", spmi->pci_device_flag, 1, 7, &passed);
>
> if (((spmi->interrupt_type & 2) == 0) &&
> (spmi->global_system_interrupt != 0)) {
> @@ -125,10 +125,10 @@ static int spmi_test1(fwts_framework *fw)
> }
>
> /* Base address must be one of 3 types, System Memory, System I/O or SMBUS */
> - fwts_acpi_space_id_check(fw, "SPMI", "Base Address", &passed, spmi->base_address.address_space_id, 3,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO,
> - FWTS_GAS_ADDR_SPACE_ID_SMBUS);
> + fwts_acpi_space_id(fw, "SPMI", "Base Address", &passed, spmi->base_address.address_space_id, 3,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO,
> + FWTS_GAS_ADDR_SPACE_ID_SMBUS);
>
> /*
> * For SSIF: The Address_Space_ID is SMBUS and the address field of the GAS
> diff --git a/src/acpi/srat/srat.c b/src/acpi/srat/srat.c
> index a8556d2f..eaad90ca 100644
> --- a/src/acpi/srat/srat.c
> +++ b/src/acpi/srat/srat.c
> @@ -48,7 +48,7 @@ static void srat_check_local_apic_sapic_affinity(
> goto done;
> }
>
> - if (!fwts_acpi_structure_length_check(fw, "SRAT", affinity->type,
> + if (!fwts_acpi_structure_length(fw, "SRAT", affinity->type,
> affinity->length, sizeof(fwts_acpi_table_local_apic_sapic_affinity))) {
> *passed = false;
> goto done;
> @@ -67,7 +67,7 @@ static void srat_check_local_apic_sapic_affinity(
> fwts_log_info_simp_int(fw, " Clock Domain ", affinity->clock_domain);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_bits_check("SRAT", "Local APIC/SPAIC Affinity Flags", affinity->flags, 1, 31, passed);
> + fwts_acpi_reserved_bits("SRAT", "Local APIC/SPAIC Affinity Flags", affinity->flags, 1, 31, passed);
>
> /*
> * Not clear of bits 0..7 of Proximity Domain are reserved or not
> @@ -102,7 +102,7 @@ static void srat_check_memory_affinity(
> goto done;
> }
>
> - if (!fwts_acpi_structure_length_check(fw, "SRAT", affinity->type,
> + if (!fwts_acpi_structure_length(fw, "SRAT", affinity->type,
> affinity->length, sizeof(fwts_acpi_table_memory_affinity))) {
> *passed = false;
> goto done;
> @@ -122,7 +122,7 @@ static void srat_check_memory_affinity(
> fwts_log_info_simp_int(fw, " Reserved: ", affinity->reserved3);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_bits_check("SRAT", "Memory Affinity Flags", affinity->flags, 3, 31, passed);
> + fwts_acpi_reserved_bits("SRAT", "Memory Affinity Flags", affinity->flags, 3, 31, passed);
>
> done:
> *length -= sizeof(fwts_acpi_table_memory_affinity);
> @@ -148,7 +148,7 @@ static void srat_check_local_x2apic_affinity(
> goto done;
> }
>
> - if (!fwts_acpi_structure_length_check(fw, "SRAT", affinity->type,
> + if (!fwts_acpi_structure_length(fw, "SRAT", affinity->type,
> affinity->length, sizeof(fwts_acpi_table_local_x2apic_affinity))) {
> *passed = false;
> goto done;
> @@ -175,7 +175,7 @@ static void srat_check_local_x2apic_affinity(
> *passed = false;
> }
>
> - fwts_acpi_reserved_bits_check("SRAT", "Local x2APIC Affinity Flags", affinity->flags, 1, 31, passed);
> + fwts_acpi_reserved_bits("SRAT", "Local x2APIC Affinity Flags", affinity->flags, 1, 31, passed);
>
> /*
> * Clock domain probably needs deeper sanity checking, for now
> @@ -206,7 +206,7 @@ static void srat_check_gicc_affinity(
> goto done;
> }
>
> - if (!fwts_acpi_structure_length_check(fw, "SRAT", affinity->type,
> + if (!fwts_acpi_structure_length(fw, "SRAT", affinity->type,
> affinity->length, sizeof(fwts_acpi_table_gicc_affinity))) {
> *passed = false;
> goto done;
> @@ -221,7 +221,7 @@ static void srat_check_gicc_affinity(
> fwts_log_info_simp_int(fw, " Clock Domain ", affinity->clock_domain);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_bits_check("SRAT", "GICC Affinity Flags", affinity->flags, 1, 31, passed);
> + fwts_acpi_reserved_bits("SRAT", "GICC Affinity Flags", affinity->flags, 1, 31, passed);
>
> /*
> * Clock domain probably needs deeper sanity checking, for now
> @@ -252,7 +252,7 @@ static void srat_check_its_affinity(
> goto done;
> }
>
> - if (!fwts_acpi_structure_length_check(fw, "SRAT", affinity->type,
> + if (!fwts_acpi_structure_length(fw, "SRAT", affinity->type,
> affinity->length, sizeof(fwts_acpi_table_its_affinity))) {
> *passed = false;
> goto done;
> @@ -266,7 +266,7 @@ static void srat_check_its_affinity(
> fwts_log_info_simp_int(fw, " ITS ID ", affinity->its_id);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_zero_check("SRAT", "ITS Affinity Reserved", affinity->reserved, passed);
> + fwts_acpi_reserved_zero("SRAT", "ITS Affinity Reserved", affinity->reserved, passed);
>
> done:
> *length -= sizeof(fwts_acpi_table_its_affinity);
> @@ -295,7 +295,7 @@ static void srat_check_initiator_affinity(
> goto done;
> }
>
> - if (!fwts_acpi_structure_length_check(fw, "SRAT", affinity->type,
> + if (!fwts_acpi_structure_length(fw, "SRAT", affinity->type,
> affinity->length, sizeof(fwts_acpi_table_initiator_affinity))) {
> *passed = false;
> goto done;
> @@ -319,8 +319,8 @@ static void srat_check_initiator_affinity(
> fwts_log_info_simp_int(fw, " Reserved: ", affinity->reserved2);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_zero_check("SRAT", "Initiator Affinity Reserved", affinity->reserved1, passed);
> - fwts_acpi_reserved_bits_check("SRAT", "Initiator Affinity Device Handle Type", affinity->device_handle_type, 1, 7, passed);
> + fwts_acpi_reserved_zero("SRAT", "Initiator Affinity Reserved", affinity->reserved1, passed);
> + fwts_acpi_reserved_bits("SRAT", "Initiator Affinity Device Handle Type", affinity->device_handle_type, 1, 7, passed);
> if (affinity->device_handle_type == 0)
> h_reserved = affinity->device_handle[12];
> else if (affinity->device_handle_type == 1) {
> @@ -328,9 +328,9 @@ static void srat_check_initiator_affinity(
> for (i = 4; i < 16; i++)
> h_reserved += affinity->device_handle[i];
> }
> - fwts_acpi_reserved_zero_check("SRAT", "Initiator Affinity Device Handle Reserve", h_reserved, passed);
> - fwts_acpi_reserved_bits_check("SRAT", "Initiator Affinity Flags", affinity->flags, 2, 31, passed);
> - fwts_acpi_reserved_zero_check("SRAT", "Initiator Affinity Reserved", affinity->reserved2, passed);
> + fwts_acpi_reserved_zero("SRAT", "Initiator Affinity Device Handle Reserve", h_reserved, passed);
> + fwts_acpi_reserved_bits("SRAT", "Initiator Affinity Flags", affinity->flags, 2, 31, passed);
> + fwts_acpi_reserved_zero("SRAT", "Initiator Affinity Reserved", affinity->reserved2, passed);
>
> done:
> *length -= sizeof(fwts_acpi_table_initiator_affinity);
> @@ -347,7 +347,7 @@ static int srat_test1(fwts_framework *fw)
> bool passed = true;
> ssize_t length = (ssize_t)srat->header.length;
>
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_MEDIUM, "SRAT", "Revision1", srat->reserved1, 1, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_MEDIUM, "SRAT", "Revision1", srat->reserved1, 1, &passed);
>
> data += sizeof(fwts_acpi_table_srat);
> length -= sizeof(fwts_acpi_table_srat);
> diff --git a/src/acpi/tcpa/tcpa.c b/src/acpi/tcpa/tcpa.c
> index ff03a763..2abafba1 100644
> --- a/src/acpi/tcpa/tcpa.c
> +++ b/src/acpi/tcpa/tcpa.c
> @@ -30,7 +30,7 @@ static int tcpa_client_test(fwts_framework *fw, fwts_acpi_table_tcpa *tcpa)
> {
> bool passed = true;
>
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_HIGH, "TCPA", "Length", tcpa->header.length, 50, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_HIGH, "TCPA", "Length", tcpa->header.length, 50, &passed);
> fwts_acpi_revision_check("TCPA", tcpa->header.revision, 2, &passed);
>
> fwts_log_info_verbatim(fw, "TCPA Table:");
> @@ -46,7 +46,7 @@ static int tcpa_server_test(fwts_framework *fw, fwts_acpi_table_tcpa *tcpa)
> bool passed = true;
> uint32_t reserved2;
>
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_HIGH, "TCPA", "Length", tcpa->header.length, 100, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_HIGH, "TCPA", "Length", tcpa->header.length, 100, &passed);
> fwts_acpi_revision_check("TCPA", tcpa->header.revision, 2, &passed);
>
> reserved2 = tcpa->server.reserved2[0] + (tcpa->server.reserved2[1] << 4) + (tcpa->server.reserved2[2] << 8);
> @@ -80,9 +80,9 @@ static int tcpa_server_test(fwts_framework *fw, fwts_acpi_table_tcpa *tcpa)
> fwts_log_info_simp_int(fw, " PCI Device: ", tcpa->server.pci_dev_number);
> fwts_log_info_simp_int(fw, " PCI Function: ", tcpa->server.pci_func_number);
>
> - fwts_acpi_reserved_zero_check("TCPA", "Reserved", tcpa->server.reserved, &passed);
> - fwts_acpi_reserved_zero_check("TCPA", "Reserved2", reserved2, &passed);
> - fwts_acpi_reserved_zero_check("TCPA", "Reserved3", tcpa->server.reserved3, &passed);
> + fwts_acpi_reserved_zero("TCPA", "Reserved", tcpa->server.reserved, &passed);
> + fwts_acpi_reserved_zero("TCPA", "Reserved2", reserved2, &passed);
> + fwts_acpi_reserved_zero("TCPA", "Reserved3", tcpa->server.reserved3, &passed);
>
> if (tcpa->server.device_flag & 1) {
> if (!(tcpa->server.interrupt_flag & 2)) {
> @@ -100,15 +100,15 @@ static int tcpa_server_test(fwts_framework *fw, fwts_acpi_table_tcpa *tcpa)
> }
> }
>
> - fwts_acpi_space_id_check(fw, "TCPA", "Base Address", &passed,
> - tcpa->server.base_addr.address_space_id, 2,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
> + fwts_acpi_space_id(fw, "TCPA", "Base Address", &passed,
> + tcpa->server.base_addr.address_space_id, 2,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
>
> - fwts_acpi_space_id_check(fw, "TCPA", "Configuration Address", &passed,
> - tcpa->server.config_addr.address_space_id, 2,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY,
> - FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
> + fwts_acpi_space_id(fw, "TCPA", "Configuration Address", &passed,
> + tcpa->server.config_addr.address_space_id, 2,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_MEMORY,
> + FWTS_GAS_ADDR_SPACE_ID_SYSTEM_IO);
>
> return passed;
> }
> diff --git a/src/acpi/tpm2/tpm2.c b/src/acpi/tpm2/tpm2.c
> index 0f54b9b2..ae4da486 100644
> --- a/src/acpi/tpm2/tpm2.c
> +++ b/src/acpi/tpm2/tpm2.c
> @@ -49,7 +49,7 @@ static int tpm2_test1(fwts_framework *fw)
> tpm2->platform_class);
> }
>
> - fwts_acpi_reserved_zero_check("TPM2", "Reserved", tpm2->reserved, &passed);
> + fwts_acpi_reserved_zero("TPM2", "Reserved", tpm2->reserved, &passed);
>
> if (tpm2->start_method < 1 || tpm2->start_method >= 12) {
> passed = false;
> diff --git a/src/acpi/uefi/uefi.c b/src/acpi/uefi/uefi.c
> index ce54aefe..93a12b6e 100644
> --- a/src/acpi/uefi/uefi.c
> +++ b/src/acpi/uefi/uefi.c
> @@ -49,7 +49,7 @@ static int uefi_test1(fwts_framework *fw)
> 0x9d, 0x94, 0xdb, 0x65, 0xac, 0xc5, 0xc3, 0x32 };
>
> /* Enough length for the uefi table? */
> - if (!fwts_acpi_table_length_check(fw, "UEFI", table->length, sizeof(fwts_acpi_table_uefi))) {
> + if (!fwts_acpi_table_length(fw, "UEFI", table->length, sizeof(fwts_acpi_table_uefi))) {
> passed = false;
> goto done;
> }
> diff --git a/src/acpi/waet/waet.c b/src/acpi/waet/waet.c
> index b324d9fd..6d283c12 100644
> --- a/src/acpi/waet/waet.c
> +++ b/src/acpi/waet/waet.c
> @@ -42,7 +42,7 @@ static int waet_test1(fwts_framework *fw)
> fwts_acpi_table_waet *waet = (fwts_acpi_table_waet *)table->data;
>
> /* Enough length for the initial waet header? */
> - if (!fwts_acpi_table_length_check(fw, "WAET", table->length, sizeof(fwts_acpi_table_waet))) {
> + if (!fwts_acpi_table_length(fw, "WAET", table->length, sizeof(fwts_acpi_table_waet))) {
> passed = false;
> goto done;
> }
> @@ -53,7 +53,7 @@ static int waet_test1(fwts_framework *fw)
> fwts_log_info_verbatim(fw, " Bit [1] PM Timer Good: %1" PRIu32, (waet->flags >> 1) & 1);
> fwts_log_nl(fw);
>
> - fwts_acpi_reserved_bits_check("WAET", "Emulated Device Flags", waet->flags, 2, 31, &passed);
> + fwts_acpi_reserved_bits("WAET", "Emulated Device Flags", waet->flags, 2, 31, &passed);
>
> done:
> if (passed)
> diff --git a/src/acpi/wdat/wdat.c b/src/acpi/wdat/wdat.c
> index 01ea5be6..c5f806e0 100644
> --- a/src/acpi/wdat/wdat.c
> +++ b/src/acpi/wdat/wdat.c
> @@ -102,7 +102,7 @@ static int wdat_test1(fwts_framework *fw)
> * this does sanity check that somebody has not set these
> * bits accidentally. This is a LOW issue.
> */
> - fwts_acpi_reserved_bits_check("WDAT", "Watchdog Flags", wdat->watchdog_flags, 1, 6, &passed);
> + fwts_acpi_reserved_bits("WDAT", "Watchdog Flags", wdat->watchdog_flags, 1, 6, &passed);
>
> total_length = sizeof(fwts_acpi_table_wdat) +
> (wdat->number_of_entries * sizeof(fwts_acpi_table_wdat_instr_entries));
> diff --git a/src/acpi/wpbt/wpbt.c b/src/acpi/wpbt/wpbt.c
> index 55bf1c17..74c00a05 100644
> --- a/src/acpi/wpbt/wpbt.c
> +++ b/src/acpi/wpbt/wpbt.c
> @@ -44,10 +44,10 @@ static int wpbt_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Content Layout: ", wpbt->layout);
> fwts_log_info_simp_int(fw, " Content Type: ", wpbt->type);
>
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_HIGH, "WPBT", "Layout", wpbt->layout, 1, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_HIGH, "WPBT", "Layout", wpbt->layout, 1, &passed);
>
> if (wpbt->type != 1)
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_HIGH, "WPBT", "Type", wpbt->type, 1, &passed);
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_HIGH, "WPBT", "Type", wpbt->type, 1, &passed);
> else {
> fwts_acpi_table_wpbt_type1 *type = (fwts_acpi_table_wpbt_type1 *) (table->data + sizeof(fwts_acpi_table_wpbt));
> fwts_log_info_simp_int(fw, " Arguments Length: ", type->arguments_length);
> diff --git a/src/acpi/wsmt/wsmt.c b/src/acpi/wsmt/wsmt.c
> index 2b728e89..18bfbdd9 100644
> --- a/src/acpi/wsmt/wsmt.c
> +++ b/src/acpi/wsmt/wsmt.c
> @@ -41,7 +41,7 @@ static int wsmt_test1(fwts_framework *fw)
> fwts_log_info_verbatim(fw, "WSMT Windows SMM Security Mitigations Table:");
> fwts_log_info_simp_int(fw, " Protection Flags: ", wsmt->protection_flags);
>
> - fwts_acpi_reserved_bits_check("WSMT", "Protection Flags", wsmt->protection_flags, 3, 31, &passed);
> + fwts_acpi_reserved_bits("WSMT", "Protection Flags", wsmt->protection_flags, 3, 31, &passed);
>
> if ((wsmt->protection_flags & 0x2) && !(wsmt->protection_flags & 0x1)) {
> passed = false;
> diff --git a/src/acpi/xenv/xenv.c b/src/acpi/xenv/xenv.c
> index dcd3f760..0aac43d6 100644
> --- a/src/acpi/xenv/xenv.c
> +++ b/src/acpi/xenv/xenv.c
> @@ -51,7 +51,7 @@ static int xenv_test1(fwts_framework *fw)
> fwts_log_info_simp_int(fw, " Evtchn Intr: ", xenv->evtchn_intr);
> fwts_log_info_simp_int(fw, " Evtchn Intr Flags: ", xenv->evtchn_intr_flags);
>
> - fwts_acpi_reserved_bits_check("XENV", "Evtchn Intr Flags", xenv->evtchn_intr_flags, 2, 7, &passed);
> + fwts_acpi_reserved_bits("XENV", "Evtchn Intr Flags", xenv->evtchn_intr_flags, 2, 7, &passed);
>
> if (passed)
> fwts_passed(fw, "No issues found in XENV table.");
> diff --git a/src/lib/include/fwts_acpi_tables.h b/src/lib/include/fwts_acpi_tables.h
> index 54b5a254..fa641f04 100644
> --- a/src/lib/include/fwts_acpi_tables.h
> +++ b/src/lib/include/fwts_acpi_tables.h
> @@ -27,13 +27,13 @@
> #define ACPI_MAX_TABLES (128)
>
> #define fwts_acpi_revision_check(table, actual, must_be, passed) \
> - fwts_acpi_fixed_value_check(fw, LOG_LEVEL_HIGH, table, "Revision", actual, must_be, passed)
> + fwts_acpi_fixed_value(fw, LOG_LEVEL_HIGH, table, "Revision", actual, must_be, passed)
>
> -#define fwts_acpi_reserved_bits_check(table, field, value, min, max, passed) \
> - fwts_acpi_reserved_bits_check_(fw, table, field, value, sizeof(value), min, max, passed)
> +#define fwts_acpi_reserved_bits(table, field, value, min, max, passed) \
> + fwts_acpi_reserved_bits_(fw, table, field, value, sizeof(value), min, max, passed)
>
> -#define fwts_acpi_reserved_zero_check(table, field, value, passed) \
> - fwts_acpi_reserved_zero_check_(fw, table, field, value, sizeof(value), passed)
> +#define fwts_acpi_reserved_zero(table, field, value, passed) \
> + fwts_acpi_reserved_zero_(fw, table, field, value, sizeof(value), passed)
>
> typedef enum {
> FWTS_ACPI_TABLE_FROM_FIRMWARE, /* directly from firmware */
> @@ -70,16 +70,16 @@ bool fwts_acpi_obj_find(fwts_framework *fw, const char *obj_name);
>
> fwts_bool fwts_acpi_is_reduced_hardware(fwts_framework *fw);
>
> -void fwts_acpi_reserved_zero_check_(fwts_framework *fw, const char *table, const char *field, uint64_t value, uint8_t size, bool *passed);
> -void fwts_acpi_reserved_zero_array_check(fwts_framework *fw, const char *table, const char *field, uint8_t* data, uint8_t length, bool *passed);
> -void fwts_acpi_reserved_bits_check_(fwts_framework *fw, const char *table, const char *field, uint64_t value, uint8_t size, uint8_t min, uint8_t max, bool *passed);
> -void fwts_acpi_reserved_type_check(fwts_framework *fw, const char *table, uint8_t value, uint8_t min, uint8_t reserved, bool *passed);
> -bool fwts_acpi_table_length_check(fwts_framework *fw, const char *table, uint32_t length, uint32_t size);
> -bool fwts_acpi_structure_length_check(fwts_framework *fw, const char *table, uint8_t subtable_type, uint32_t subtable_length, uint32_t size);
> -bool fwts_acpi_structure_length_zero_check(fwts_framework *fw, const char *table, uint16_t length, uint32_t offset);
> -bool fwts_acpi_structure_range_check(fwts_framework *fw, const char *table, uint32_t table_length, uint32_t offset);
> -void fwts_acpi_fixed_value_check(fwts_framework *fw, fwts_log_level level, const char *table, const char *field, uint8_t actual, uint8_t must_be, bool *passed);
> -void fwts_acpi_space_id_check(fwts_framework *fw, const char *table, const char *field, bool *passed, uint8_t actual, uint8_t num_type, ...);
> +void fwts_acpi_reserved_zero_(fwts_framework *fw, const char *table, const char *field, uint64_t value, uint8_t size, bool *passed);
> +void fwts_acpi_reserved_zero_array(fwts_framework *fw, const char *table, const char *field, uint8_t* data, uint8_t length, bool *passed);
> +void fwts_acpi_reserved_bits_(fwts_framework *fw, const char *table, const char *field, uint64_t value, uint8_t size, uint8_t min, uint8_t max, bool *passed);
> +void fwts_acpi_reserved_type(fwts_framework *fw, const char *table, uint8_t value, uint8_t min, uint8_t reserved, bool *passed);
> +bool fwts_acpi_table_length(fwts_framework *fw, const char *table, uint32_t length, uint32_t size);
> +bool fwts_acpi_structure_length(fwts_framework *fw, const char *table, uint8_t subtable_type, uint32_t subtable_length, uint32_t size);
> +bool fwts_acpi_structure_length_zero(fwts_framework *fw, const char *table, uint16_t length, uint32_t offset);
> +bool fwts_acpi_structure_range(fwts_framework *fw, const char *table, uint32_t table_length, uint32_t offset);
> +void fwts_acpi_fixed_value(fwts_framework *fw, fwts_log_level level, const char *table, const char *field, uint8_t actual, uint8_t must_be, bool *passed);
> +void fwts_acpi_space_id(fwts_framework *fw, const char *table, const char *field, bool *passed, uint8_t actual, uint8_t num_type, ...);
>
> uint32_t fwts_get_acpi_version(fwts_framework *fw);
>
> diff --git a/src/lib/src/fwts_acpi_object_eval.c b/src/lib/src/fwts_acpi_object_eval.c
> index d5a31db4..013540f9 100644
> --- a/src/lib/src/fwts_acpi_object_eval.c
> +++ b/src/lib/src/fwts_acpi_object_eval.c
> @@ -1959,9 +1959,9 @@ void fwts_method_test_CRS_large_resource_items(
> fwts_method_test_CRS_large_size(fw, name, objname, data, length, 17, 65535, passed);
> if (!*passed) /* Too short, abort */
> break;
> - fwts_acpi_reserved_bits_check("_CRS", "Flags[low]", data[4], 1, 7, passed);
> - fwts_acpi_reserved_zero_check("_CRS", "Flags[high]", data[5], passed);
> - fwts_acpi_reserved_zero_check("_CRS", "Flags[high]", data[5], passed);
> + fwts_acpi_reserved_bits("_CRS", "Flags[low]", data[4], 1, 7, passed);
> + fwts_acpi_reserved_zero("_CRS", "Flags[high]", data[5], passed);
> + fwts_acpi_reserved_zero("_CRS", "Flags[high]", data[5], passed);
> break;
> case 0xe: /* 6.4.3.8.2 Serial Bus Connection Descriptors */
> fwts_method_test_CRS_large_size(fw, name, objname, data, length, 11, 65535, passed);
> @@ -1972,8 +1972,8 @@ void fwts_method_test_CRS_large_resource_items(
> if (!*passed) /* Too short, abort */
> break;
>
> - fwts_acpi_reserved_bits_check("_CRS", "Flags[low]", data[4], 2, 7, passed);
> - fwts_acpi_reserved_zero_check("_CRS", "Flags[high]", data[5], passed);
> + fwts_acpi_reserved_bits("_CRS", "Flags[low]", data[4], 2, 7, passed);
> + fwts_acpi_reserved_zero("_CRS", "Flags[high]", data[5], passed);
>
> if (data[6] > 0xd && data[6] < 0x80) {
> *passed = false;
> @@ -1988,15 +1988,15 @@ void fwts_method_test_CRS_large_resource_items(
> "section 6.4.3.10 of the ACPI spec.");
> }
>
> - fwts_acpi_reserved_zero_check("_CRS", "Flags[high]", data[5], passed);
> + fwts_acpi_reserved_zero("_CRS", "Flags[high]", data[5], passed);
> break;
> case 0x10: /* 6.4.3.11 Pin Group Descriptors */
> fwts_method_test_CRS_large_size(fw, name, objname, data, length, 13, 65535, passed);
> if (!*passed) /* Too short, abort */
> break;
>
> - fwts_acpi_reserved_bits_check("_CRS", "Flags[low]", data[4], 1, 7, passed);
> - fwts_acpi_reserved_zero_check("_CRS", "Flags[high]", data[5], passed);
> + fwts_acpi_reserved_bits("_CRS", "Flags[low]", data[4], 1, 7, passed);
> + fwts_acpi_reserved_zero("_CRS", "Flags[high]", data[5], passed);
>
> break;
> case 0x11: /* 6.4.3.12 Pin Group Function Descriptors */
> @@ -2004,17 +2004,17 @@ void fwts_method_test_CRS_large_resource_items(
> if (!*passed) /* Too short, abort */
> break;
>
> - fwts_acpi_reserved_bits_check("_CRS", "Flags[low]", data[4], 2, 7, passed);
> - fwts_acpi_reserved_zero_check("_CRS", "Flags[high]", data[5], passed);
> - fwts_acpi_reserved_zero_check("_CRS", "Resource Source Index", data[8], passed);
> + fwts_acpi_reserved_bits("_CRS", "Flags[low]", data[4], 2, 7, passed);
> + fwts_acpi_reserved_zero("_CRS", "Flags[high]", data[5], passed);
> + fwts_acpi_reserved_zero("_CRS", "Resource Source Index", data[8], passed);
> break;
> case 0x12: /* 6.4.3.13 Pin Group Configuration Descriptor */
> fwts_method_test_CRS_large_size(fw, name, objname, data, length, 19, 65535, passed);
> if (!*passed) /* Too short, abort */
> break;
>
> - fwts_acpi_reserved_bits_check("_CRS", "Flags[low]", data[4], 2, 7, passed);
> - fwts_acpi_reserved_zero_check("_CRS", "Flags[high]", data[5], passed);
> + fwts_acpi_reserved_bits("_CRS", "Flags[low]", data[4], 2, 7, passed);
> + fwts_acpi_reserved_zero("_CRS", "Flags[high]", data[5], passed);
>
> if (data[6] > 0xd && data[6] < 0x80) {
> *passed = false;
> @@ -2029,7 +2029,7 @@ void fwts_method_test_CRS_large_resource_items(
> "section 6.4.3.10 of the ACPI spec.");
> }
>
> - fwts_acpi_reserved_zero_check("_CRS", "Flags[high]", data[5], passed);
> + fwts_acpi_reserved_zero("_CRS", "Flags[high]", data[5], passed);
> break;
> default:
> snprintf(tmp, sizeof(tmp), "Method%sUnkownLargeResourceItem", objname);
> @@ -2441,10 +2441,10 @@ void fwts_method_test_BMD_return(
> if (fwts_method_package_elements_all_type(fw, name, obj, ACPI_TYPE_INTEGER) != FWTS_OK)
> return;
>
> - fwts_acpi_reserved_bits_check("_BMD", "Status Flags",
> + fwts_acpi_reserved_bits("_BMD", "Status Flags",
> obj->Package.Elements[0].Integer.Value, 7, 31, &failed);
>
> - fwts_acpi_reserved_bits_check("_BMD", "Capability Flags",
> + fwts_acpi_reserved_bits("_BMD", "Capability Flags",
> obj->Package.Elements[1].Integer.Value, 6, 31, &failed);
>
> if (!failed)
> @@ -2506,7 +2506,7 @@ void fwts_method_test_NBS_return(
> ret = (nbs_return_t *) obj->Buffer.Pointer;
> check_nvdimm_status(fw, name, ret->status, &passed);
> check_nvdimm_extended_status(fw, name, ret->extended_status, 0, &passed);
> - fwts_acpi_reserved_bits_check("_NBS", "Validation Flags",
> + fwts_acpi_reserved_bits("_NBS", "Validation Flags",
> ret->validation_flags, 1, 15, &passed);
>
> if (passed)
> @@ -2534,18 +2534,18 @@ void fwts_method_test_NCH_return(
> ret = (nch_return_t *) obj->Buffer.Pointer;
> check_nvdimm_status(fw, name, ret->status, &passed);
> check_nvdimm_extended_status(fw, name, ret->extended_status, 0, &passed);
> - fwts_acpi_reserved_bits_check("_NCH", "Validation Flags",
> + fwts_acpi_reserved_bits("_NCH", "Validation Flags",
> ret->extended_status, 2, 15, &passed);
>
> /* Health Status Flags [2..7], [11.15], [19..31] are reserved */
> - fwts_acpi_reserved_bits_check("_NCH", "Health Status Flags",
> + fwts_acpi_reserved_bits("_NCH", "Health Status Flags",
> ret->health_status_flags, 2, 7, &passed);
> - fwts_acpi_reserved_bits_check("_NCH", "Health Status Flags",
> + fwts_acpi_reserved_bits("_NCH", "Health Status Flags",
> ret->health_status_flags, 11, 15, &passed);
> - fwts_acpi_reserved_bits_check("_NCH", "Health Status Flags",
> + fwts_acpi_reserved_bits("_NCH", "Health Status Flags",
> ret->health_status_flags, 19, 31, &passed);
>
> - fwts_acpi_reserved_bits_check("_NCH", "Health Status Attributes",
> + fwts_acpi_reserved_bits("_NCH", "Health Status Attributes",
> ret->health_status_attributes, 1, 31, &passed);
>
> if (passed)
> @@ -2575,14 +2575,14 @@ void fwts_method_test_NIC_return(
> check_nvdimm_extended_status(fw, name, ret->extended_status, 0, &passed);
>
> /* Health Error Injection Capabilities [2..7], [11.15], [19..31] are reserved */
> - fwts_acpi_reserved_bits_check("_NIC", "Health Error Injection Capabilities",
> + fwts_acpi_reserved_bits("_NIC", "Health Error Injection Capabilities",
> ret->health_error_injection, 2, 7, &passed);
> - fwts_acpi_reserved_bits_check("_NIC", "Health Error Injection Capabilities",
> + fwts_acpi_reserved_bits("_NIC", "Health Error Injection Capabilities",
> ret->health_error_injection, 11, 15, &passed);
> - fwts_acpi_reserved_bits_check("_NIC", "Health Error Injection Capabilities",
> + fwts_acpi_reserved_bits("_NIC", "Health Error Injection Capabilities",
> ret->health_error_injection, 19, 31, &passed);
>
> - fwts_acpi_reserved_bits_check("_NIC", "Health Status Attributes Capabilities",
> + fwts_acpi_reserved_bits("_NIC", "Health Status Attributes Capabilities",
> ret->health_status_attributes, 1, 31, &passed);
>
> if (passed)
> @@ -2636,18 +2636,18 @@ void fwts_method_test_NIG_return(
> ret = (nig_return_t *) obj->Buffer.Pointer;
> check_nvdimm_status(fw, name, ret->status, &passed);
> check_nvdimm_extended_status(fw, name, ret->extended_status, 0, &passed);
> - fwts_acpi_reserved_bits_check("_NIG", "Validation Flags",
> + fwts_acpi_reserved_bits("_NIG", "Validation Flags",
> ret->validation_flags, 2, 15, &passed);
>
> /* Injected Health Status Errors [2..7], [11.15], [19..31] are reserved */
> - fwts_acpi_reserved_bits_check("_NIG", "Injected Health Status Errors",
> + fwts_acpi_reserved_bits("_NIG", "Injected Health Status Errors",
> ret->health_status_errors, 2, 7, &passed);
> - fwts_acpi_reserved_bits_check("_NIG", "Injected Health Status Errors",
> + fwts_acpi_reserved_bits("_NIG", "Injected Health Status Errors",
> ret->health_status_errors, 11, 15, &passed);
> - fwts_acpi_reserved_bits_check("_NIG", "Injected Health Status Errors",
> + fwts_acpi_reserved_bits("_NIG", "Injected Health Status Errors",
> ret->health_status_errors, 19, 31, &passed);
>
> - fwts_acpi_reserved_bits_check("_NIG", "Health Status Attributes of Injected Errors",
> + fwts_acpi_reserved_bits("_NIG", "Health Status Attributes of Injected Errors",
> ret->health_status_attributes, 1, 31, &passed);
>
> if (passed)
> @@ -2675,7 +2675,7 @@ void fwts_method_test_STA_return(
> "but not present, which is impossible.", name);
> passed = false;
> }
> - fwts_acpi_reserved_bits_check("_STA", "Reserved Bits", obj->Integer.Value, 5, 31, &passed);
> + fwts_acpi_reserved_bits("_STA", "Reserved Bits", obj->Integer.Value, 5, 31, &passed);
>
> if (passed)
> fwts_method_passed_sane_uint64(fw, name, obj->Integer.Value);
> @@ -3038,7 +3038,7 @@ void fwts_method_test_BST_return(
>
> /* Sanity check each field */
> /* Battery State */
> - fwts_acpi_reserved_bits_check("_BST", "Battery State",
> + fwts_acpi_reserved_bits("_BST", "Battery State",
> obj->Package.Elements[0].Integer.Value, 3, 31, &failed);
> /* Ensure bits 0 (discharging) and 1 (charging) are not both set, see 10.2.2.6 */
> if (((obj->Package.Elements[0].Integer.Value) & 3) == 3) {
> @@ -3091,7 +3091,7 @@ void fwts_method_test_BPC_return(
> if (fwts_method_test_revision(fw, name, obj->Package.Elements[0].Integer.Value, 1) != FWTS_OK)
> passed = false;
>
> - fwts_acpi_reserved_bits_check("_BPC", "Power Threshold Support Capability",
> + fwts_acpi_reserved_bits("_BPC", "Power Threshold Support Capability",
> obj->Package.Elements[1].Integer.Value, 2, 31, &passed);
>
> if (!passed)
> diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c
> index 68752564..18c1e123 100644
> --- a/src/lib/src/fwts_acpi_tables.c
> +++ b/src/lib/src/fwts_acpi_tables.c
> @@ -1425,10 +1425,10 @@ bool fwts_acpi_obj_find(fwts_framework *fw, const char *obj_name)
> }
>
> /*
> - * fwts_acpi_reserved_zero_check_()
> + * fwts_acpi_reserved_zero_()
> * verify whether the reserved field is zero
> */
> -void fwts_acpi_reserved_zero_check_(
> +void fwts_acpi_reserved_zero_(
> fwts_framework *fw,
> const char *table,
> const char *field,
> @@ -1469,10 +1469,10 @@ void fwts_acpi_reserved_zero_check_(
> }
>
> /*
> - * fwts_acpi_reserved_zero_array_check()
> + * fwts_acpi_reserved_zero_array()
> * verify whether the reserved array is all zeroed
> */
> -void fwts_acpi_reserved_zero_array_check(
> +void fwts_acpi_reserved_zero_array(
> fwts_framework *fw,
> const char *table,
> const char *field,
> @@ -1502,10 +1502,10 @@ void fwts_acpi_reserved_zero_array_check(
> }
>
> /*
> - * fwts_acpi_fixed_value_check()
> + * fwts_acpi_fixed_value()
> * verify whether a field matches the designed fixed value
> */
> -void fwts_acpi_fixed_value_check(
> +void fwts_acpi_fixed_value(
> fwts_framework *fw,
> fwts_log_level level,
> const char *table,
> @@ -1528,10 +1528,10 @@ void fwts_acpi_fixed_value_check(
> }
>
> /*
> - * fwts_acpi_reserved_bits_check_()
> + * fwts_acpi_reserved_bits_()
> * verify whether the reserved bits are zero
> */
> -void fwts_acpi_reserved_bits_check_(
> +void fwts_acpi_reserved_bits_(
> fwts_framework *fw,
> const char *table,
> const char *field,
> @@ -1580,10 +1580,10 @@ void fwts_acpi_reserved_bits_check_(
> }
>
> /*
> - * fwts_acpi_reserved_type_check()
> + * fwts_acpi_reserved_type()
> * verify whether the reserved types are used
> */
> -void fwts_acpi_reserved_type_check(
> +void fwts_acpi_reserved_type(
> fwts_framework *fw,
> const char *table,
> uint8_t value,
> @@ -1640,10 +1640,10 @@ static const char *get_space_id_name(const uint8_t id)
> }
>
> /*
> - * fwts_acpi_space_id_check()
> + * fwts_acpi_space_id()
> * check whether gas space id matches
> */
> -void fwts_acpi_space_id_check(
> +void fwts_acpi_space_id(
> fwts_framework *fw,
> const char *table,
> const char *field,
> @@ -1699,10 +1699,10 @@ void fwts_acpi_space_id_check(
> }
>
> /*
> - * fwts_acpi_table_length_check()
> + * fwts_acpi_table_length()
> * verify whether table length is sane
> */
> -bool fwts_acpi_table_length_check(
> +bool fwts_acpi_table_length(
> fwts_framework *fw,
> const char *table,
> uint32_t length,
> @@ -1723,10 +1723,10 @@ bool fwts_acpi_table_length_check(
> }
>
> /*
> - * fwts_acpi_structure_length_check()
> + * fwts_acpi_structure_length()
> * verify whether sub structure length is sane
> */
> -bool fwts_acpi_structure_length_check(
> +bool fwts_acpi_structure_length(
> fwts_framework *fw,
> const char *table,
> uint8_t type,
> @@ -1748,10 +1748,10 @@ bool fwts_acpi_structure_length_check(
> }
>
> /*
> - * fwts_acpi_structure_length_zero_check()
> + * fwts_acpi_structure_length_zero()
> * verify whether sub structure length is zero
> */
> -bool fwts_acpi_structure_length_zero_check(
> +bool fwts_acpi_structure_length_zero(
> fwts_framework *fw,
> const char *table,
> const uint16_t length,
> @@ -1771,10 +1771,10 @@ bool fwts_acpi_structure_length_zero_check(
> }
>
> /*
> - * fwts_acpi_structure_range_check()
> + * fwts_acpi_structure_range()
> * verify whether sub structure is out of table range
> */
> -bool fwts_acpi_structure_range_check(
> +bool fwts_acpi_structure_range(
> fwts_framework *fw,
> const char *table,
> const uint32_t table_length,
>
Acked-by: Ivan Hu <ivan.hu at canonical.com>
More information about the fwts-devel
mailing list