| Message ID | 20210529005737.1800738-1-alex.hung@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | fwts_framework: clean up flag macros | expand |
On 5/29/21 8:57 AM, Alex Hung wrote: > Deleted as they aren't used: > FWTS_FLAG_TEST_BIOS > FWTS_FLAG_TEST_MASK > > Shortened to avoid long lines: > FWTS_FLAG_TEST_UEFI -> FWTS_FLAG_UEFI > FWTS_FLAG_TEST_ACPI -> FWTS_FLAG_ACPI > FWTS_FLAG_TEST_SBBR -> FWTS_FLAG_SBBR > FWTS_FLAG_TEST_EBBR -> FWTS_FLAG_EBBR > FWTS_FLAG_TEST_XBBR -> FWTS_FLAG_XBBR > FWTS_FLAG_TEST_COMPLIANCE_ACPI -> FWTS_FLAG_COMPLIANCE_ACPI > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/acpi/acpiinfo/acpiinfo.c | 2 +- > src/acpi/acpitables/acpitables.c | 2 +- > src/acpi/apicinstance/apicinstance.c | 2 +- > src/acpi/asf/asf.c | 2 +- > src/acpi/aspt/aspt.c | 2 +- > src/acpi/bert/bert.c | 2 +- > src/acpi/bgrt/bgrt.c | 2 +- > src/acpi/boot/boot.c | 2 +- > src/acpi/checksum/checksum.c | 2 +- > src/acpi/cpep/cpep.c | 2 +- > src/acpi/csrt/csrt.c | 2 +- > src/acpi/cstates/cstates.c | 2 +- > src/acpi/dbg2/dbg2.c | 6 ++--- > src/acpi/dbgp/dbgp.c | 2 +- > src/acpi/devices/ac_adapter/ac.c | 2 +- > src/acpi/devices/battery/battery.c | 2 +- > src/acpi/devices/battery/smart_battery.c | 2 +- > src/acpi/devices/buttons/power_button.c | 2 +- > src/acpi/devices/buttons/sleep_button.c | 2 +- > src/acpi/devices/ec/ec.c | 2 +- > src/acpi/devices/lid/lid.c | 2 +- > src/acpi/devices/nvdimm/nvdimm.c | 2 +- > src/acpi/devices/sensor/als.c | 2 +- > src/acpi/devices/time/time.c | 2 +- > src/acpi/devices/wpc/wpc.c | 2 +- > src/acpi/dmar/dmar.c | 2 +- > src/acpi/dppt/dppt.c | 2 +- > src/acpi/drtm/drtm.c | 2 +- > src/acpi/ecdt/ecdt.c | 2 +- > src/acpi/einj/einj.c | 3 +-- > src/acpi/erst/erst.c | 2 +- > src/acpi/facs/facs.c | 2 +- > src/acpi/fadt/fadt.c | 3 +-- > src/acpi/fpdt/fpdt.c | 2 +- > src/acpi/gtdt/gtdt.c | 4 ++-- > src/acpi/hest/hest.c | 2 +- > src/acpi/hmat/hmat.c | 2 +- > src/acpi/hpet/hpet.c | 2 +- > src/acpi/iort/iort.c | 2 +- > src/acpi/lpit/lpit.c | 2 +- > src/acpi/madt/madt.c | 8 +++---- > src/acpi/mcfg/mcfg.c | 2 +- > src/acpi/mchi/mchi.c | 2 +- > src/acpi/method/method.c | 18 +++++++-------- > src/acpi/mpst/mpst.c | 2 +- > src/acpi/msct/msct.c | 2 +- > src/acpi/msdm/msdm.c | 2 +- > src/acpi/nfit/nfit.c | 2 +- > src/acpi/pcc/pcc.c | 2 +- > src/acpi/pcct/pcct.c | 2 +- > src/acpi/pdtt/pdtt.c | 2 +- > src/acpi/phat/phat.c | 2 +- > src/acpi/pmtt/pmtt.c | 2 +- > src/acpi/pptt/pptt.c | 2 +- > src/acpi/rasf/rasf.c | 2 +- > src/acpi/rsdp/rsdp.c | 2 +- > src/acpi/rsdt/rsdt.c | 2 +- > src/acpi/sbst/sbst.c | 2 +- > src/acpi/sdei/sdei.c | 2 +- > src/acpi/sdev/sdev.c | 2 +- > src/acpi/slic/slic.c | 2 +- > src/acpi/slit/slit.c | 2 +- > src/acpi/spcr/spcr.c | 8 +++---- > src/acpi/spmi/spmi.c | 2 +- > src/acpi/srat/srat.c | 2 +- > src/acpi/stao/stao.c | 2 +- > src/acpi/tcpa/tcpa.c | 2 +- > src/acpi/tpm2/tpm2.c | 2 +- > src/acpi/uefi/uefi.c | 2 +- > src/acpi/waet/waet.c | 2 +- > src/acpi/wdat/wdat.c | 2 +- > src/acpi/wmi/wmi.c | 2 +- > src/acpi/wpbt/wpbt.c | 2 +- > src/acpi/wsmt/wsmt.c | 2 +- > src/acpi/xenv/xenv.c | 2 +- > src/acpi/xsdt/xsdt.c | 8 +++---- > src/dmi/dmicheck/dmicheck.c | 10 ++++----- > src/lib/include/fwts_framework.h | 19 +++++----------- > src/lib/src/fwts_acpi_object_eval.c | 16 +++++++------- > src/lib/src/fwts_framework.c | 28 ++++++++++++------------ > src/sbbr/acpitables/acpitables.c | 2 +- > src/sbbr/fadt/fadt.c | 2 +- > src/sbbr/rsdp/rsdp.c | 2 +- > src/uefi/csm/csm.c | 2 +- > src/uefi/esrt/esrt.c | 2 +- > src/uefi/securebootcert/securebootcert.c | 2 +- > src/uefi/uefibootpath/uefibootpath.c | 2 +- > src/uefi/uefirtauthvar/uefirtauthvar.c | 2 +- > src/uefi/uefirtmisc/uefirtmisc.c | 2 +- > src/uefi/uefirttime/uefirttime.c | 2 +- > src/uefi/uefirtvariable/uefirtvariable.c | 2 +- > 91 files changed, 140 insertions(+), 149 deletions(-) > > diff --git a/src/acpi/acpiinfo/acpiinfo.c b/src/acpi/acpiinfo/acpiinfo.c > index 2b42624b..8f521605 100644 > --- a/src/acpi/acpiinfo/acpiinfo.c > +++ b/src/acpi/acpiinfo/acpiinfo.c > @@ -167,6 +167,6 @@ static fwts_framework_ops acpiinfo_ops = { > .minor_tests = acpiinfo_tests > }; > > -FWTS_REGISTER("acpiinfo", &acpiinfo_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpiinfo", &acpiinfo_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c > index 54722acf..67224633 100644 > --- a/src/acpi/acpitables/acpitables.c > +++ b/src/acpi/acpitables/acpitables.c > @@ -323,6 +323,6 @@ static fwts_framework_ops acpi_table_check_ops = { > }; > > FWTS_REGISTER("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME, > - FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > + FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/apicinstance/apicinstance.c b/src/acpi/apicinstance/apicinstance.c > index 5fc2ecd7..dae0d543 100644 > --- a/src/acpi/apicinstance/apicinstance.c > +++ b/src/acpi/apicinstance/apicinstance.c > @@ -82,6 +82,6 @@ static fwts_framework_ops apicinstance_ops = { > .minor_tests = apicinstance_tests > }; > > -FWTS_REGISTER("apicinstance", &apicinstance_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("apicinstance", &apicinstance_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/asf/asf.c b/src/acpi/asf/asf.c > index 452769bb..b4acbdd1 100644 > --- a/src/acpi/asf/asf.c > +++ b/src/acpi/asf/asf.c > @@ -540,6 +540,6 @@ static fwts_framework_ops asf_ops = { > .minor_tests = asf_tests > }; > > -FWTS_REGISTER("asf", &asf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("asf", &asf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/aspt/aspt.c b/src/acpi/aspt/aspt.c > index 7c7947df..9c9db8ca 100644 > --- a/src/acpi/aspt/aspt.c > +++ b/src/acpi/aspt/aspt.c > @@ -87,6 +87,6 @@ static fwts_framework_ops aspt_ops = { > .minor_tests = aspt_tests > }; > > -FWTS_REGISTER("aspt", &aspt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("aspt", &aspt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/bert/bert.c b/src/acpi/bert/bert.c > index 45743ee0..a8ef548b 100644 > --- a/src/acpi/bert/bert.c > +++ b/src/acpi/bert/bert.c > @@ -179,6 +179,6 @@ static fwts_framework_ops bert_ops = { > .minor_tests = bert_tests > }; > > -FWTS_REGISTER("bert", &bert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("bert", &bert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/bgrt/bgrt.c b/src/acpi/bgrt/bgrt.c > index cede8ced..c3491d33 100644 > --- a/src/acpi/bgrt/bgrt.c > +++ b/src/acpi/bgrt/bgrt.c > @@ -67,6 +67,6 @@ static fwts_framework_ops bgrt_ops = { > .minor_tests = bgrt_tests > }; > > -FWTS_REGISTER("bgrt", &bgrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("bgrt", &bgrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/boot/boot.c b/src/acpi/boot/boot.c > index 8de2207f..a88b58b2 100644 > --- a/src/acpi/boot/boot.c > +++ b/src/acpi/boot/boot.c > @@ -107,6 +107,6 @@ static fwts_framework_ops boot_ops = { > .minor_tests = boot_tests > }; > > -FWTS_REGISTER("boot", &boot_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("boot", &boot_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/checksum/checksum.c b/src/acpi/checksum/checksum.c > index 54afbb3b..59a740d0 100644 > --- a/src/acpi/checksum/checksum.c > +++ b/src/acpi/checksum/checksum.c > @@ -157,6 +157,6 @@ static fwts_framework_ops checksum_ops = { > .minor_tests = checksum_tests > }; > > -FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/cpep/cpep.c b/src/acpi/cpep/cpep.c > index f76b6b5e..4aa075dd 100644 > --- a/src/acpi/cpep/cpep.c > +++ b/src/acpi/cpep/cpep.c > @@ -101,6 +101,6 @@ static fwts_framework_ops cpep_ops = { > .minor_tests = cpep_tests > }; > > -FWTS_REGISTER("cpep", &cpep_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("cpep", &cpep_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/csrt/csrt.c b/src/acpi/csrt/csrt.c > index e5708af0..9818faac 100644 > --- a/src/acpi/csrt/csrt.c > +++ b/src/acpi/csrt/csrt.c > @@ -231,6 +231,6 @@ static fwts_framework_ops csrt_ops = { > .minor_tests = csrt_tests > }; > > -FWTS_REGISTER("csrt", &csrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("csrt", &csrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/cstates/cstates.c b/src/acpi/cstates/cstates.c > index 5433956d..45073c15 100644 > --- a/src/acpi/cstates/cstates.c > +++ b/src/acpi/cstates/cstates.c > @@ -255,6 +255,6 @@ static fwts_framework_ops cstates_ops = { > .minor_tests = cstates_tests > }; > > -FWTS_REGISTER("cstates", &cstates_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("cstates", &cstates_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/dbg2/dbg2.c b/src/acpi/dbg2/dbg2.c > index d345a65a..3c8105a1 100644 > --- a/src/acpi/dbg2/dbg2.c > +++ b/src/acpi/dbg2/dbg2.c > @@ -41,7 +41,7 @@ static int dbg2_init(fwts_framework *fw) > return FWTS_ERROR; > } > if (table == NULL || (table && table->length == 0)) { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_log_error(fw, > "ACPI DBG2 table does not exist"); > return FWTS_ERROR; > @@ -59,7 +59,7 @@ static int dbg2_test2(fwts_framework *fw) > { > uint32_t i; > > - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) > + if (!(fw->flags & FWTS_FLAG_SBBR)) > return FWTS_SKIP; > > fwts_acpi_table_dbg2 *dbg2 = (fwts_acpi_table_dbg2 *)table->data; > @@ -389,6 +389,6 @@ static fwts_framework_ops dbg2_ops = { > .minor_tests = dbg2_tests > }; > > -FWTS_REGISTER("dbg2", &dbg2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("dbg2", &dbg2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/dbgp/dbgp.c b/src/acpi/dbgp/dbgp.c > index dc45f4d5..906ef1e4 100644 > --- a/src/acpi/dbgp/dbgp.c > +++ b/src/acpi/dbgp/dbgp.c > @@ -119,6 +119,6 @@ static fwts_framework_ops dbgp_ops = { > .minor_tests = dbgp_tests > }; > > -FWTS_REGISTER("dbgp", &dbgp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("dbgp", &dbgp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/ac_adapter/ac.c b/src/acpi/devices/ac_adapter/ac.c > index 0de13b2d..4363ecd5 100644 > --- a/src/acpi/devices/ac_adapter/ac.c > +++ b/src/acpi/devices/ac_adapter/ac.c > @@ -288,6 +288,6 @@ static fwts_framework_ops acpi_ac_ops = { > .minor_tests = acpi_ac_tests > }; > > -FWTS_REGISTER("acpi_ac", &acpi_ac_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_ac", &acpi_ac_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/battery/battery.c b/src/acpi/devices/battery/battery.c > index 68d5fc7f..d5b41dc4 100644 > --- a/src/acpi/devices/battery/battery.c > +++ b/src/acpi/devices/battery/battery.c > @@ -402,6 +402,6 @@ static fwts_framework_ops acpi_battery_ops = { > .minor_tests = acpi_battery_tests > }; > > -FWTS_REGISTER("acpi_battery", &acpi_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_battery", &acpi_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/battery/smart_battery.c b/src/acpi/devices/battery/smart_battery.c > index a3246b60..2e4b8ecf 100644 > --- a/src/acpi/devices/battery/smart_battery.c > +++ b/src/acpi/devices/battery/smart_battery.c > @@ -217,6 +217,6 @@ static fwts_framework_ops smart_battery_ops = { > .minor_tests = smart_battery_tests > }; > > -FWTS_REGISTER("smart_battery", &smart_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("smart_battery", &smart_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/buttons/power_button.c b/src/acpi/devices/buttons/power_button.c > index f9781d00..b4b5ea5a 100644 > --- a/src/acpi/devices/buttons/power_button.c > +++ b/src/acpi/devices/buttons/power_button.c > @@ -198,6 +198,6 @@ static fwts_framework_ops power_button_ops = { > .minor_tests = power_button_tests > }; > > -FWTS_REGISTER("acpi_pwrb", &power_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_pwrb", &power_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/buttons/sleep_button.c b/src/acpi/devices/buttons/sleep_button.c > index a800dc84..f0a3c550 100644 > --- a/src/acpi/devices/buttons/sleep_button.c > +++ b/src/acpi/devices/buttons/sleep_button.c > @@ -170,6 +170,6 @@ static fwts_framework_ops sleep_button_ops = { > .minor_tests = sleep_button_tests > }; > > -FWTS_REGISTER("acpi_slpb", &sleep_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_slpb", &sleep_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/ec/ec.c b/src/acpi/devices/ec/ec.c > index 967797e7..bf9a07d4 100644 > --- a/src/acpi/devices/ec/ec.c > +++ b/src/acpi/devices/ec/ec.c > @@ -281,6 +281,6 @@ static fwts_framework_ops acpi_ec_ops = { > .minor_tests = acpi_ec_tests > }; > > -FWTS_REGISTER("acpi_ec", &acpi_ec_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_ec", &acpi_ec_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/lid/lid.c b/src/acpi/devices/lid/lid.c > index 136f2a61..a1fef384 100644 > --- a/src/acpi/devices/lid/lid.c > +++ b/src/acpi/devices/lid/lid.c > @@ -287,6 +287,6 @@ static fwts_framework_ops acpi_lid_ops = { > .minor_tests = acpi_lid_tests > }; > > -FWTS_REGISTER("acpi_lid", &acpi_lid_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_lid", &acpi_lid_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/nvdimm/nvdimm.c b/src/acpi/devices/nvdimm/nvdimm.c > index 1e2ac73b..34cde9f5 100644 > --- a/src/acpi/devices/nvdimm/nvdimm.c > +++ b/src/acpi/devices/nvdimm/nvdimm.c > @@ -140,6 +140,6 @@ static fwts_framework_ops acpi_nvdimm_ops = { > .minor_tests = acpi_nvdimm_tests > }; > > -FWTS_REGISTER("acpi_nvdimm", &acpi_nvdimm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_nvdimm", &acpi_nvdimm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/sensor/als.c b/src/acpi/devices/sensor/als.c > index fb363850..e1bfa236 100644 > --- a/src/acpi/devices/sensor/als.c > +++ b/src/acpi/devices/sensor/als.c > @@ -264,6 +264,6 @@ static fwts_framework_ops ambient_light_ops = { > .minor_tests = ambient_light_tests > }; > > -FWTS_REGISTER("acpi_als", &ambient_light_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_als", &ambient_light_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/time/time.c b/src/acpi/devices/time/time.c > index 79f2f784..74f8bb41 100644 > --- a/src/acpi/devices/time/time.c > +++ b/src/acpi/devices/time/time.c > @@ -406,6 +406,6 @@ static fwts_framework_ops acpi_time_alarm_ops = { > .minor_tests = acpi_time_alarm_tests > }; > > -FWTS_REGISTER("acpi_time", &acpi_time_alarm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_time", &acpi_time_alarm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/wpc/wpc.c b/src/acpi/devices/wpc/wpc.c > index a74957c2..3c7a2f4e 100644 > --- a/src/acpi/devices/wpc/wpc.c > +++ b/src/acpi/devices/wpc/wpc.c > @@ -206,6 +206,6 @@ static fwts_framework_ops acpi_wpc_ops = { > .minor_tests = acpi_wpc_tests > }; > > -FWTS_REGISTER("acpi_wpc", &acpi_wpc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_wpc", &acpi_wpc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/dmar/dmar.c b/src/acpi/dmar/dmar.c > index 99cb2bf7..af9ee277 100644 > --- a/src/acpi/dmar/dmar.c > +++ b/src/acpi/dmar/dmar.c > @@ -335,6 +335,6 @@ static fwts_framework_ops dmar_ops = { > .minor_tests = dmar_tests > }; > > -FWTS_REGISTER("dmar", &dmar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_ROOT_PRIV) > +FWTS_REGISTER("dmar", &dmar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_ROOT_PRIV) > > #endif > diff --git a/src/acpi/dppt/dppt.c b/src/acpi/dppt/dppt.c > index 5033583b..e85b385b 100644 > --- a/src/acpi/dppt/dppt.c > +++ b/src/acpi/dppt/dppt.c > @@ -55,6 +55,6 @@ static fwts_framework_ops dppt_ops = { > .minor_tests = dppt_tests > }; > > -FWTS_REGISTER("dppt", &dppt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("dppt", &dppt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/drtm/drtm.c b/src/acpi/drtm/drtm.c > index cbfa2076..0804f0aa 100644 > --- a/src/acpi/drtm/drtm.c > +++ b/src/acpi/drtm/drtm.c > @@ -145,6 +145,6 @@ static fwts_framework_ops drtm_ops = { > .minor_tests = drtm_tests > }; > > -FWTS_REGISTER("drtm", &drtm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("drtm", &drtm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/ecdt/ecdt.c b/src/acpi/ecdt/ecdt.c > index 359a817b..cc600ad0 100644 > --- a/src/acpi/ecdt/ecdt.c > +++ b/src/acpi/ecdt/ecdt.c > @@ -186,6 +186,6 @@ static fwts_framework_ops ecdt_ops = { > .minor_tests = ecdt_tests > }; > > -FWTS_REGISTER("ecdt", &ecdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("ecdt", &ecdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/einj/einj.c b/src/acpi/einj/einj.c > index 36fa01dd..37fb521a 100644 > --- a/src/acpi/einj/einj.c > +++ b/src/acpi/einj/einj.c > @@ -123,7 +123,6 @@ static fwts_framework_ops einj_ops = { > .minor_tests = einj_tests > }; > > -FWTS_REGISTER("einj", &einj_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | > - FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("einj", &einj_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/erst/erst.c b/src/acpi/erst/erst.c > index b67e5691..2e77c82b 100644 > --- a/src/acpi/erst/erst.c > +++ b/src/acpi/erst/erst.c > @@ -173,6 +173,6 @@ static fwts_framework_ops erst_ops = { > .minor_tests = erst_tests > }; > > -FWTS_REGISTER("erst", &erst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("erst", &erst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/facs/facs.c b/src/acpi/facs/facs.c > index 335253fb..ca6827c4 100644 > --- a/src/acpi/facs/facs.c > +++ b/src/acpi/facs/facs.c > @@ -145,6 +145,6 @@ static fwts_framework_ops facs_ops = { > .minor_tests = facs_tests > }; > > -FWTS_REGISTER("facs", &facs_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("facs", &facs_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/fadt/fadt.c b/src/acpi/fadt/fadt.c > index 4c35c849..0677a690 100644 > --- a/src/acpi/fadt/fadt.c > +++ b/src/acpi/fadt/fadt.c > @@ -1855,6 +1855,5 @@ static fwts_framework_ops fadt_ops = { > }; > > FWTS_REGISTER("fadt", &fadt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | > - FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI | > - FWTS_FLAG_TEST_COMPLIANCE_ACPI) > + FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_ACPI | FWTS_FLAG_COMPLIANCE_ACPI) > #endif > diff --git a/src/acpi/fpdt/fpdt.c b/src/acpi/fpdt/fpdt.c > index ce3257e5..7408c8a9 100644 > --- a/src/acpi/fpdt/fpdt.c > +++ b/src/acpi/fpdt/fpdt.c > @@ -194,6 +194,6 @@ static fwts_framework_ops fpdt_ops = { > .minor_tests = fpdt_tests > }; > > -FWTS_REGISTER("fpdt", &fpdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("fpdt", &fpdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/gtdt/gtdt.c b/src/acpi/gtdt/gtdt.c > index 270ade37..8cd41632 100644 > --- a/src/acpi/gtdt/gtdt.c > +++ b/src/acpi/gtdt/gtdt.c > @@ -35,7 +35,7 @@ static int gtdt_init(fwts_framework *fw) > return FWTS_ERROR; > } > if (table == NULL || (table && table->length == 0)) { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_log_error(fw, "ACPI GTDT table does not exist"); > return FWTS_ERROR; > } else { > @@ -276,6 +276,6 @@ static fwts_framework_ops gtdt_ops = { > .minor_tests = gtdt_tests > }; > > -FWTS_REGISTER("gtdt", >dt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("gtdt", >dt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/hest/hest.c b/src/acpi/hest/hest.c > index ce502cd4..bff25bc3 100644 > --- a/src/acpi/hest/hest.c > +++ b/src/acpi/hest/hest.c > @@ -892,6 +892,6 @@ static fwts_framework_ops hest_ops = { > .minor_tests = hest_tests > }; > > -FWTS_REGISTER("hest", &hest_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("hest", &hest_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/hmat/hmat.c b/src/acpi/hmat/hmat.c > index 86037152..ec93ce3b 100644 > --- a/src/acpi/hmat/hmat.c > +++ b/src/acpi/hmat/hmat.c > @@ -217,6 +217,6 @@ static fwts_framework_ops hmat_ops = { > .minor_tests = hmat_tests > }; > > -FWTS_REGISTER("hmat", &hmat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("hmat", &hmat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/hpet/hpet.c b/src/acpi/hpet/hpet.c > index 9e024757..2295b989 100644 > --- a/src/acpi/hpet/hpet.c > +++ b/src/acpi/hpet/hpet.c > @@ -476,6 +476,6 @@ static fwts_framework_ops hpet_check_ops = { > }; > > FWTS_REGISTER("hpet", &hpet_check_ops, FWTS_TEST_ANYTIME, > - FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI) > + FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/iort/iort.c b/src/acpi/iort/iort.c > index 0a828de6..9881bf94 100644 > --- a/src/acpi/iort/iort.c > +++ b/src/acpi/iort/iort.c > @@ -715,6 +715,6 @@ static fwts_framework_ops iort_ops = { > .minor_tests = iort_tests > }; > > -FWTS_REGISTER("iort", &iort_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("iort", &iort_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/lpit/lpit.c b/src/acpi/lpit/lpit.c > index 40fbe687..5e5a7861 100644 > --- a/src/acpi/lpit/lpit.c > +++ b/src/acpi/lpit/lpit.c > @@ -221,6 +221,6 @@ static fwts_framework_ops lpit_ops = { > .minor_tests = lpit_tests > }; > > -FWTS_REGISTER("lpit", &lpit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("lpit", &lpit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/madt/madt.c b/src/acpi/madt/madt.c > index 7455c964..dd835392 100644 > --- a/src/acpi/madt/madt.c > +++ b/src/acpi/madt/madt.c > @@ -385,7 +385,7 @@ static int madt_init(fwts_framework *fw) > > fadt_major = fadt->header.revision; > fadt_minor = 0; > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > if (fadt_major < SBBR_ACPI_MAJOR_VERSION) { > fwts_log_error(fw, "SBBR support starts with ACPI v6.0," > " Current revision is outdated: %" PRIu8 ".%" PRIu8, > @@ -1547,7 +1547,7 @@ static int madt_subtables(fwts_framework *fw) > hdr->type, madt_sub_names[type]); > } > > - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) { > + if (!(fw->flags & FWTS_FLAG_SBBR)) { > bool passed = true; > > /* verify that the length is what we expect */ > @@ -1698,7 +1698,7 @@ static int madt_subtables(fwts_framework *fw) > length -= skip; > } > > - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) { > + if (!(fw->flags & FWTS_FLAG_SBBR)) { > /* run comparison tests */ > madt_ioapic_sapic_compare(fw, num_ioapics, num_iosapics); > } > @@ -1734,6 +1734,6 @@ static fwts_framework_ops madt_ops = { > .minor_tests = madt_tests > }; > > -FWTS_REGISTER("madt", &madt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_COMPLIANCE_ACPI | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("madt", &madt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_COMPLIANCE_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/mcfg/mcfg.c b/src/acpi/mcfg/mcfg.c > index 35f07fb3..7cef0f43 100644 > --- a/src/acpi/mcfg/mcfg.c > +++ b/src/acpi/mcfg/mcfg.c > @@ -252,6 +252,6 @@ static fwts_framework_ops mcfg_ops = { > .minor_tests = mcfg_tests > }; > > -FWTS_REGISTER("mcfg", &mcfg_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("mcfg", &mcfg_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/mchi/mchi.c b/src/acpi/mchi/mchi.c > index 2a1732d9..e34f3636 100644 > --- a/src/acpi/mchi/mchi.c > +++ b/src/acpi/mchi/mchi.c > @@ -209,6 +209,6 @@ static fwts_framework_ops mchi_ops = { > .minor_tests = mchi_tests > }; > > -FWTS_REGISTER("mchi", &mchi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("mchi", &mchi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c > index 1c9203dd..9832c4e1 100644 > --- a/src/acpi/method/method.c > +++ b/src/acpi/method/method.c > @@ -566,7 +566,7 @@ static void method_test_AEI_return( > > static int method_test_AEI(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, > "_AEI", NULL, 0, method_test_AEI_return, NULL); > else > @@ -655,7 +655,7 @@ static int method_test_EVT(fwts_framework *fw) > int ret; > > /* Only test the _EVT method with pins defined in AEI. */ > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > ret = method_evaluate_method(fw, METHOD_MANDATORY | METHOD_SILENT, > "_AEI", NULL, 0, method_test_EVT_return, NULL); > else > @@ -761,7 +761,7 @@ static int method_test_DDN(fwts_framework *fw) > > static int method_test_HID(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, > "_HID", NULL, 0, fwts_method_test_HID_return, NULL); > else > @@ -812,7 +812,7 @@ static int method_test_SUN(fwts_framework *fw) > > static int method_test_UID(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, > "_UID", NULL, 0, fwts_method_test_UID_return, NULL); > else > @@ -1109,7 +1109,7 @@ static int method_test_SLI(fwts_framework *fw) > /* Section 6.2.17 _CCA */ > static int method_test_CCA(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, > "_CCA", NULL, 0, fwts_method_test_passed_failed_return, "_CCA"); > else > @@ -1169,7 +1169,7 @@ static int method_test_RMV(fwts_framework *fw) > > static int method_test_STA(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, "_STA", > NULL, 0, fwts_method_test_STA_return, "_STA"); > else > @@ -2670,7 +2670,7 @@ static int method_test_SST(fwts_framework *fw) > ret = method_evaluate_method(fw, METHOD_OPTIONAL, > "_SST", arg, 1, fwts_method_test_NULL_return, NULL); > > - if (ret == FWTS_NOT_EXIST && (fw->flags & FWTS_FLAG_TEST_SBBR)) { > + if (ret == FWTS_NOT_EXIST && (fw->flags & FWTS_FLAG_SBBR)) { > fwts_warning(fw, "_SST method not found. This should be treated as error " > "if the platform provides user visible status such as LED."); > } > @@ -4340,7 +4340,7 @@ static int method_test_VPO(fwts_framework *fw) > > static int method_test_ADR(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, > "_ADR", NULL, 0, fwts_method_test_integer_return, NULL); > else > @@ -5028,6 +5028,6 @@ static fwts_framework_ops method_ops = { > }; > > FWTS_REGISTER("method", &method_ops, FWTS_TEST_ANYTIME, > - FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > + FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/mpst/mpst.c b/src/acpi/mpst/mpst.c > index 4cf4bc10..3ce4ca9d 100644 > --- a/src/acpi/mpst/mpst.c > +++ b/src/acpi/mpst/mpst.c > @@ -188,6 +188,6 @@ static fwts_framework_ops mpst_ops = { > .minor_tests = mpst_tests > }; > > -FWTS_REGISTER("mpst", &mpst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("mpst", &mpst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/msct/msct.c b/src/acpi/msct/msct.c > index 168e7a4b..3764e5e9 100644 > --- a/src/acpi/msct/msct.c > +++ b/src/acpi/msct/msct.c > @@ -116,6 +116,6 @@ static fwts_framework_ops msct_ops = { > }; > > FWTS_REGISTER("msct", &msct_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | > - FWTS_FLAG_TEST_ACPI) > + FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/msdm/msdm.c b/src/acpi/msdm/msdm.c > index b9b60ec6..008d050d 100644 > --- a/src/acpi/msdm/msdm.c > +++ b/src/acpi/msdm/msdm.c > @@ -134,6 +134,6 @@ static fwts_framework_ops msdm_ops = { > .minor_tests = msdm_tests > }; > > -FWTS_REGISTER("msdm", &msdm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("msdm", &msdm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/nfit/nfit.c b/src/acpi/nfit/nfit.c > index 71fb0bea..0ffacd1e 100644 > --- a/src/acpi/nfit/nfit.c > +++ b/src/acpi/nfit/nfit.c > @@ -537,6 +537,6 @@ static fwts_framework_ops nfit_ops = { > .minor_tests = nfit_tests > }; > > -FWTS_REGISTER("nfit", &nfit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("nfit", &nfit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/pcc/pcc.c b/src/acpi/pcc/pcc.c > index 8eb71caf..96286e23 100644 > --- a/src/acpi/pcc/pcc.c > +++ b/src/acpi/pcc/pcc.c > @@ -471,6 +471,6 @@ static fwts_framework_ops pcc_ops = { > .minor_tests = pcc_tests > }; > > -FWTS_REGISTER("pcc", &pcc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("pcc", &pcc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/pcct/pcct.c b/src/acpi/pcct/pcct.c > index 9cbbc54b..cec21f38 100644 > --- a/src/acpi/pcct/pcct.c > +++ b/src/acpi/pcct/pcct.c > @@ -333,6 +333,6 @@ static fwts_framework_ops pcct_ops = { > .minor_tests = pcct_tests > }; > > -FWTS_REGISTER("pcct", &pcct_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("pcct", &pcct_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/pdtt/pdtt.c b/src/acpi/pdtt/pdtt.c > index 93baacbf..061878ab 100644 > --- a/src/acpi/pdtt/pdtt.c > +++ b/src/acpi/pdtt/pdtt.c > @@ -94,6 +94,6 @@ static fwts_framework_ops pdtt_ops = { > .minor_tests = pdtt_tests > }; > > -FWTS_REGISTER("pdtt", &pdtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("pdtt", &pdtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/phat/phat.c b/src/acpi/phat/phat.c > index e8ab09c7..4810b15c 100644 > --- a/src/acpi/phat/phat.c > +++ b/src/acpi/phat/phat.c > @@ -167,6 +167,6 @@ static fwts_framework_ops phat_ops = { > .minor_tests = phat_tests > }; > > -FWTS_REGISTER("phat", &phat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("phat", &phat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/pmtt/pmtt.c b/src/acpi/pmtt/pmtt.c > index 86e46c6d..7515730b 100644 > --- a/src/acpi/pmtt/pmtt.c > +++ b/src/acpi/pmtt/pmtt.c > @@ -225,6 +225,6 @@ static fwts_framework_ops pmtt_ops = { > .minor_tests = pmtt_tests > }; > > -FWTS_REGISTER("pmtt", &pmtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("pmtt", &pmtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/pptt/pptt.c b/src/acpi/pptt/pptt.c > index bc11fcb0..8a126ff9 100644 > --- a/src/acpi/pptt/pptt.c > +++ b/src/acpi/pptt/pptt.c > @@ -178,6 +178,6 @@ static fwts_framework_ops pptt_ops = { > .minor_tests = pptt_tests > }; > > -FWTS_REGISTER("pptt", &pptt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("pptt", &pptt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/rasf/rasf.c b/src/acpi/rasf/rasf.c > index 05f02de8..dc44a58a 100644 > --- a/src/acpi/rasf/rasf.c > +++ b/src/acpi/rasf/rasf.c > @@ -64,6 +64,6 @@ static fwts_framework_ops rasf_ops = { > .minor_tests = rasf_tests > }; > > -FWTS_REGISTER("rasf", &rasf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("rasf", &rasf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/rsdp/rsdp.c b/src/acpi/rsdp/rsdp.c > index ac53ece2..d43a9d85 100644 > --- a/src/acpi/rsdp/rsdp.c > +++ b/src/acpi/rsdp/rsdp.c > @@ -226,6 +226,6 @@ static fwts_framework_ops rsdp_ops = { > }; > > FWTS_REGISTER("rsdp", &rsdp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | > - FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_COMPLIANCE_ACPI) > + FWTS_FLAG_ACPI | FWTS_FLAG_COMPLIANCE_ACPI) > > #endif > diff --git a/src/acpi/rsdt/rsdt.c b/src/acpi/rsdt/rsdt.c > index 0298e093..4f08f9b7 100644 > --- a/src/acpi/rsdt/rsdt.c > +++ b/src/acpi/rsdt/rsdt.c > @@ -70,6 +70,6 @@ static fwts_framework_ops rsdt_ops = { > .minor_tests = rsdt_tests > }; > > -FWTS_REGISTER("rsdt", &rsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("rsdt", &rsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/sbst/sbst.c b/src/acpi/sbst/sbst.c > index 81c8179b..51660b07 100644 > --- a/src/acpi/sbst/sbst.c > +++ b/src/acpi/sbst/sbst.c > @@ -80,6 +80,6 @@ static fwts_framework_ops sbst_ops = { > .minor_tests = sbst_tests > }; > > -FWTS_REGISTER("sbst", &sbst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("sbst", &sbst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/sdei/sdei.c b/src/acpi/sdei/sdei.c > index 1c94028b..d7fd513f 100644 > --- a/src/acpi/sdei/sdei.c > +++ b/src/acpi/sdei/sdei.c > @@ -68,6 +68,6 @@ static fwts_framework_ops sdei_ops = { > .minor_tests = sdei_tests > }; > > -FWTS_REGISTER("sdei", &sdei_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("sdei", &sdei_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/sdev/sdev.c b/src/acpi/sdev/sdev.c > index 0542d858..a115ebc8 100644 > --- a/src/acpi/sdev/sdev.c > +++ b/src/acpi/sdev/sdev.c > @@ -129,6 +129,6 @@ static fwts_framework_ops sdev_ops = { > .minor_tests = sdev_tests > }; > > -FWTS_REGISTER("sdev", &sdev_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("sdev", &sdev_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/slic/slic.c b/src/acpi/slic/slic.c > index f244b775..b4f32435 100644 > --- a/src/acpi/slic/slic.c > +++ b/src/acpi/slic/slic.c > @@ -160,6 +160,6 @@ static fwts_framework_ops slic_ops = { > .minor_tests = slic_tests > }; > > -FWTS_REGISTER("slic", &slic_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("slic", &slic_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/slit/slit.c b/src/acpi/slit/slit.c > index 8cdebb3f..1115e11b 100644 > --- a/src/acpi/slit/slit.c > +++ b/src/acpi/slit/slit.c > @@ -168,6 +168,6 @@ static fwts_framework_ops slit_ops = { > .minor_tests = slit_tests > }; > > -FWTS_REGISTER("slit", &slit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("slit", &slit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/spcr/spcr.c b/src/acpi/spcr/spcr.c > index 626144bf..a1318f02 100644 > --- a/src/acpi/spcr/spcr.c > +++ b/src/acpi/spcr/spcr.c > @@ -37,7 +37,7 @@ static int spcr_init(fwts_framework *fw) > return FWTS_ERROR; > } > if (table == NULL || (table && table->length == 0)) { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_log_error(fw, "ACPI SPCR table does not exist"); > return FWTS_ERROR; > } else { > @@ -57,7 +57,7 @@ static int spcr_init(fwts_framework *fw) > */ > static int spcr_sbbr_revision_test(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > const uint8_t SBBR_LATEST_REVISION = 2; > > if (spcr->header.revision >= SBBR_LATEST_REVISION) > @@ -72,7 +72,7 @@ static int spcr_sbbr_revision_test(fwts_framework *fw) > > static int spcr_sbbr_gsiv_test(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > const uint8_t ARMH_GIC_INTR_MASK = 0x08; > const uint8_t IO_APIC_INTR_MASK = 0x02; > > @@ -296,6 +296,6 @@ static fwts_framework_ops spcr_ops = { > .minor_tests = spcr_tests > }; > > -FWTS_REGISTER("spcr", &spcr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("spcr", &spcr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/spmi/spmi.c b/src/acpi/spmi/spmi.c > index 0dc7d08b..10d4c95b 100644 > --- a/src/acpi/spmi/spmi.c > +++ b/src/acpi/spmi/spmi.c > @@ -180,6 +180,6 @@ static fwts_framework_ops spmi_ops = { > .minor_tests = spmi_tests > }; > > -FWTS_REGISTER("spmi", &spmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("spmi", &spmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/srat/srat.c b/src/acpi/srat/srat.c > index eaad90ca..008aeb2f 100644 > --- a/src/acpi/srat/srat.c > +++ b/src/acpi/srat/srat.c > @@ -401,6 +401,6 @@ static fwts_framework_ops srat_ops = { > .minor_tests = srat_tests > }; > > -FWTS_REGISTER("srat", &srat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("srat", &srat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/stao/stao.c b/src/acpi/stao/stao.c > index c0c24865..1bfbf8dd 100644 > --- a/src/acpi/stao/stao.c > +++ b/src/acpi/stao/stao.c > @@ -144,6 +144,6 @@ static fwts_framework_ops stao_ops = { > .minor_tests = stao_tests > }; > > -FWTS_REGISTER("stao", &stao_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("stao", &stao_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/tcpa/tcpa.c b/src/acpi/tcpa/tcpa.c > index 2abafba1..208aceee 100644 > --- a/src/acpi/tcpa/tcpa.c > +++ b/src/acpi/tcpa/tcpa.c > @@ -155,6 +155,6 @@ static fwts_framework_ops tcpa_ops = { > .minor_tests = tcpa_tests > }; > > -FWTS_REGISTER("tcpa", &tcpa_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("tcpa", &tcpa_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/tpm2/tpm2.c b/src/acpi/tpm2/tpm2.c > index ae4da486..7aef8887 100644 > --- a/src/acpi/tpm2/tpm2.c > +++ b/src/acpi/tpm2/tpm2.c > @@ -97,6 +97,6 @@ static fwts_framework_ops tpm2_ops = { > .minor_tests = tpm2_tests > }; > > -FWTS_REGISTER("tpm2", &tpm2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("tpm2", &tpm2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/uefi/uefi.c b/src/acpi/uefi/uefi.c > index 93a12b6e..eef08cc6 100644 > --- a/src/acpi/uefi/uefi.c > +++ b/src/acpi/uefi/uefi.c > @@ -115,6 +115,6 @@ static fwts_framework_ops uefi_ops = { > .minor_tests = uefi_tests > }; > > -FWTS_REGISTER("uefi", &uefi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("uefi", &uefi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/waet/waet.c b/src/acpi/waet/waet.c > index 6d283c12..a239e26c 100644 > --- a/src/acpi/waet/waet.c > +++ b/src/acpi/waet/waet.c > @@ -73,6 +73,6 @@ static fwts_framework_ops waet_ops = { > .minor_tests = waet_tests > }; > > -FWTS_REGISTER("waet", &waet_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("waet", &waet_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/wdat/wdat.c b/src/acpi/wdat/wdat.c > index c5f806e0..92357bad 100644 > --- a/src/acpi/wdat/wdat.c > +++ b/src/acpi/wdat/wdat.c > @@ -203,6 +203,6 @@ static fwts_framework_ops wdat_ops = { > .minor_tests = wdat_tests > }; > > -FWTS_REGISTER("wdat", &wdat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("wdat", &wdat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/wmi/wmi.c b/src/acpi/wmi/wmi.c > index c87df22e..93c3c9e8 100644 > --- a/src/acpi/wmi/wmi.c > +++ b/src/acpi/wmi/wmi.c > @@ -426,6 +426,6 @@ static fwts_framework_ops wmi_ops = { > .minor_tests = wmi_tests > }; > > -FWTS_REGISTER("wmi", &wmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("wmi", &wmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/wpbt/wpbt.c b/src/acpi/wpbt/wpbt.c > index 74c00a05..b97808f4 100644 > --- a/src/acpi/wpbt/wpbt.c > +++ b/src/acpi/wpbt/wpbt.c > @@ -80,6 +80,6 @@ static fwts_framework_ops wpbt_ops = { > .minor_tests = wpbt_tests > }; > > -FWTS_REGISTER("wpbt", &wpbt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("wpbt", &wpbt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/wsmt/wsmt.c b/src/acpi/wsmt/wsmt.c > index 18bfbdd9..5b55c5c6 100644 > --- a/src/acpi/wsmt/wsmt.c > +++ b/src/acpi/wsmt/wsmt.c > @@ -70,6 +70,6 @@ static fwts_framework_ops wsmt_ops = { > .minor_tests = wsmt_tests > }; > > -FWTS_REGISTER("wsmt", &wsmt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("wsmt", &wsmt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/xenv/xenv.c b/src/acpi/xenv/xenv.c > index 0aac43d6..20a4eefb 100644 > --- a/src/acpi/xenv/xenv.c > +++ b/src/acpi/xenv/xenv.c > @@ -71,6 +71,6 @@ static fwts_framework_ops xenv_check_ops = { > }; > > FWTS_REGISTER("xenv", &xenv_check_ops, FWTS_TEST_ANYTIME, > - FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > + FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/xsdt/xsdt.c b/src/acpi/xsdt/xsdt.c > index cec7e651..31ede781 100644 > --- a/src/acpi/xsdt/xsdt.c > +++ b/src/acpi/xsdt/xsdt.c > @@ -35,7 +35,7 @@ static int xsdt_init(fwts_framework *fw) > return FWTS_ERROR; > } > if (table == NULL || (table && table->length == 0)) { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_log_error(fw, "ACPI XSDT table does not exist"); > return FWTS_ERROR; > } else { > @@ -59,7 +59,7 @@ static int xsdt_test1(fwts_framework *fw) > for (i = 0; i < n; i++) { > if (xsdt->entries[i] == 0) { > passed = false; > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_failed(fw, LOG_LEVEL_CRITICAL, > "XSDTEntryNull", > "XSDT Entry %zd is null, should not be non-zero.", i); > @@ -78,7 +78,7 @@ static int xsdt_test1(fwts_framework *fw) > } > } > if (passed) { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_passed(fw, "XSDT is present, pointed at by XsdrAddress=0x%" PRIx64 > " and contain valid pointers to %d other ACPI tables mandated by SBBR", > xsdt->entries[0], (int)n); > @@ -100,6 +100,6 @@ static fwts_framework_ops xsdt_ops = { > .minor_tests = xsdt_tests > }; > > -FWTS_REGISTER("xsdt", &xsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("xsdt", &xsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c > index a2403653..fa685414 100644 > --- a/src/dmi/dmicheck/dmicheck.c > +++ b/src/dmi/dmicheck/dmicheck.c > @@ -787,7 +787,7 @@ static int dmicheck_test1(fwts_framework *fw) > } > > if (!smbios30_found) { > - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) { > + if (!(fw->flags & FWTS_FLAG_SBBR)) { > if (smbios_found) > return FWTS_OK; > } > @@ -2172,7 +2172,7 @@ static void dmi_scan_smbios30_table(fwts_framework *fw, > > if ((next_entry - table) <= table_max_length) { > dmicheck_entry(fw, addr, &hdr, smbios_version); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > sbbr_test_entry_check(&hdr); > } > else { > @@ -2197,7 +2197,7 @@ static int dmicheck_test2(fwts_framework *fw) > uint16_t version = 0; > uint8_t *table; > > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return FWTS_SKIP; > > if (!smbios_found) { > @@ -2271,7 +2271,7 @@ static int dmicheck_test4(fwts_framework *fw) > { > uint32_t i; > > - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) > + if (!(fw->flags & FWTS_FLAG_SBBR)) > return FWTS_SKIP; > > if (!smbios30_found) { > @@ -2309,6 +2309,6 @@ static fwts_framework_ops dmicheck_ops = { > .minor_tests = dmicheck_tests > }; > > -FWTS_REGISTER("dmicheck", &dmicheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("dmicheck", &dmicheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/lib/include/fwts_framework.h b/src/lib/include/fwts_framework.h > index 31418a93..4d7eb191 100644 > --- a/src/lib/include/fwts_framework.h > +++ b/src/lib/include/fwts_framework.h > @@ -54,25 +54,18 @@ typedef enum { > FWTS_FLAG_ROOT_PRIV = 0x00002000, > FWTS_FLAG_UNSAFE = 0x00004000, > FWTS_FLAG_FIRMWARE_VENDOR = 0x00008000, > - FWTS_FLAG_TEST_BIOS = 0x00010000, > - FWTS_FLAG_TEST_UEFI = 0x00020000, > - FWTS_FLAG_TEST_ACPI = 0x00040000, > + FWTS_FLAG_UEFI = 0x00020000, > + FWTS_FLAG_ACPI = 0x00040000, > FWTS_FLAG_UTILS = 0x00080000, > FWTS_FLAG_QUIET = 0x00100000, > FWTS_FLAG_SHOW_TESTS_FULL = 0x00200000, > FWTS_FLAG_SHOW_TESTS_CATEGORIES = 0x00400000, > - FWTS_FLAG_TEST_COMPLIANCE_ACPI = 0x00800000, > - FWTS_FLAG_TEST_SBBR = 0x01000000, > - FWTS_FLAG_TEST_EBBR = 0x02000000, > - FWTS_FLAG_TEST_XBBR = FWTS_FLAG_TEST_SBBR | FWTS_FLAG_TEST_EBBR > + FWTS_FLAG_COMPLIANCE_ACPI = 0x00800000, > + FWTS_FLAG_SBBR = 0x01000000, > + FWTS_FLAG_EBBR = 0x02000000, > + FWTS_FLAG_XBBR = FWTS_FLAG_SBBR | FWTS_FLAG_EBBR > } fwts_framework_flags; > > -#define FWTS_FLAG_TEST_MASK \ > - (FWTS_FLAG_TEST_BIOS | \ > - FWTS_FLAG_TEST_UEFI | \ > - FWTS_FLAG_TEST_ACPI | \ > - FWTS_FLAG_TEST_SBBR) > - > /* > * Test results > */ > diff --git a/src/lib/src/fwts_acpi_object_eval.c b/src/lib/src/fwts_acpi_object_eval.c > index 013540f9..4923748c 100644 > --- a/src/lib/src/fwts_acpi_object_eval.c > +++ b/src/lib/src/fwts_acpi_object_eval.c > @@ -1562,7 +1562,7 @@ static void method_test_CRS_mif_maf( > if (len == 0) { > if ((mif == 1) && (maf == 1)) { > snprintf(tmp, sizeof(tmp), "Method%s%sMifMafBothOne", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s _MIF and _MAF flags are both " > "set to one which is invalid when " > @@ -1591,7 +1591,7 @@ static void method_test_CRS_mif_maf( > *passed = false; > } else if (min % tmpgran != 0) { > snprintf(tmp, sizeof(tmp), "Method%s%sMinNotMultipleOfGran", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s _MIN address is not a multiple " > "of the granularity when _MIF is 1.", > @@ -1618,7 +1618,7 @@ static void method_test_CRS_mif_maf( > *passed = false; > } else if (max % tmpgran != 0) { > snprintf(tmp, sizeof(tmp), "Method%s%sMaxNotMultipleOfGran", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s _MAX address is not a multiple " > "of the granularity when _MAF is 1.", > @@ -1637,7 +1637,7 @@ static void method_test_CRS_mif_maf( > if ((mif == 0) && (maf == 0) && > (len % (granularity + 1) != 0)) { > snprintf(tmp, sizeof(tmp), "Method%s%sLenNotMultipleOfGran", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s length is not a multiple " > "of the granularity when _MIF " > @@ -1655,7 +1655,7 @@ static void method_test_CRS_mif_maf( > } > if (((mif == 0) && (maf == 1)) || ((mif == 1) && (maf == 0))) { > snprintf(tmp, sizeof(tmp), "Method%s%sMifMafInvalid", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s _MIF and _MAF flags are either " > "0 and 1 or 1 and 0 which is invalid when " > @@ -1674,7 +1674,7 @@ static void method_test_CRS_mif_maf( > if ((mif == 1) && (maf == 1)) { > if (granularity != 0) { > snprintf(tmp, sizeof(tmp), "Method%s%sGranularityNotZero", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s granularity 0x%" PRIx64 > " is not zero as expected when " > @@ -1692,7 +1692,7 @@ static void method_test_CRS_mif_maf( > } > if (min > max) { > snprintf(tmp, sizeof(tmp), "Method%s%sMaxLessThanMin", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s minimum address range 0x%" PRIx64 > " is greater than the maximum address " > @@ -1710,7 +1710,7 @@ static void method_test_CRS_mif_maf( > } > if (max - min + 1 != len) { > snprintf(tmp, sizeof(tmp), "Method%s%sLengthInvalid", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s length 0x%" PRIx64 > " does not match the difference between " > diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c > index 1f139a7e..076a5516 100644 > --- a/src/lib/src/fwts_framework.c > +++ b/src/lib/src/fwts_framework.c > @@ -55,24 +55,24 @@ typedef struct { > FWTS_FLAG_POWER_STATES | \ > FWTS_FLAG_UTILS | \ > FWTS_FLAG_UNSAFE | \ > - FWTS_FLAG_TEST_UEFI | \ > - FWTS_FLAG_TEST_ACPI | \ > - FWTS_FLAG_TEST_COMPLIANCE_ACPI | \ > - FWTS_FLAG_TEST_SBBR | \ > - FWTS_FLAG_TEST_EBBR) > + FWTS_FLAG_UEFI | \ > + FWTS_FLAG_ACPI | \ > + FWTS_FLAG_COMPLIANCE_ACPI | \ > + FWTS_FLAG_SBBR | \ > + FWTS_FLAG_EBBR) > > static const fwts_categories categories[] = { > - { "ACPI", FWTS_FLAG_TEST_ACPI }, > + { "ACPI", FWTS_FLAG_ACPI }, > { "Batch", FWTS_FLAG_BATCH }, > { "Interactive", FWTS_FLAG_INTERACTIVE }, > { "Batch Experimental", FWTS_FLAG_BATCH_EXPERIMENTAL }, > { "Interactive Experimental", FWTS_FLAG_INTERACTIVE_EXPERIMENTAL }, > { "Power States", FWTS_FLAG_POWER_STATES }, > - { "SBBR", FWTS_FLAG_TEST_SBBR }, > + { "SBBR", FWTS_FLAG_SBBR }, > { "Utilities", FWTS_FLAG_UTILS }, > { "Unsafe", FWTS_FLAG_UNSAFE }, > - { "UEFI", FWTS_FLAG_TEST_UEFI }, > - { "ACPI Spec Compliance", FWTS_FLAG_TEST_COMPLIANCE_ACPI }, > + { "UEFI", FWTS_FLAG_UEFI }, > + { "ACPI Spec Compliance", FWTS_FLAG_COMPLIANCE_ACPI }, > { NULL, 0 }, > }; > > @@ -1309,7 +1309,7 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar > return FWTS_ERROR; > break; > case 38: /* --uefitests */ > - fw->flags |= FWTS_FLAG_TEST_UEFI; > + fw->flags |= FWTS_FLAG_UEFI; > break; > case 39: /* --rsdp */ > fw->rsdp = (void *)strtoul(optarg, NULL, 0); > @@ -1322,10 +1322,10 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar > fw->flags |= FWTS_FLAG_SHOW_TESTS_CATEGORIES; > break; > case 42: /* --acpitests */ > - fw->flags |= FWTS_FLAG_TEST_ACPI; > + fw->flags |= FWTS_FLAG_ACPI; > break; > case 43: /* --acpicompliance */ > - fw->flags |= FWTS_FLAG_TEST_COMPLIANCE_ACPI; > + fw->flags |= FWTS_FLAG_COMPLIANCE_ACPI; > break; > case 44: /* --log-level */ > if (fwts_framework_ll_parse(fw, optarg) != FWTS_OK) > @@ -1337,7 +1337,7 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar > break; > case 46: /* --sbbr */ > #if defined(FWTS_ARCH_AARCH64) > - fw->flags |= FWTS_FLAG_TEST_SBBR; > + fw->flags |= FWTS_FLAG_SBBR; > break; > #else > fprintf(stderr, "option not available on this architecture\n"); > @@ -1351,7 +1351,7 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar > break; > case 49: /* --ebbr */ > #if defined(FWTS_ARCH_AARCH64) > - fw->flags |= FWTS_FLAG_TEST_EBBR; > + fw->flags |= FWTS_FLAG_EBBR; > break; > #else > fprintf(stderr, "option not available on this architecture\n"); > diff --git a/src/sbbr/acpitables/acpitables.c b/src/sbbr/acpitables/acpitables.c > index aed2908e..fa63be64 100644 > --- a/src/sbbr/acpitables/acpitables.c > +++ b/src/sbbr/acpitables/acpitables.c > @@ -262,6 +262,6 @@ static fwts_framework_ops acpi_table_sbbr_check_ops = { > .minor_tests = acpi_table_sbbr_check_tests > }; > > -FWTS_REGISTER("acpi_sbbr", &acpi_table_sbbr_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("acpi_sbbr", &acpi_table_sbbr_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_SBBR) > > #endif > diff --git a/src/sbbr/fadt/fadt.c b/src/sbbr/fadt/fadt.c > index 2c3ead40..47fa3bd7 100644 > --- a/src/sbbr/fadt/fadt.c > +++ b/src/sbbr/fadt/fadt.c > @@ -417,5 +417,5 @@ static fwts_framework_ops fadt_sbbr_ops = { > .minor_tests = fadt_sbbr_tests > }; > > -FWTS_REGISTER("fadt_sbbr", &fadt_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("fadt_sbbr", &fadt_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_SBBR) > #endif > diff --git a/src/sbbr/rsdp/rsdp.c b/src/sbbr/rsdp/rsdp.c > index e8c5aacc..b02b428f 100644 > --- a/src/sbbr/rsdp/rsdp.c > +++ b/src/sbbr/rsdp/rsdp.c > @@ -126,6 +126,6 @@ static fwts_framework_ops rsdp_sbbr_ops = { > .minor_tests = rsdp_sbbr_tests > }; > > -FWTS_REGISTER("rsdp_sbbr", &rsdp_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("rsdp_sbbr", &rsdp_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_SBBR) > > #endif > diff --git a/src/uefi/csm/csm.c b/src/uefi/csm/csm.c > index e2c0c927..372b2919 100644 > --- a/src/uefi/csm/csm.c > +++ b/src/uefi/csm/csm.c > @@ -120,6 +120,6 @@ static fwts_framework_ops csm_ops = { > .minor_tests = csm_tests > }; > > -FWTS_REGISTER("csm", &csm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV) > +FWTS_REGISTER("csm", &csm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV) > > #endif > diff --git a/src/uefi/esrt/esrt.c b/src/uefi/esrt/esrt.c > index 81a487e7..7193ef8c 100644 > --- a/src/uefi/esrt/esrt.c > +++ b/src/uefi/esrt/esrt.c > @@ -263,6 +263,6 @@ static fwts_framework_ops esrt_ops = { > .minor_tests = esrt_tests > }; > > -FWTS_REGISTER("esrt", &esrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_ROOT_PRIV) > +FWTS_REGISTER("esrt", &esrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_ROOT_PRIV) > > #endif > diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c > index edb5ed8f..7a0366ea 100644 > --- a/src/uefi/securebootcert/securebootcert.c > +++ b/src/uefi/securebootcert/securebootcert.c > @@ -609,6 +609,6 @@ static fwts_framework_ops securebootcert_ops = { > .minor_tests = securebootcert_tests > }; > > -FWTS_REGISTER("securebootcert", &securebootcert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) > +FWTS_REGISTER("securebootcert", &securebootcert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) > > #endif > diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c > index eaffe5f6..417d36c3 100644 > --- a/src/uefi/uefibootpath/uefibootpath.c > +++ b/src/uefi/uefibootpath/uefibootpath.c > @@ -936,6 +936,6 @@ static fwts_framework_ops uefibootpath_ops = { > .minor_tests = uefibootpath_tests > }; > > -FWTS_REGISTER("uefibootpath", &uefibootpath_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV); > +FWTS_REGISTER("uefibootpath", &uefibootpath_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV); > > #endif > diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c > index e6ab9d45..7e26694a 100644 > --- a/src/uefi/uefirtauthvar/uefirtauthvar.c > +++ b/src/uefi/uefirtauthvar/uefirtauthvar.c > @@ -796,6 +796,6 @@ static fwts_framework_ops uefirtauthvar_ops = { > .minor_tests = uefirtauthvar_tests, > }; > > -FWTS_REGISTER("uefirtauthvar", &uefirtauthvar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) > +FWTS_REGISTER("uefirtauthvar", &uefirtauthvar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) > > #endif > diff --git a/src/uefi/uefirtmisc/uefirtmisc.c b/src/uefi/uefirtmisc/uefirtmisc.c > index bddff487..c00ed442 100644 > --- a/src/uefi/uefirtmisc/uefirtmisc.c > +++ b/src/uefi/uefirtmisc/uefirtmisc.c > @@ -346,6 +346,6 @@ static fwts_framework_ops uefirtmisc_ops = { > .minor_tests = uefirtmisc_tests > }; > > -FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_XBBR) > +FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_XBBR) > > #endif > diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c > index 41503843..c1a8ae6c 100644 > --- a/src/uefi/uefirttime/uefirttime.c > +++ b/src/uefi/uefirttime/uefirttime.c > @@ -1427,6 +1427,6 @@ static fwts_framework_ops uefirttime_ops = { > .minor_tests = uefirttime_tests > }; > > -FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_XBBR) > +FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_XBBR) > > #endif > diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c > index f5aaa5fb..9f2b9dfc 100644 > --- a/src/uefi/uefirtvariable/uefirtvariable.c > +++ b/src/uefi/uefirtvariable/uefirtvariable.c > @@ -2391,6 +2391,6 @@ static fwts_framework_ops uefirtvariable_ops = { > .options_check = options_check, > }; > > -FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_XBBR) > +FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_XBBR) > > #endif > Acked-by: Ivan Hu <ivan.hu@canonical.com>
On 29/05/2021 01:57, Alex Hung wrote: > Deleted as they aren't used: > FWTS_FLAG_TEST_BIOS > FWTS_FLAG_TEST_MASK > > Shortened to avoid long lines: > FWTS_FLAG_TEST_UEFI -> FWTS_FLAG_UEFI > FWTS_FLAG_TEST_ACPI -> FWTS_FLAG_ACPI > FWTS_FLAG_TEST_SBBR -> FWTS_FLAG_SBBR > FWTS_FLAG_TEST_EBBR -> FWTS_FLAG_EBBR > FWTS_FLAG_TEST_XBBR -> FWTS_FLAG_XBBR > FWTS_FLAG_TEST_COMPLIANCE_ACPI -> FWTS_FLAG_COMPLIANCE_ACPI > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/acpi/acpiinfo/acpiinfo.c | 2 +- > src/acpi/acpitables/acpitables.c | 2 +- > src/acpi/apicinstance/apicinstance.c | 2 +- > src/acpi/asf/asf.c | 2 +- > src/acpi/aspt/aspt.c | 2 +- > src/acpi/bert/bert.c | 2 +- > src/acpi/bgrt/bgrt.c | 2 +- > src/acpi/boot/boot.c | 2 +- > src/acpi/checksum/checksum.c | 2 +- > src/acpi/cpep/cpep.c | 2 +- > src/acpi/csrt/csrt.c | 2 +- > src/acpi/cstates/cstates.c | 2 +- > src/acpi/dbg2/dbg2.c | 6 ++--- > src/acpi/dbgp/dbgp.c | 2 +- > src/acpi/devices/ac_adapter/ac.c | 2 +- > src/acpi/devices/battery/battery.c | 2 +- > src/acpi/devices/battery/smart_battery.c | 2 +- > src/acpi/devices/buttons/power_button.c | 2 +- > src/acpi/devices/buttons/sleep_button.c | 2 +- > src/acpi/devices/ec/ec.c | 2 +- > src/acpi/devices/lid/lid.c | 2 +- > src/acpi/devices/nvdimm/nvdimm.c | 2 +- > src/acpi/devices/sensor/als.c | 2 +- > src/acpi/devices/time/time.c | 2 +- > src/acpi/devices/wpc/wpc.c | 2 +- > src/acpi/dmar/dmar.c | 2 +- > src/acpi/dppt/dppt.c | 2 +- > src/acpi/drtm/drtm.c | 2 +- > src/acpi/ecdt/ecdt.c | 2 +- > src/acpi/einj/einj.c | 3 +-- > src/acpi/erst/erst.c | 2 +- > src/acpi/facs/facs.c | 2 +- > src/acpi/fadt/fadt.c | 3 +-- > src/acpi/fpdt/fpdt.c | 2 +- > src/acpi/gtdt/gtdt.c | 4 ++-- > src/acpi/hest/hest.c | 2 +- > src/acpi/hmat/hmat.c | 2 +- > src/acpi/hpet/hpet.c | 2 +- > src/acpi/iort/iort.c | 2 +- > src/acpi/lpit/lpit.c | 2 +- > src/acpi/madt/madt.c | 8 +++---- > src/acpi/mcfg/mcfg.c | 2 +- > src/acpi/mchi/mchi.c | 2 +- > src/acpi/method/method.c | 18 +++++++-------- > src/acpi/mpst/mpst.c | 2 +- > src/acpi/msct/msct.c | 2 +- > src/acpi/msdm/msdm.c | 2 +- > src/acpi/nfit/nfit.c | 2 +- > src/acpi/pcc/pcc.c | 2 +- > src/acpi/pcct/pcct.c | 2 +- > src/acpi/pdtt/pdtt.c | 2 +- > src/acpi/phat/phat.c | 2 +- > src/acpi/pmtt/pmtt.c | 2 +- > src/acpi/pptt/pptt.c | 2 +- > src/acpi/rasf/rasf.c | 2 +- > src/acpi/rsdp/rsdp.c | 2 +- > src/acpi/rsdt/rsdt.c | 2 +- > src/acpi/sbst/sbst.c | 2 +- > src/acpi/sdei/sdei.c | 2 +- > src/acpi/sdev/sdev.c | 2 +- > src/acpi/slic/slic.c | 2 +- > src/acpi/slit/slit.c | 2 +- > src/acpi/spcr/spcr.c | 8 +++---- > src/acpi/spmi/spmi.c | 2 +- > src/acpi/srat/srat.c | 2 +- > src/acpi/stao/stao.c | 2 +- > src/acpi/tcpa/tcpa.c | 2 +- > src/acpi/tpm2/tpm2.c | 2 +- > src/acpi/uefi/uefi.c | 2 +- > src/acpi/waet/waet.c | 2 +- > src/acpi/wdat/wdat.c | 2 +- > src/acpi/wmi/wmi.c | 2 +- > src/acpi/wpbt/wpbt.c | 2 +- > src/acpi/wsmt/wsmt.c | 2 +- > src/acpi/xenv/xenv.c | 2 +- > src/acpi/xsdt/xsdt.c | 8 +++---- > src/dmi/dmicheck/dmicheck.c | 10 ++++----- > src/lib/include/fwts_framework.h | 19 +++++----------- > src/lib/src/fwts_acpi_object_eval.c | 16 +++++++------- > src/lib/src/fwts_framework.c | 28 ++++++++++++------------ > src/sbbr/acpitables/acpitables.c | 2 +- > src/sbbr/fadt/fadt.c | 2 +- > src/sbbr/rsdp/rsdp.c | 2 +- > src/uefi/csm/csm.c | 2 +- > src/uefi/esrt/esrt.c | 2 +- > src/uefi/securebootcert/securebootcert.c | 2 +- > src/uefi/uefibootpath/uefibootpath.c | 2 +- > src/uefi/uefirtauthvar/uefirtauthvar.c | 2 +- > src/uefi/uefirtmisc/uefirtmisc.c | 2 +- > src/uefi/uefirttime/uefirttime.c | 2 +- > src/uefi/uefirtvariable/uefirtvariable.c | 2 +- > 91 files changed, 140 insertions(+), 149 deletions(-) > > diff --git a/src/acpi/acpiinfo/acpiinfo.c b/src/acpi/acpiinfo/acpiinfo.c > index 2b42624b..8f521605 100644 > --- a/src/acpi/acpiinfo/acpiinfo.c > +++ b/src/acpi/acpiinfo/acpiinfo.c > @@ -167,6 +167,6 @@ static fwts_framework_ops acpiinfo_ops = { > .minor_tests = acpiinfo_tests > }; > > -FWTS_REGISTER("acpiinfo", &acpiinfo_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpiinfo", &acpiinfo_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c > index 54722acf..67224633 100644 > --- a/src/acpi/acpitables/acpitables.c > +++ b/src/acpi/acpitables/acpitables.c > @@ -323,6 +323,6 @@ static fwts_framework_ops acpi_table_check_ops = { > }; > > FWTS_REGISTER("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME, > - FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > + FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/apicinstance/apicinstance.c b/src/acpi/apicinstance/apicinstance.c > index 5fc2ecd7..dae0d543 100644 > --- a/src/acpi/apicinstance/apicinstance.c > +++ b/src/acpi/apicinstance/apicinstance.c > @@ -82,6 +82,6 @@ static fwts_framework_ops apicinstance_ops = { > .minor_tests = apicinstance_tests > }; > > -FWTS_REGISTER("apicinstance", &apicinstance_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("apicinstance", &apicinstance_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/asf/asf.c b/src/acpi/asf/asf.c > index 452769bb..b4acbdd1 100644 > --- a/src/acpi/asf/asf.c > +++ b/src/acpi/asf/asf.c > @@ -540,6 +540,6 @@ static fwts_framework_ops asf_ops = { > .minor_tests = asf_tests > }; > > -FWTS_REGISTER("asf", &asf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("asf", &asf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/aspt/aspt.c b/src/acpi/aspt/aspt.c > index 7c7947df..9c9db8ca 100644 > --- a/src/acpi/aspt/aspt.c > +++ b/src/acpi/aspt/aspt.c > @@ -87,6 +87,6 @@ static fwts_framework_ops aspt_ops = { > .minor_tests = aspt_tests > }; > > -FWTS_REGISTER("aspt", &aspt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("aspt", &aspt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/bert/bert.c b/src/acpi/bert/bert.c > index 45743ee0..a8ef548b 100644 > --- a/src/acpi/bert/bert.c > +++ b/src/acpi/bert/bert.c > @@ -179,6 +179,6 @@ static fwts_framework_ops bert_ops = { > .minor_tests = bert_tests > }; > > -FWTS_REGISTER("bert", &bert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("bert", &bert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/bgrt/bgrt.c b/src/acpi/bgrt/bgrt.c > index cede8ced..c3491d33 100644 > --- a/src/acpi/bgrt/bgrt.c > +++ b/src/acpi/bgrt/bgrt.c > @@ -67,6 +67,6 @@ static fwts_framework_ops bgrt_ops = { > .minor_tests = bgrt_tests > }; > > -FWTS_REGISTER("bgrt", &bgrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("bgrt", &bgrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/boot/boot.c b/src/acpi/boot/boot.c > index 8de2207f..a88b58b2 100644 > --- a/src/acpi/boot/boot.c > +++ b/src/acpi/boot/boot.c > @@ -107,6 +107,6 @@ static fwts_framework_ops boot_ops = { > .minor_tests = boot_tests > }; > > -FWTS_REGISTER("boot", &boot_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("boot", &boot_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/checksum/checksum.c b/src/acpi/checksum/checksum.c > index 54afbb3b..59a740d0 100644 > --- a/src/acpi/checksum/checksum.c > +++ b/src/acpi/checksum/checksum.c > @@ -157,6 +157,6 @@ static fwts_framework_ops checksum_ops = { > .minor_tests = checksum_tests > }; > > -FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/cpep/cpep.c b/src/acpi/cpep/cpep.c > index f76b6b5e..4aa075dd 100644 > --- a/src/acpi/cpep/cpep.c > +++ b/src/acpi/cpep/cpep.c > @@ -101,6 +101,6 @@ static fwts_framework_ops cpep_ops = { > .minor_tests = cpep_tests > }; > > -FWTS_REGISTER("cpep", &cpep_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("cpep", &cpep_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/csrt/csrt.c b/src/acpi/csrt/csrt.c > index e5708af0..9818faac 100644 > --- a/src/acpi/csrt/csrt.c > +++ b/src/acpi/csrt/csrt.c > @@ -231,6 +231,6 @@ static fwts_framework_ops csrt_ops = { > .minor_tests = csrt_tests > }; > > -FWTS_REGISTER("csrt", &csrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("csrt", &csrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/cstates/cstates.c b/src/acpi/cstates/cstates.c > index 5433956d..45073c15 100644 > --- a/src/acpi/cstates/cstates.c > +++ b/src/acpi/cstates/cstates.c > @@ -255,6 +255,6 @@ static fwts_framework_ops cstates_ops = { > .minor_tests = cstates_tests > }; > > -FWTS_REGISTER("cstates", &cstates_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("cstates", &cstates_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/dbg2/dbg2.c b/src/acpi/dbg2/dbg2.c > index d345a65a..3c8105a1 100644 > --- a/src/acpi/dbg2/dbg2.c > +++ b/src/acpi/dbg2/dbg2.c > @@ -41,7 +41,7 @@ static int dbg2_init(fwts_framework *fw) > return FWTS_ERROR; > } > if (table == NULL || (table && table->length == 0)) { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_log_error(fw, > "ACPI DBG2 table does not exist"); > return FWTS_ERROR; > @@ -59,7 +59,7 @@ static int dbg2_test2(fwts_framework *fw) > { > uint32_t i; > > - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) > + if (!(fw->flags & FWTS_FLAG_SBBR)) > return FWTS_SKIP; > > fwts_acpi_table_dbg2 *dbg2 = (fwts_acpi_table_dbg2 *)table->data; > @@ -389,6 +389,6 @@ static fwts_framework_ops dbg2_ops = { > .minor_tests = dbg2_tests > }; > > -FWTS_REGISTER("dbg2", &dbg2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("dbg2", &dbg2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/dbgp/dbgp.c b/src/acpi/dbgp/dbgp.c > index dc45f4d5..906ef1e4 100644 > --- a/src/acpi/dbgp/dbgp.c > +++ b/src/acpi/dbgp/dbgp.c > @@ -119,6 +119,6 @@ static fwts_framework_ops dbgp_ops = { > .minor_tests = dbgp_tests > }; > > -FWTS_REGISTER("dbgp", &dbgp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("dbgp", &dbgp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/ac_adapter/ac.c b/src/acpi/devices/ac_adapter/ac.c > index 0de13b2d..4363ecd5 100644 > --- a/src/acpi/devices/ac_adapter/ac.c > +++ b/src/acpi/devices/ac_adapter/ac.c > @@ -288,6 +288,6 @@ static fwts_framework_ops acpi_ac_ops = { > .minor_tests = acpi_ac_tests > }; > > -FWTS_REGISTER("acpi_ac", &acpi_ac_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_ac", &acpi_ac_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/battery/battery.c b/src/acpi/devices/battery/battery.c > index 68d5fc7f..d5b41dc4 100644 > --- a/src/acpi/devices/battery/battery.c > +++ b/src/acpi/devices/battery/battery.c > @@ -402,6 +402,6 @@ static fwts_framework_ops acpi_battery_ops = { > .minor_tests = acpi_battery_tests > }; > > -FWTS_REGISTER("acpi_battery", &acpi_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_battery", &acpi_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/battery/smart_battery.c b/src/acpi/devices/battery/smart_battery.c > index a3246b60..2e4b8ecf 100644 > --- a/src/acpi/devices/battery/smart_battery.c > +++ b/src/acpi/devices/battery/smart_battery.c > @@ -217,6 +217,6 @@ static fwts_framework_ops smart_battery_ops = { > .minor_tests = smart_battery_tests > }; > > -FWTS_REGISTER("smart_battery", &smart_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("smart_battery", &smart_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/buttons/power_button.c b/src/acpi/devices/buttons/power_button.c > index f9781d00..b4b5ea5a 100644 > --- a/src/acpi/devices/buttons/power_button.c > +++ b/src/acpi/devices/buttons/power_button.c > @@ -198,6 +198,6 @@ static fwts_framework_ops power_button_ops = { > .minor_tests = power_button_tests > }; > > -FWTS_REGISTER("acpi_pwrb", &power_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_pwrb", &power_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/buttons/sleep_button.c b/src/acpi/devices/buttons/sleep_button.c > index a800dc84..f0a3c550 100644 > --- a/src/acpi/devices/buttons/sleep_button.c > +++ b/src/acpi/devices/buttons/sleep_button.c > @@ -170,6 +170,6 @@ static fwts_framework_ops sleep_button_ops = { > .minor_tests = sleep_button_tests > }; > > -FWTS_REGISTER("acpi_slpb", &sleep_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_slpb", &sleep_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/ec/ec.c b/src/acpi/devices/ec/ec.c > index 967797e7..bf9a07d4 100644 > --- a/src/acpi/devices/ec/ec.c > +++ b/src/acpi/devices/ec/ec.c > @@ -281,6 +281,6 @@ static fwts_framework_ops acpi_ec_ops = { > .minor_tests = acpi_ec_tests > }; > > -FWTS_REGISTER("acpi_ec", &acpi_ec_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_ec", &acpi_ec_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/lid/lid.c b/src/acpi/devices/lid/lid.c > index 136f2a61..a1fef384 100644 > --- a/src/acpi/devices/lid/lid.c > +++ b/src/acpi/devices/lid/lid.c > @@ -287,6 +287,6 @@ static fwts_framework_ops acpi_lid_ops = { > .minor_tests = acpi_lid_tests > }; > > -FWTS_REGISTER("acpi_lid", &acpi_lid_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_lid", &acpi_lid_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/nvdimm/nvdimm.c b/src/acpi/devices/nvdimm/nvdimm.c > index 1e2ac73b..34cde9f5 100644 > --- a/src/acpi/devices/nvdimm/nvdimm.c > +++ b/src/acpi/devices/nvdimm/nvdimm.c > @@ -140,6 +140,6 @@ static fwts_framework_ops acpi_nvdimm_ops = { > .minor_tests = acpi_nvdimm_tests > }; > > -FWTS_REGISTER("acpi_nvdimm", &acpi_nvdimm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_nvdimm", &acpi_nvdimm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/sensor/als.c b/src/acpi/devices/sensor/als.c > index fb363850..e1bfa236 100644 > --- a/src/acpi/devices/sensor/als.c > +++ b/src/acpi/devices/sensor/als.c > @@ -264,6 +264,6 @@ static fwts_framework_ops ambient_light_ops = { > .minor_tests = ambient_light_tests > }; > > -FWTS_REGISTER("acpi_als", &ambient_light_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_als", &ambient_light_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/time/time.c b/src/acpi/devices/time/time.c > index 79f2f784..74f8bb41 100644 > --- a/src/acpi/devices/time/time.c > +++ b/src/acpi/devices/time/time.c > @@ -406,6 +406,6 @@ static fwts_framework_ops acpi_time_alarm_ops = { > .minor_tests = acpi_time_alarm_tests > }; > > -FWTS_REGISTER("acpi_time", &acpi_time_alarm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_time", &acpi_time_alarm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/devices/wpc/wpc.c b/src/acpi/devices/wpc/wpc.c > index a74957c2..3c7a2f4e 100644 > --- a/src/acpi/devices/wpc/wpc.c > +++ b/src/acpi/devices/wpc/wpc.c > @@ -206,6 +206,6 @@ static fwts_framework_ops acpi_wpc_ops = { > .minor_tests = acpi_wpc_tests > }; > > -FWTS_REGISTER("acpi_wpc", &acpi_wpc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("acpi_wpc", &acpi_wpc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/dmar/dmar.c b/src/acpi/dmar/dmar.c > index 99cb2bf7..af9ee277 100644 > --- a/src/acpi/dmar/dmar.c > +++ b/src/acpi/dmar/dmar.c > @@ -335,6 +335,6 @@ static fwts_framework_ops dmar_ops = { > .minor_tests = dmar_tests > }; > > -FWTS_REGISTER("dmar", &dmar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_ROOT_PRIV) > +FWTS_REGISTER("dmar", &dmar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_ROOT_PRIV) > > #endif > diff --git a/src/acpi/dppt/dppt.c b/src/acpi/dppt/dppt.c > index 5033583b..e85b385b 100644 > --- a/src/acpi/dppt/dppt.c > +++ b/src/acpi/dppt/dppt.c > @@ -55,6 +55,6 @@ static fwts_framework_ops dppt_ops = { > .minor_tests = dppt_tests > }; > > -FWTS_REGISTER("dppt", &dppt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("dppt", &dppt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/drtm/drtm.c b/src/acpi/drtm/drtm.c > index cbfa2076..0804f0aa 100644 > --- a/src/acpi/drtm/drtm.c > +++ b/src/acpi/drtm/drtm.c > @@ -145,6 +145,6 @@ static fwts_framework_ops drtm_ops = { > .minor_tests = drtm_tests > }; > > -FWTS_REGISTER("drtm", &drtm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("drtm", &drtm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/ecdt/ecdt.c b/src/acpi/ecdt/ecdt.c > index 359a817b..cc600ad0 100644 > --- a/src/acpi/ecdt/ecdt.c > +++ b/src/acpi/ecdt/ecdt.c > @@ -186,6 +186,6 @@ static fwts_framework_ops ecdt_ops = { > .minor_tests = ecdt_tests > }; > > -FWTS_REGISTER("ecdt", &ecdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("ecdt", &ecdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/einj/einj.c b/src/acpi/einj/einj.c > index 36fa01dd..37fb521a 100644 > --- a/src/acpi/einj/einj.c > +++ b/src/acpi/einj/einj.c > @@ -123,7 +123,6 @@ static fwts_framework_ops einj_ops = { > .minor_tests = einj_tests > }; > > -FWTS_REGISTER("einj", &einj_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | > - FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("einj", &einj_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/erst/erst.c b/src/acpi/erst/erst.c > index b67e5691..2e77c82b 100644 > --- a/src/acpi/erst/erst.c > +++ b/src/acpi/erst/erst.c > @@ -173,6 +173,6 @@ static fwts_framework_ops erst_ops = { > .minor_tests = erst_tests > }; > > -FWTS_REGISTER("erst", &erst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("erst", &erst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/facs/facs.c b/src/acpi/facs/facs.c > index 335253fb..ca6827c4 100644 > --- a/src/acpi/facs/facs.c > +++ b/src/acpi/facs/facs.c > @@ -145,6 +145,6 @@ static fwts_framework_ops facs_ops = { > .minor_tests = facs_tests > }; > > -FWTS_REGISTER("facs", &facs_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("facs", &facs_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/fadt/fadt.c b/src/acpi/fadt/fadt.c > index 4c35c849..0677a690 100644 > --- a/src/acpi/fadt/fadt.c > +++ b/src/acpi/fadt/fadt.c > @@ -1855,6 +1855,5 @@ static fwts_framework_ops fadt_ops = { > }; > > FWTS_REGISTER("fadt", &fadt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | > - FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI | > - FWTS_FLAG_TEST_COMPLIANCE_ACPI) > + FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_ACPI | FWTS_FLAG_COMPLIANCE_ACPI) > #endif > diff --git a/src/acpi/fpdt/fpdt.c b/src/acpi/fpdt/fpdt.c > index ce3257e5..7408c8a9 100644 > --- a/src/acpi/fpdt/fpdt.c > +++ b/src/acpi/fpdt/fpdt.c > @@ -194,6 +194,6 @@ static fwts_framework_ops fpdt_ops = { > .minor_tests = fpdt_tests > }; > > -FWTS_REGISTER("fpdt", &fpdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("fpdt", &fpdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/gtdt/gtdt.c b/src/acpi/gtdt/gtdt.c > index 270ade37..8cd41632 100644 > --- a/src/acpi/gtdt/gtdt.c > +++ b/src/acpi/gtdt/gtdt.c > @@ -35,7 +35,7 @@ static int gtdt_init(fwts_framework *fw) > return FWTS_ERROR; > } > if (table == NULL || (table && table->length == 0)) { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_log_error(fw, "ACPI GTDT table does not exist"); > return FWTS_ERROR; > } else { > @@ -276,6 +276,6 @@ static fwts_framework_ops gtdt_ops = { > .minor_tests = gtdt_tests > }; > > -FWTS_REGISTER("gtdt", >dt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("gtdt", >dt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/hest/hest.c b/src/acpi/hest/hest.c > index ce502cd4..bff25bc3 100644 > --- a/src/acpi/hest/hest.c > +++ b/src/acpi/hest/hest.c > @@ -892,6 +892,6 @@ static fwts_framework_ops hest_ops = { > .minor_tests = hest_tests > }; > > -FWTS_REGISTER("hest", &hest_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("hest", &hest_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/hmat/hmat.c b/src/acpi/hmat/hmat.c > index 86037152..ec93ce3b 100644 > --- a/src/acpi/hmat/hmat.c > +++ b/src/acpi/hmat/hmat.c > @@ -217,6 +217,6 @@ static fwts_framework_ops hmat_ops = { > .minor_tests = hmat_tests > }; > > -FWTS_REGISTER("hmat", &hmat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("hmat", &hmat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/hpet/hpet.c b/src/acpi/hpet/hpet.c > index 9e024757..2295b989 100644 > --- a/src/acpi/hpet/hpet.c > +++ b/src/acpi/hpet/hpet.c > @@ -476,6 +476,6 @@ static fwts_framework_ops hpet_check_ops = { > }; > > FWTS_REGISTER("hpet", &hpet_check_ops, FWTS_TEST_ANYTIME, > - FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI) > + FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/iort/iort.c b/src/acpi/iort/iort.c > index 0a828de6..9881bf94 100644 > --- a/src/acpi/iort/iort.c > +++ b/src/acpi/iort/iort.c > @@ -715,6 +715,6 @@ static fwts_framework_ops iort_ops = { > .minor_tests = iort_tests > }; > > -FWTS_REGISTER("iort", &iort_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("iort", &iort_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/lpit/lpit.c b/src/acpi/lpit/lpit.c > index 40fbe687..5e5a7861 100644 > --- a/src/acpi/lpit/lpit.c > +++ b/src/acpi/lpit/lpit.c > @@ -221,6 +221,6 @@ static fwts_framework_ops lpit_ops = { > .minor_tests = lpit_tests > }; > > -FWTS_REGISTER("lpit", &lpit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("lpit", &lpit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/madt/madt.c b/src/acpi/madt/madt.c > index 7455c964..dd835392 100644 > --- a/src/acpi/madt/madt.c > +++ b/src/acpi/madt/madt.c > @@ -385,7 +385,7 @@ static int madt_init(fwts_framework *fw) > > fadt_major = fadt->header.revision; > fadt_minor = 0; > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > if (fadt_major < SBBR_ACPI_MAJOR_VERSION) { > fwts_log_error(fw, "SBBR support starts with ACPI v6.0," > " Current revision is outdated: %" PRIu8 ".%" PRIu8, > @@ -1547,7 +1547,7 @@ static int madt_subtables(fwts_framework *fw) > hdr->type, madt_sub_names[type]); > } > > - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) { > + if (!(fw->flags & FWTS_FLAG_SBBR)) { > bool passed = true; > > /* verify that the length is what we expect */ > @@ -1698,7 +1698,7 @@ static int madt_subtables(fwts_framework *fw) > length -= skip; > } > > - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) { > + if (!(fw->flags & FWTS_FLAG_SBBR)) { > /* run comparison tests */ > madt_ioapic_sapic_compare(fw, num_ioapics, num_iosapics); > } > @@ -1734,6 +1734,6 @@ static fwts_framework_ops madt_ops = { > .minor_tests = madt_tests > }; > > -FWTS_REGISTER("madt", &madt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_COMPLIANCE_ACPI | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("madt", &madt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_COMPLIANCE_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/mcfg/mcfg.c b/src/acpi/mcfg/mcfg.c > index 35f07fb3..7cef0f43 100644 > --- a/src/acpi/mcfg/mcfg.c > +++ b/src/acpi/mcfg/mcfg.c > @@ -252,6 +252,6 @@ static fwts_framework_ops mcfg_ops = { > .minor_tests = mcfg_tests > }; > > -FWTS_REGISTER("mcfg", &mcfg_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("mcfg", &mcfg_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/mchi/mchi.c b/src/acpi/mchi/mchi.c > index 2a1732d9..e34f3636 100644 > --- a/src/acpi/mchi/mchi.c > +++ b/src/acpi/mchi/mchi.c > @@ -209,6 +209,6 @@ static fwts_framework_ops mchi_ops = { > .minor_tests = mchi_tests > }; > > -FWTS_REGISTER("mchi", &mchi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("mchi", &mchi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c > index 1c9203dd..9832c4e1 100644 > --- a/src/acpi/method/method.c > +++ b/src/acpi/method/method.c > @@ -566,7 +566,7 @@ static void method_test_AEI_return( > > static int method_test_AEI(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, > "_AEI", NULL, 0, method_test_AEI_return, NULL); > else > @@ -655,7 +655,7 @@ static int method_test_EVT(fwts_framework *fw) > int ret; > > /* Only test the _EVT method with pins defined in AEI. */ > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > ret = method_evaluate_method(fw, METHOD_MANDATORY | METHOD_SILENT, > "_AEI", NULL, 0, method_test_EVT_return, NULL); > else > @@ -761,7 +761,7 @@ static int method_test_DDN(fwts_framework *fw) > > static int method_test_HID(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, > "_HID", NULL, 0, fwts_method_test_HID_return, NULL); > else > @@ -812,7 +812,7 @@ static int method_test_SUN(fwts_framework *fw) > > static int method_test_UID(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, > "_UID", NULL, 0, fwts_method_test_UID_return, NULL); > else > @@ -1109,7 +1109,7 @@ static int method_test_SLI(fwts_framework *fw) > /* Section 6.2.17 _CCA */ > static int method_test_CCA(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, > "_CCA", NULL, 0, fwts_method_test_passed_failed_return, "_CCA"); > else > @@ -1169,7 +1169,7 @@ static int method_test_RMV(fwts_framework *fw) > > static int method_test_STA(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, "_STA", > NULL, 0, fwts_method_test_STA_return, "_STA"); > else > @@ -2670,7 +2670,7 @@ static int method_test_SST(fwts_framework *fw) > ret = method_evaluate_method(fw, METHOD_OPTIONAL, > "_SST", arg, 1, fwts_method_test_NULL_return, NULL); > > - if (ret == FWTS_NOT_EXIST && (fw->flags & FWTS_FLAG_TEST_SBBR)) { > + if (ret == FWTS_NOT_EXIST && (fw->flags & FWTS_FLAG_SBBR)) { > fwts_warning(fw, "_SST method not found. This should be treated as error " > "if the platform provides user visible status such as LED."); > } > @@ -4340,7 +4340,7 @@ static int method_test_VPO(fwts_framework *fw) > > static int method_test_ADR(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return method_evaluate_method(fw, METHOD_MANDATORY, > "_ADR", NULL, 0, fwts_method_test_integer_return, NULL); > else > @@ -5028,6 +5028,6 @@ static fwts_framework_ops method_ops = { > }; > > FWTS_REGISTER("method", &method_ops, FWTS_TEST_ANYTIME, > - FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > + FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/mpst/mpst.c b/src/acpi/mpst/mpst.c > index 4cf4bc10..3ce4ca9d 100644 > --- a/src/acpi/mpst/mpst.c > +++ b/src/acpi/mpst/mpst.c > @@ -188,6 +188,6 @@ static fwts_framework_ops mpst_ops = { > .minor_tests = mpst_tests > }; > > -FWTS_REGISTER("mpst", &mpst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("mpst", &mpst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/msct/msct.c b/src/acpi/msct/msct.c > index 168e7a4b..3764e5e9 100644 > --- a/src/acpi/msct/msct.c > +++ b/src/acpi/msct/msct.c > @@ -116,6 +116,6 @@ static fwts_framework_ops msct_ops = { > }; > > FWTS_REGISTER("msct", &msct_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | > - FWTS_FLAG_TEST_ACPI) > + FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/msdm/msdm.c b/src/acpi/msdm/msdm.c > index b9b60ec6..008d050d 100644 > --- a/src/acpi/msdm/msdm.c > +++ b/src/acpi/msdm/msdm.c > @@ -134,6 +134,6 @@ static fwts_framework_ops msdm_ops = { > .minor_tests = msdm_tests > }; > > -FWTS_REGISTER("msdm", &msdm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("msdm", &msdm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/nfit/nfit.c b/src/acpi/nfit/nfit.c > index 71fb0bea..0ffacd1e 100644 > --- a/src/acpi/nfit/nfit.c > +++ b/src/acpi/nfit/nfit.c > @@ -537,6 +537,6 @@ static fwts_framework_ops nfit_ops = { > .minor_tests = nfit_tests > }; > > -FWTS_REGISTER("nfit", &nfit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("nfit", &nfit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/pcc/pcc.c b/src/acpi/pcc/pcc.c > index 8eb71caf..96286e23 100644 > --- a/src/acpi/pcc/pcc.c > +++ b/src/acpi/pcc/pcc.c > @@ -471,6 +471,6 @@ static fwts_framework_ops pcc_ops = { > .minor_tests = pcc_tests > }; > > -FWTS_REGISTER("pcc", &pcc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("pcc", &pcc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/pcct/pcct.c b/src/acpi/pcct/pcct.c > index 9cbbc54b..cec21f38 100644 > --- a/src/acpi/pcct/pcct.c > +++ b/src/acpi/pcct/pcct.c > @@ -333,6 +333,6 @@ static fwts_framework_ops pcct_ops = { > .minor_tests = pcct_tests > }; > > -FWTS_REGISTER("pcct", &pcct_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("pcct", &pcct_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/pdtt/pdtt.c b/src/acpi/pdtt/pdtt.c > index 93baacbf..061878ab 100644 > --- a/src/acpi/pdtt/pdtt.c > +++ b/src/acpi/pdtt/pdtt.c > @@ -94,6 +94,6 @@ static fwts_framework_ops pdtt_ops = { > .minor_tests = pdtt_tests > }; > > -FWTS_REGISTER("pdtt", &pdtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("pdtt", &pdtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/phat/phat.c b/src/acpi/phat/phat.c > index e8ab09c7..4810b15c 100644 > --- a/src/acpi/phat/phat.c > +++ b/src/acpi/phat/phat.c > @@ -167,6 +167,6 @@ static fwts_framework_ops phat_ops = { > .minor_tests = phat_tests > }; > > -FWTS_REGISTER("phat", &phat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("phat", &phat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/pmtt/pmtt.c b/src/acpi/pmtt/pmtt.c > index 86e46c6d..7515730b 100644 > --- a/src/acpi/pmtt/pmtt.c > +++ b/src/acpi/pmtt/pmtt.c > @@ -225,6 +225,6 @@ static fwts_framework_ops pmtt_ops = { > .minor_tests = pmtt_tests > }; > > -FWTS_REGISTER("pmtt", &pmtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("pmtt", &pmtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/pptt/pptt.c b/src/acpi/pptt/pptt.c > index bc11fcb0..8a126ff9 100644 > --- a/src/acpi/pptt/pptt.c > +++ b/src/acpi/pptt/pptt.c > @@ -178,6 +178,6 @@ static fwts_framework_ops pptt_ops = { > .minor_tests = pptt_tests > }; > > -FWTS_REGISTER("pptt", &pptt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("pptt", &pptt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/rasf/rasf.c b/src/acpi/rasf/rasf.c > index 05f02de8..dc44a58a 100644 > --- a/src/acpi/rasf/rasf.c > +++ b/src/acpi/rasf/rasf.c > @@ -64,6 +64,6 @@ static fwts_framework_ops rasf_ops = { > .minor_tests = rasf_tests > }; > > -FWTS_REGISTER("rasf", &rasf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("rasf", &rasf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/rsdp/rsdp.c b/src/acpi/rsdp/rsdp.c > index ac53ece2..d43a9d85 100644 > --- a/src/acpi/rsdp/rsdp.c > +++ b/src/acpi/rsdp/rsdp.c > @@ -226,6 +226,6 @@ static fwts_framework_ops rsdp_ops = { > }; > > FWTS_REGISTER("rsdp", &rsdp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | > - FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_COMPLIANCE_ACPI) > + FWTS_FLAG_ACPI | FWTS_FLAG_COMPLIANCE_ACPI) > > #endif > diff --git a/src/acpi/rsdt/rsdt.c b/src/acpi/rsdt/rsdt.c > index 0298e093..4f08f9b7 100644 > --- a/src/acpi/rsdt/rsdt.c > +++ b/src/acpi/rsdt/rsdt.c > @@ -70,6 +70,6 @@ static fwts_framework_ops rsdt_ops = { > .minor_tests = rsdt_tests > }; > > -FWTS_REGISTER("rsdt", &rsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("rsdt", &rsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/sbst/sbst.c b/src/acpi/sbst/sbst.c > index 81c8179b..51660b07 100644 > --- a/src/acpi/sbst/sbst.c > +++ b/src/acpi/sbst/sbst.c > @@ -80,6 +80,6 @@ static fwts_framework_ops sbst_ops = { > .minor_tests = sbst_tests > }; > > -FWTS_REGISTER("sbst", &sbst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("sbst", &sbst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/sdei/sdei.c b/src/acpi/sdei/sdei.c > index 1c94028b..d7fd513f 100644 > --- a/src/acpi/sdei/sdei.c > +++ b/src/acpi/sdei/sdei.c > @@ -68,6 +68,6 @@ static fwts_framework_ops sdei_ops = { > .minor_tests = sdei_tests > }; > > -FWTS_REGISTER("sdei", &sdei_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("sdei", &sdei_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/sdev/sdev.c b/src/acpi/sdev/sdev.c > index 0542d858..a115ebc8 100644 > --- a/src/acpi/sdev/sdev.c > +++ b/src/acpi/sdev/sdev.c > @@ -129,6 +129,6 @@ static fwts_framework_ops sdev_ops = { > .minor_tests = sdev_tests > }; > > -FWTS_REGISTER("sdev", &sdev_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("sdev", &sdev_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/slic/slic.c b/src/acpi/slic/slic.c > index f244b775..b4f32435 100644 > --- a/src/acpi/slic/slic.c > +++ b/src/acpi/slic/slic.c > @@ -160,6 +160,6 @@ static fwts_framework_ops slic_ops = { > .minor_tests = slic_tests > }; > > -FWTS_REGISTER("slic", &slic_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("slic", &slic_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/slit/slit.c b/src/acpi/slit/slit.c > index 8cdebb3f..1115e11b 100644 > --- a/src/acpi/slit/slit.c > +++ b/src/acpi/slit/slit.c > @@ -168,6 +168,6 @@ static fwts_framework_ops slit_ops = { > .minor_tests = slit_tests > }; > > -FWTS_REGISTER("slit", &slit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("slit", &slit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/spcr/spcr.c b/src/acpi/spcr/spcr.c > index 626144bf..a1318f02 100644 > --- a/src/acpi/spcr/spcr.c > +++ b/src/acpi/spcr/spcr.c > @@ -37,7 +37,7 @@ static int spcr_init(fwts_framework *fw) > return FWTS_ERROR; > } > if (table == NULL || (table && table->length == 0)) { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_log_error(fw, "ACPI SPCR table does not exist"); > return FWTS_ERROR; > } else { > @@ -57,7 +57,7 @@ static int spcr_init(fwts_framework *fw) > */ > static int spcr_sbbr_revision_test(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > const uint8_t SBBR_LATEST_REVISION = 2; > > if (spcr->header.revision >= SBBR_LATEST_REVISION) > @@ -72,7 +72,7 @@ static int spcr_sbbr_revision_test(fwts_framework *fw) > > static int spcr_sbbr_gsiv_test(fwts_framework *fw) > { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > const uint8_t ARMH_GIC_INTR_MASK = 0x08; > const uint8_t IO_APIC_INTR_MASK = 0x02; > > @@ -296,6 +296,6 @@ static fwts_framework_ops spcr_ops = { > .minor_tests = spcr_tests > }; > > -FWTS_REGISTER("spcr", &spcr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("spcr", &spcr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/acpi/spmi/spmi.c b/src/acpi/spmi/spmi.c > index 0dc7d08b..10d4c95b 100644 > --- a/src/acpi/spmi/spmi.c > +++ b/src/acpi/spmi/spmi.c > @@ -180,6 +180,6 @@ static fwts_framework_ops spmi_ops = { > .minor_tests = spmi_tests > }; > > -FWTS_REGISTER("spmi", &spmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("spmi", &spmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/srat/srat.c b/src/acpi/srat/srat.c > index eaad90ca..008aeb2f 100644 > --- a/src/acpi/srat/srat.c > +++ b/src/acpi/srat/srat.c > @@ -401,6 +401,6 @@ static fwts_framework_ops srat_ops = { > .minor_tests = srat_tests > }; > > -FWTS_REGISTER("srat", &srat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("srat", &srat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/stao/stao.c b/src/acpi/stao/stao.c > index c0c24865..1bfbf8dd 100644 > --- a/src/acpi/stao/stao.c > +++ b/src/acpi/stao/stao.c > @@ -144,6 +144,6 @@ static fwts_framework_ops stao_ops = { > .minor_tests = stao_tests > }; > > -FWTS_REGISTER("stao", &stao_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("stao", &stao_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/tcpa/tcpa.c b/src/acpi/tcpa/tcpa.c > index 2abafba1..208aceee 100644 > --- a/src/acpi/tcpa/tcpa.c > +++ b/src/acpi/tcpa/tcpa.c > @@ -155,6 +155,6 @@ static fwts_framework_ops tcpa_ops = { > .minor_tests = tcpa_tests > }; > > -FWTS_REGISTER("tcpa", &tcpa_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("tcpa", &tcpa_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/tpm2/tpm2.c b/src/acpi/tpm2/tpm2.c > index ae4da486..7aef8887 100644 > --- a/src/acpi/tpm2/tpm2.c > +++ b/src/acpi/tpm2/tpm2.c > @@ -97,6 +97,6 @@ static fwts_framework_ops tpm2_ops = { > .minor_tests = tpm2_tests > }; > > -FWTS_REGISTER("tpm2", &tpm2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("tpm2", &tpm2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/uefi/uefi.c b/src/acpi/uefi/uefi.c > index 93a12b6e..eef08cc6 100644 > --- a/src/acpi/uefi/uefi.c > +++ b/src/acpi/uefi/uefi.c > @@ -115,6 +115,6 @@ static fwts_framework_ops uefi_ops = { > .minor_tests = uefi_tests > }; > > -FWTS_REGISTER("uefi", &uefi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("uefi", &uefi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/waet/waet.c b/src/acpi/waet/waet.c > index 6d283c12..a239e26c 100644 > --- a/src/acpi/waet/waet.c > +++ b/src/acpi/waet/waet.c > @@ -73,6 +73,6 @@ static fwts_framework_ops waet_ops = { > .minor_tests = waet_tests > }; > > -FWTS_REGISTER("waet", &waet_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("waet", &waet_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/wdat/wdat.c b/src/acpi/wdat/wdat.c > index c5f806e0..92357bad 100644 > --- a/src/acpi/wdat/wdat.c > +++ b/src/acpi/wdat/wdat.c > @@ -203,6 +203,6 @@ static fwts_framework_ops wdat_ops = { > .minor_tests = wdat_tests > }; > > -FWTS_REGISTER("wdat", &wdat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("wdat", &wdat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/wmi/wmi.c b/src/acpi/wmi/wmi.c > index c87df22e..93c3c9e8 100644 > --- a/src/acpi/wmi/wmi.c > +++ b/src/acpi/wmi/wmi.c > @@ -426,6 +426,6 @@ static fwts_framework_ops wmi_ops = { > .minor_tests = wmi_tests > }; > > -FWTS_REGISTER("wmi", &wmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("wmi", &wmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/wpbt/wpbt.c b/src/acpi/wpbt/wpbt.c > index 74c00a05..b97808f4 100644 > --- a/src/acpi/wpbt/wpbt.c > +++ b/src/acpi/wpbt/wpbt.c > @@ -80,6 +80,6 @@ static fwts_framework_ops wpbt_ops = { > .minor_tests = wpbt_tests > }; > > -FWTS_REGISTER("wpbt", &wpbt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("wpbt", &wpbt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/wsmt/wsmt.c b/src/acpi/wsmt/wsmt.c > index 18bfbdd9..5b55c5c6 100644 > --- a/src/acpi/wsmt/wsmt.c > +++ b/src/acpi/wsmt/wsmt.c > @@ -70,6 +70,6 @@ static fwts_framework_ops wsmt_ops = { > .minor_tests = wsmt_tests > }; > > -FWTS_REGISTER("wsmt", &wsmt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > +FWTS_REGISTER("wsmt", &wsmt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/xenv/xenv.c b/src/acpi/xenv/xenv.c > index 0aac43d6..20a4eefb 100644 > --- a/src/acpi/xenv/xenv.c > +++ b/src/acpi/xenv/xenv.c > @@ -71,6 +71,6 @@ static fwts_framework_ops xenv_check_ops = { > }; > > FWTS_REGISTER("xenv", &xenv_check_ops, FWTS_TEST_ANYTIME, > - FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) > + FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) > > #endif > diff --git a/src/acpi/xsdt/xsdt.c b/src/acpi/xsdt/xsdt.c > index cec7e651..31ede781 100644 > --- a/src/acpi/xsdt/xsdt.c > +++ b/src/acpi/xsdt/xsdt.c > @@ -35,7 +35,7 @@ static int xsdt_init(fwts_framework *fw) > return FWTS_ERROR; > } > if (table == NULL || (table && table->length == 0)) { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_log_error(fw, "ACPI XSDT table does not exist"); > return FWTS_ERROR; > } else { > @@ -59,7 +59,7 @@ static int xsdt_test1(fwts_framework *fw) > for (i = 0; i < n; i++) { > if (xsdt->entries[i] == 0) { > passed = false; > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_failed(fw, LOG_LEVEL_CRITICAL, > "XSDTEntryNull", > "XSDT Entry %zd is null, should not be non-zero.", i); > @@ -78,7 +78,7 @@ static int xsdt_test1(fwts_framework *fw) > } > } > if (passed) { > - if (fw->flags & FWTS_FLAG_TEST_SBBR) { > + if (fw->flags & FWTS_FLAG_SBBR) { > fwts_passed(fw, "XSDT is present, pointed at by XsdrAddress=0x%" PRIx64 > " and contain valid pointers to %d other ACPI tables mandated by SBBR", > xsdt->entries[0], (int)n); > @@ -100,6 +100,6 @@ static fwts_framework_ops xsdt_ops = { > .minor_tests = xsdt_tests > }; > > -FWTS_REGISTER("xsdt", &xsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("xsdt", &xsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c > index a2403653..fa685414 100644 > --- a/src/dmi/dmicheck/dmicheck.c > +++ b/src/dmi/dmicheck/dmicheck.c > @@ -787,7 +787,7 @@ static int dmicheck_test1(fwts_framework *fw) > } > > if (!smbios30_found) { > - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) { > + if (!(fw->flags & FWTS_FLAG_SBBR)) { > if (smbios_found) > return FWTS_OK; > } > @@ -2172,7 +2172,7 @@ static void dmi_scan_smbios30_table(fwts_framework *fw, > > if ((next_entry - table) <= table_max_length) { > dmicheck_entry(fw, addr, &hdr, smbios_version); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > sbbr_test_entry_check(&hdr); > } > else { > @@ -2197,7 +2197,7 @@ static int dmicheck_test2(fwts_framework *fw) > uint16_t version = 0; > uint8_t *table; > > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > return FWTS_SKIP; > > if (!smbios_found) { > @@ -2271,7 +2271,7 @@ static int dmicheck_test4(fwts_framework *fw) > { > uint32_t i; > > - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) > + if (!(fw->flags & FWTS_FLAG_SBBR)) > return FWTS_SKIP; > > if (!smbios30_found) { > @@ -2309,6 +2309,6 @@ static fwts_framework_ops dmicheck_ops = { > .minor_tests = dmicheck_tests > }; > > -FWTS_REGISTER("dmicheck", &dmicheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("dmicheck", &dmicheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_SBBR) > > #endif > diff --git a/src/lib/include/fwts_framework.h b/src/lib/include/fwts_framework.h > index 31418a93..4d7eb191 100644 > --- a/src/lib/include/fwts_framework.h > +++ b/src/lib/include/fwts_framework.h > @@ -54,25 +54,18 @@ typedef enum { > FWTS_FLAG_ROOT_PRIV = 0x00002000, > FWTS_FLAG_UNSAFE = 0x00004000, > FWTS_FLAG_FIRMWARE_VENDOR = 0x00008000, > - FWTS_FLAG_TEST_BIOS = 0x00010000, > - FWTS_FLAG_TEST_UEFI = 0x00020000, > - FWTS_FLAG_TEST_ACPI = 0x00040000, > + FWTS_FLAG_UEFI = 0x00020000, > + FWTS_FLAG_ACPI = 0x00040000, > FWTS_FLAG_UTILS = 0x00080000, > FWTS_FLAG_QUIET = 0x00100000, > FWTS_FLAG_SHOW_TESTS_FULL = 0x00200000, > FWTS_FLAG_SHOW_TESTS_CATEGORIES = 0x00400000, > - FWTS_FLAG_TEST_COMPLIANCE_ACPI = 0x00800000, > - FWTS_FLAG_TEST_SBBR = 0x01000000, > - FWTS_FLAG_TEST_EBBR = 0x02000000, > - FWTS_FLAG_TEST_XBBR = FWTS_FLAG_TEST_SBBR | FWTS_FLAG_TEST_EBBR > + FWTS_FLAG_COMPLIANCE_ACPI = 0x00800000, > + FWTS_FLAG_SBBR = 0x01000000, > + FWTS_FLAG_EBBR = 0x02000000, > + FWTS_FLAG_XBBR = FWTS_FLAG_SBBR | FWTS_FLAG_EBBR > } fwts_framework_flags; > > -#define FWTS_FLAG_TEST_MASK \ > - (FWTS_FLAG_TEST_BIOS | \ > - FWTS_FLAG_TEST_UEFI | \ > - FWTS_FLAG_TEST_ACPI | \ > - FWTS_FLAG_TEST_SBBR) > - > /* > * Test results > */ > diff --git a/src/lib/src/fwts_acpi_object_eval.c b/src/lib/src/fwts_acpi_object_eval.c > index 013540f9..4923748c 100644 > --- a/src/lib/src/fwts_acpi_object_eval.c > +++ b/src/lib/src/fwts_acpi_object_eval.c > @@ -1562,7 +1562,7 @@ static void method_test_CRS_mif_maf( > if (len == 0) { > if ((mif == 1) && (maf == 1)) { > snprintf(tmp, sizeof(tmp), "Method%s%sMifMafBothOne", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s _MIF and _MAF flags are both " > "set to one which is invalid when " > @@ -1591,7 +1591,7 @@ static void method_test_CRS_mif_maf( > *passed = false; > } else if (min % tmpgran != 0) { > snprintf(tmp, sizeof(tmp), "Method%s%sMinNotMultipleOfGran", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s _MIN address is not a multiple " > "of the granularity when _MIF is 1.", > @@ -1618,7 +1618,7 @@ static void method_test_CRS_mif_maf( > *passed = false; > } else if (max % tmpgran != 0) { > snprintf(tmp, sizeof(tmp), "Method%s%sMaxNotMultipleOfGran", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s _MAX address is not a multiple " > "of the granularity when _MAF is 1.", > @@ -1637,7 +1637,7 @@ static void method_test_CRS_mif_maf( > if ((mif == 0) && (maf == 0) && > (len % (granularity + 1) != 0)) { > snprintf(tmp, sizeof(tmp), "Method%s%sLenNotMultipleOfGran", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s length is not a multiple " > "of the granularity when _MIF " > @@ -1655,7 +1655,7 @@ static void method_test_CRS_mif_maf( > } > if (((mif == 0) && (maf == 1)) || ((mif == 1) && (maf == 0))) { > snprintf(tmp, sizeof(tmp), "Method%s%sMifMafInvalid", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s _MIF and _MAF flags are either " > "0 and 1 or 1 and 0 which is invalid when " > @@ -1674,7 +1674,7 @@ static void method_test_CRS_mif_maf( > if ((mif == 1) && (maf == 1)) { > if (granularity != 0) { > snprintf(tmp, sizeof(tmp), "Method%s%sGranularityNotZero", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s granularity 0x%" PRIx64 > " is not zero as expected when " > @@ -1692,7 +1692,7 @@ static void method_test_CRS_mif_maf( > } > if (min > max) { > snprintf(tmp, sizeof(tmp), "Method%s%sMaxLessThanMin", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s minimum address range 0x%" PRIx64 > " is greater than the maximum address " > @@ -1710,7 +1710,7 @@ static void method_test_CRS_mif_maf( > } > if (max - min + 1 != len) { > snprintf(tmp, sizeof(tmp), "Method%s%sLengthInvalid", objname, tag); > - if (fw->flags & FWTS_FLAG_TEST_SBBR) > + if (fw->flags & FWTS_FLAG_SBBR) > fwts_warning(fw, tmp, > "%s %s length 0x%" PRIx64 > " does not match the difference between " > diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c > index 1f139a7e..076a5516 100644 > --- a/src/lib/src/fwts_framework.c > +++ b/src/lib/src/fwts_framework.c > @@ -55,24 +55,24 @@ typedef struct { > FWTS_FLAG_POWER_STATES | \ > FWTS_FLAG_UTILS | \ > FWTS_FLAG_UNSAFE | \ > - FWTS_FLAG_TEST_UEFI | \ > - FWTS_FLAG_TEST_ACPI | \ > - FWTS_FLAG_TEST_COMPLIANCE_ACPI | \ > - FWTS_FLAG_TEST_SBBR | \ > - FWTS_FLAG_TEST_EBBR) > + FWTS_FLAG_UEFI | \ > + FWTS_FLAG_ACPI | \ > + FWTS_FLAG_COMPLIANCE_ACPI | \ > + FWTS_FLAG_SBBR | \ > + FWTS_FLAG_EBBR) > > static const fwts_categories categories[] = { > - { "ACPI", FWTS_FLAG_TEST_ACPI }, > + { "ACPI", FWTS_FLAG_ACPI }, > { "Batch", FWTS_FLAG_BATCH }, > { "Interactive", FWTS_FLAG_INTERACTIVE }, > { "Batch Experimental", FWTS_FLAG_BATCH_EXPERIMENTAL }, > { "Interactive Experimental", FWTS_FLAG_INTERACTIVE_EXPERIMENTAL }, > { "Power States", FWTS_FLAG_POWER_STATES }, > - { "SBBR", FWTS_FLAG_TEST_SBBR }, > + { "SBBR", FWTS_FLAG_SBBR }, > { "Utilities", FWTS_FLAG_UTILS }, > { "Unsafe", FWTS_FLAG_UNSAFE }, > - { "UEFI", FWTS_FLAG_TEST_UEFI }, > - { "ACPI Spec Compliance", FWTS_FLAG_TEST_COMPLIANCE_ACPI }, > + { "UEFI", FWTS_FLAG_UEFI }, > + { "ACPI Spec Compliance", FWTS_FLAG_COMPLIANCE_ACPI }, > { NULL, 0 }, > }; > > @@ -1309,7 +1309,7 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar > return FWTS_ERROR; > break; > case 38: /* --uefitests */ > - fw->flags |= FWTS_FLAG_TEST_UEFI; > + fw->flags |= FWTS_FLAG_UEFI; > break; > case 39: /* --rsdp */ > fw->rsdp = (void *)strtoul(optarg, NULL, 0); > @@ -1322,10 +1322,10 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar > fw->flags |= FWTS_FLAG_SHOW_TESTS_CATEGORIES; > break; > case 42: /* --acpitests */ > - fw->flags |= FWTS_FLAG_TEST_ACPI; > + fw->flags |= FWTS_FLAG_ACPI; > break; > case 43: /* --acpicompliance */ > - fw->flags |= FWTS_FLAG_TEST_COMPLIANCE_ACPI; > + fw->flags |= FWTS_FLAG_COMPLIANCE_ACPI; > break; > case 44: /* --log-level */ > if (fwts_framework_ll_parse(fw, optarg) != FWTS_OK) > @@ -1337,7 +1337,7 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar > break; > case 46: /* --sbbr */ > #if defined(FWTS_ARCH_AARCH64) > - fw->flags |= FWTS_FLAG_TEST_SBBR; > + fw->flags |= FWTS_FLAG_SBBR; > break; > #else > fprintf(stderr, "option not available on this architecture\n"); > @@ -1351,7 +1351,7 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar > break; > case 49: /* --ebbr */ > #if defined(FWTS_ARCH_AARCH64) > - fw->flags |= FWTS_FLAG_TEST_EBBR; > + fw->flags |= FWTS_FLAG_EBBR; > break; > #else > fprintf(stderr, "option not available on this architecture\n"); > diff --git a/src/sbbr/acpitables/acpitables.c b/src/sbbr/acpitables/acpitables.c > index aed2908e..fa63be64 100644 > --- a/src/sbbr/acpitables/acpitables.c > +++ b/src/sbbr/acpitables/acpitables.c > @@ -262,6 +262,6 @@ static fwts_framework_ops acpi_table_sbbr_check_ops = { > .minor_tests = acpi_table_sbbr_check_tests > }; > > -FWTS_REGISTER("acpi_sbbr", &acpi_table_sbbr_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("acpi_sbbr", &acpi_table_sbbr_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_SBBR) > > #endif > diff --git a/src/sbbr/fadt/fadt.c b/src/sbbr/fadt/fadt.c > index 2c3ead40..47fa3bd7 100644 > --- a/src/sbbr/fadt/fadt.c > +++ b/src/sbbr/fadt/fadt.c > @@ -417,5 +417,5 @@ static fwts_framework_ops fadt_sbbr_ops = { > .minor_tests = fadt_sbbr_tests > }; > > -FWTS_REGISTER("fadt_sbbr", &fadt_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("fadt_sbbr", &fadt_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_SBBR) > #endif > diff --git a/src/sbbr/rsdp/rsdp.c b/src/sbbr/rsdp/rsdp.c > index e8c5aacc..b02b428f 100644 > --- a/src/sbbr/rsdp/rsdp.c > +++ b/src/sbbr/rsdp/rsdp.c > @@ -126,6 +126,6 @@ static fwts_framework_ops rsdp_sbbr_ops = { > .minor_tests = rsdp_sbbr_tests > }; > > -FWTS_REGISTER("rsdp_sbbr", &rsdp_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_SBBR) > +FWTS_REGISTER("rsdp_sbbr", &rsdp_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_SBBR) > > #endif > diff --git a/src/uefi/csm/csm.c b/src/uefi/csm/csm.c > index e2c0c927..372b2919 100644 > --- a/src/uefi/csm/csm.c > +++ b/src/uefi/csm/csm.c > @@ -120,6 +120,6 @@ static fwts_framework_ops csm_ops = { > .minor_tests = csm_tests > }; > > -FWTS_REGISTER("csm", &csm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV) > +FWTS_REGISTER("csm", &csm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV) > > #endif > diff --git a/src/uefi/esrt/esrt.c b/src/uefi/esrt/esrt.c > index 81a487e7..7193ef8c 100644 > --- a/src/uefi/esrt/esrt.c > +++ b/src/uefi/esrt/esrt.c > @@ -263,6 +263,6 @@ static fwts_framework_ops esrt_ops = { > .minor_tests = esrt_tests > }; > > -FWTS_REGISTER("esrt", &esrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_ROOT_PRIV) > +FWTS_REGISTER("esrt", &esrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_ROOT_PRIV) > > #endif > diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c > index edb5ed8f..7a0366ea 100644 > --- a/src/uefi/securebootcert/securebootcert.c > +++ b/src/uefi/securebootcert/securebootcert.c > @@ -609,6 +609,6 @@ static fwts_framework_ops securebootcert_ops = { > .minor_tests = securebootcert_tests > }; > > -FWTS_REGISTER("securebootcert", &securebootcert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) > +FWTS_REGISTER("securebootcert", &securebootcert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) > > #endif > diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c > index eaffe5f6..417d36c3 100644 > --- a/src/uefi/uefibootpath/uefibootpath.c > +++ b/src/uefi/uefibootpath/uefibootpath.c > @@ -936,6 +936,6 @@ static fwts_framework_ops uefibootpath_ops = { > .minor_tests = uefibootpath_tests > }; > > -FWTS_REGISTER("uefibootpath", &uefibootpath_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV); > +FWTS_REGISTER("uefibootpath", &uefibootpath_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV); > > #endif > diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c > index e6ab9d45..7e26694a 100644 > --- a/src/uefi/uefirtauthvar/uefirtauthvar.c > +++ b/src/uefi/uefirtauthvar/uefirtauthvar.c > @@ -796,6 +796,6 @@ static fwts_framework_ops uefirtauthvar_ops = { > .minor_tests = uefirtauthvar_tests, > }; > > -FWTS_REGISTER("uefirtauthvar", &uefirtauthvar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) > +FWTS_REGISTER("uefirtauthvar", &uefirtauthvar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) > > #endif > diff --git a/src/uefi/uefirtmisc/uefirtmisc.c b/src/uefi/uefirtmisc/uefirtmisc.c > index bddff487..c00ed442 100644 > --- a/src/uefi/uefirtmisc/uefirtmisc.c > +++ b/src/uefi/uefirtmisc/uefirtmisc.c > @@ -346,6 +346,6 @@ static fwts_framework_ops uefirtmisc_ops = { > .minor_tests = uefirtmisc_tests > }; > > -FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_XBBR) > +FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_XBBR) > > #endif > diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c > index 41503843..c1a8ae6c 100644 > --- a/src/uefi/uefirttime/uefirttime.c > +++ b/src/uefi/uefirttime/uefirttime.c > @@ -1427,6 +1427,6 @@ static fwts_framework_ops uefirttime_ops = { > .minor_tests = uefirttime_tests > }; > > -FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_XBBR) > +FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_XBBR) > > #endif > diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c > index f5aaa5fb..9f2b9dfc 100644 > --- a/src/uefi/uefirtvariable/uefirtvariable.c > +++ b/src/uefi/uefirtvariable/uefirtvariable.c > @@ -2391,6 +2391,6 @@ static fwts_framework_ops uefirtvariable_ops = { > .options_check = options_check, > }; > > -FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_XBBR) > +FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_XBBR) > > #endif > Nuce cleanup. Acked-by: Colin Ian King <colin.king@canonical.com>
diff --git a/src/acpi/acpiinfo/acpiinfo.c b/src/acpi/acpiinfo/acpiinfo.c index 2b42624b..8f521605 100644 --- a/src/acpi/acpiinfo/acpiinfo.c +++ b/src/acpi/acpiinfo/acpiinfo.c @@ -167,6 +167,6 @@ static fwts_framework_ops acpiinfo_ops = { .minor_tests = acpiinfo_tests }; -FWTS_REGISTER("acpiinfo", &acpiinfo_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpiinfo", &acpiinfo_ops, FWTS_TEST_EARLY, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c index 54722acf..67224633 100644 --- a/src/acpi/acpitables/acpitables.c +++ b/src/acpi/acpitables/acpitables.c @@ -323,6 +323,6 @@ static fwts_framework_ops acpi_table_check_ops = { }; FWTS_REGISTER("acpitables", &acpi_table_check_ops, FWTS_TEST_ANYTIME, - FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) + FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) #endif diff --git a/src/acpi/apicinstance/apicinstance.c b/src/acpi/apicinstance/apicinstance.c index 5fc2ecd7..dae0d543 100644 --- a/src/acpi/apicinstance/apicinstance.c +++ b/src/acpi/apicinstance/apicinstance.c @@ -82,6 +82,6 @@ static fwts_framework_ops apicinstance_ops = { .minor_tests = apicinstance_tests }; -FWTS_REGISTER("apicinstance", &apicinstance_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("apicinstance", &apicinstance_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/asf/asf.c b/src/acpi/asf/asf.c index 452769bb..b4acbdd1 100644 --- a/src/acpi/asf/asf.c +++ b/src/acpi/asf/asf.c @@ -540,6 +540,6 @@ static fwts_framework_ops asf_ops = { .minor_tests = asf_tests }; -FWTS_REGISTER("asf", &asf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("asf", &asf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/aspt/aspt.c b/src/acpi/aspt/aspt.c index 7c7947df..9c9db8ca 100644 --- a/src/acpi/aspt/aspt.c +++ b/src/acpi/aspt/aspt.c @@ -87,6 +87,6 @@ static fwts_framework_ops aspt_ops = { .minor_tests = aspt_tests }; -FWTS_REGISTER("aspt", &aspt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("aspt", &aspt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/bert/bert.c b/src/acpi/bert/bert.c index 45743ee0..a8ef548b 100644 --- a/src/acpi/bert/bert.c +++ b/src/acpi/bert/bert.c @@ -179,6 +179,6 @@ static fwts_framework_ops bert_ops = { .minor_tests = bert_tests }; -FWTS_REGISTER("bert", &bert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("bert", &bert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/bgrt/bgrt.c b/src/acpi/bgrt/bgrt.c index cede8ced..c3491d33 100644 --- a/src/acpi/bgrt/bgrt.c +++ b/src/acpi/bgrt/bgrt.c @@ -67,6 +67,6 @@ static fwts_framework_ops bgrt_ops = { .minor_tests = bgrt_tests }; -FWTS_REGISTER("bgrt", &bgrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("bgrt", &bgrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/boot/boot.c b/src/acpi/boot/boot.c index 8de2207f..a88b58b2 100644 --- a/src/acpi/boot/boot.c +++ b/src/acpi/boot/boot.c @@ -107,6 +107,6 @@ static fwts_framework_ops boot_ops = { .minor_tests = boot_tests }; -FWTS_REGISTER("boot", &boot_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("boot", &boot_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/checksum/checksum.c b/src/acpi/checksum/checksum.c index 54afbb3b..59a740d0 100644 --- a/src/acpi/checksum/checksum.c +++ b/src/acpi/checksum/checksum.c @@ -157,6 +157,6 @@ static fwts_framework_ops checksum_ops = { .minor_tests = checksum_tests }; -FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("checksum", &checksum_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/cpep/cpep.c b/src/acpi/cpep/cpep.c index f76b6b5e..4aa075dd 100644 --- a/src/acpi/cpep/cpep.c +++ b/src/acpi/cpep/cpep.c @@ -101,6 +101,6 @@ static fwts_framework_ops cpep_ops = { .minor_tests = cpep_tests }; -FWTS_REGISTER("cpep", &cpep_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("cpep", &cpep_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/csrt/csrt.c b/src/acpi/csrt/csrt.c index e5708af0..9818faac 100644 --- a/src/acpi/csrt/csrt.c +++ b/src/acpi/csrt/csrt.c @@ -231,6 +231,6 @@ static fwts_framework_ops csrt_ops = { .minor_tests = csrt_tests }; -FWTS_REGISTER("csrt", &csrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("csrt", &csrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/cstates/cstates.c b/src/acpi/cstates/cstates.c index 5433956d..45073c15 100644 --- a/src/acpi/cstates/cstates.c +++ b/src/acpi/cstates/cstates.c @@ -255,6 +255,6 @@ static fwts_framework_ops cstates_ops = { .minor_tests = cstates_tests }; -FWTS_REGISTER("cstates", &cstates_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("cstates", &cstates_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/dbg2/dbg2.c b/src/acpi/dbg2/dbg2.c index d345a65a..3c8105a1 100644 --- a/src/acpi/dbg2/dbg2.c +++ b/src/acpi/dbg2/dbg2.c @@ -41,7 +41,7 @@ static int dbg2_init(fwts_framework *fw) return FWTS_ERROR; } if (table == NULL || (table && table->length == 0)) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) { + if (fw->flags & FWTS_FLAG_SBBR) { fwts_log_error(fw, "ACPI DBG2 table does not exist"); return FWTS_ERROR; @@ -59,7 +59,7 @@ static int dbg2_test2(fwts_framework *fw) { uint32_t i; - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) + if (!(fw->flags & FWTS_FLAG_SBBR)) return FWTS_SKIP; fwts_acpi_table_dbg2 *dbg2 = (fwts_acpi_table_dbg2 *)table->data; @@ -389,6 +389,6 @@ static fwts_framework_ops dbg2_ops = { .minor_tests = dbg2_tests }; -FWTS_REGISTER("dbg2", &dbg2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) +FWTS_REGISTER("dbg2", &dbg2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) #endif diff --git a/src/acpi/dbgp/dbgp.c b/src/acpi/dbgp/dbgp.c index dc45f4d5..906ef1e4 100644 --- a/src/acpi/dbgp/dbgp.c +++ b/src/acpi/dbgp/dbgp.c @@ -119,6 +119,6 @@ static fwts_framework_ops dbgp_ops = { .minor_tests = dbgp_tests }; -FWTS_REGISTER("dbgp", &dbgp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("dbgp", &dbgp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/ac_adapter/ac.c b/src/acpi/devices/ac_adapter/ac.c index 0de13b2d..4363ecd5 100644 --- a/src/acpi/devices/ac_adapter/ac.c +++ b/src/acpi/devices/ac_adapter/ac.c @@ -288,6 +288,6 @@ static fwts_framework_ops acpi_ac_ops = { .minor_tests = acpi_ac_tests }; -FWTS_REGISTER("acpi_ac", &acpi_ac_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpi_ac", &acpi_ac_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/battery/battery.c b/src/acpi/devices/battery/battery.c index 68d5fc7f..d5b41dc4 100644 --- a/src/acpi/devices/battery/battery.c +++ b/src/acpi/devices/battery/battery.c @@ -402,6 +402,6 @@ static fwts_framework_ops acpi_battery_ops = { .minor_tests = acpi_battery_tests }; -FWTS_REGISTER("acpi_battery", &acpi_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpi_battery", &acpi_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/battery/smart_battery.c b/src/acpi/devices/battery/smart_battery.c index a3246b60..2e4b8ecf 100644 --- a/src/acpi/devices/battery/smart_battery.c +++ b/src/acpi/devices/battery/smart_battery.c @@ -217,6 +217,6 @@ static fwts_framework_ops smart_battery_ops = { .minor_tests = smart_battery_tests }; -FWTS_REGISTER("smart_battery", &smart_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("smart_battery", &smart_battery_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/buttons/power_button.c b/src/acpi/devices/buttons/power_button.c index f9781d00..b4b5ea5a 100644 --- a/src/acpi/devices/buttons/power_button.c +++ b/src/acpi/devices/buttons/power_button.c @@ -198,6 +198,6 @@ static fwts_framework_ops power_button_ops = { .minor_tests = power_button_tests }; -FWTS_REGISTER("acpi_pwrb", &power_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpi_pwrb", &power_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/buttons/sleep_button.c b/src/acpi/devices/buttons/sleep_button.c index a800dc84..f0a3c550 100644 --- a/src/acpi/devices/buttons/sleep_button.c +++ b/src/acpi/devices/buttons/sleep_button.c @@ -170,6 +170,6 @@ static fwts_framework_ops sleep_button_ops = { .minor_tests = sleep_button_tests }; -FWTS_REGISTER("acpi_slpb", &sleep_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpi_slpb", &sleep_button_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/ec/ec.c b/src/acpi/devices/ec/ec.c index 967797e7..bf9a07d4 100644 --- a/src/acpi/devices/ec/ec.c +++ b/src/acpi/devices/ec/ec.c @@ -281,6 +281,6 @@ static fwts_framework_ops acpi_ec_ops = { .minor_tests = acpi_ec_tests }; -FWTS_REGISTER("acpi_ec", &acpi_ec_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpi_ec", &acpi_ec_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/lid/lid.c b/src/acpi/devices/lid/lid.c index 136f2a61..a1fef384 100644 --- a/src/acpi/devices/lid/lid.c +++ b/src/acpi/devices/lid/lid.c @@ -287,6 +287,6 @@ static fwts_framework_ops acpi_lid_ops = { .minor_tests = acpi_lid_tests }; -FWTS_REGISTER("acpi_lid", &acpi_lid_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpi_lid", &acpi_lid_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/nvdimm/nvdimm.c b/src/acpi/devices/nvdimm/nvdimm.c index 1e2ac73b..34cde9f5 100644 --- a/src/acpi/devices/nvdimm/nvdimm.c +++ b/src/acpi/devices/nvdimm/nvdimm.c @@ -140,6 +140,6 @@ static fwts_framework_ops acpi_nvdimm_ops = { .minor_tests = acpi_nvdimm_tests }; -FWTS_REGISTER("acpi_nvdimm", &acpi_nvdimm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpi_nvdimm", &acpi_nvdimm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/sensor/als.c b/src/acpi/devices/sensor/als.c index fb363850..e1bfa236 100644 --- a/src/acpi/devices/sensor/als.c +++ b/src/acpi/devices/sensor/als.c @@ -264,6 +264,6 @@ static fwts_framework_ops ambient_light_ops = { .minor_tests = ambient_light_tests }; -FWTS_REGISTER("acpi_als", &ambient_light_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpi_als", &ambient_light_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/time/time.c b/src/acpi/devices/time/time.c index 79f2f784..74f8bb41 100644 --- a/src/acpi/devices/time/time.c +++ b/src/acpi/devices/time/time.c @@ -406,6 +406,6 @@ static fwts_framework_ops acpi_time_alarm_ops = { .minor_tests = acpi_time_alarm_tests }; -FWTS_REGISTER("acpi_time", &acpi_time_alarm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpi_time", &acpi_time_alarm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/devices/wpc/wpc.c b/src/acpi/devices/wpc/wpc.c index a74957c2..3c7a2f4e 100644 --- a/src/acpi/devices/wpc/wpc.c +++ b/src/acpi/devices/wpc/wpc.c @@ -206,6 +206,6 @@ static fwts_framework_ops acpi_wpc_ops = { .minor_tests = acpi_wpc_tests }; -FWTS_REGISTER("acpi_wpc", &acpi_wpc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("acpi_wpc", &acpi_wpc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/dmar/dmar.c b/src/acpi/dmar/dmar.c index 99cb2bf7..af9ee277 100644 --- a/src/acpi/dmar/dmar.c +++ b/src/acpi/dmar/dmar.c @@ -335,6 +335,6 @@ static fwts_framework_ops dmar_ops = { .minor_tests = dmar_tests }; -FWTS_REGISTER("dmar", &dmar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_ROOT_PRIV) +FWTS_REGISTER("dmar", &dmar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_ROOT_PRIV) #endif diff --git a/src/acpi/dppt/dppt.c b/src/acpi/dppt/dppt.c index 5033583b..e85b385b 100644 --- a/src/acpi/dppt/dppt.c +++ b/src/acpi/dppt/dppt.c @@ -55,6 +55,6 @@ static fwts_framework_ops dppt_ops = { .minor_tests = dppt_tests }; -FWTS_REGISTER("dppt", &dppt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("dppt", &dppt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/drtm/drtm.c b/src/acpi/drtm/drtm.c index cbfa2076..0804f0aa 100644 --- a/src/acpi/drtm/drtm.c +++ b/src/acpi/drtm/drtm.c @@ -145,6 +145,6 @@ static fwts_framework_ops drtm_ops = { .minor_tests = drtm_tests }; -FWTS_REGISTER("drtm", &drtm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("drtm", &drtm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/ecdt/ecdt.c b/src/acpi/ecdt/ecdt.c index 359a817b..cc600ad0 100644 --- a/src/acpi/ecdt/ecdt.c +++ b/src/acpi/ecdt/ecdt.c @@ -186,6 +186,6 @@ static fwts_framework_ops ecdt_ops = { .minor_tests = ecdt_tests }; -FWTS_REGISTER("ecdt", &ecdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("ecdt", &ecdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/einj/einj.c b/src/acpi/einj/einj.c index 36fa01dd..37fb521a 100644 --- a/src/acpi/einj/einj.c +++ b/src/acpi/einj/einj.c @@ -123,7 +123,6 @@ static fwts_framework_ops einj_ops = { .minor_tests = einj_tests }; -FWTS_REGISTER("einj", &einj_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | - FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("einj", &einj_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/erst/erst.c b/src/acpi/erst/erst.c index b67e5691..2e77c82b 100644 --- a/src/acpi/erst/erst.c +++ b/src/acpi/erst/erst.c @@ -173,6 +173,6 @@ static fwts_framework_ops erst_ops = { .minor_tests = erst_tests }; -FWTS_REGISTER("erst", &erst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("erst", &erst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/facs/facs.c b/src/acpi/facs/facs.c index 335253fb..ca6827c4 100644 --- a/src/acpi/facs/facs.c +++ b/src/acpi/facs/facs.c @@ -145,6 +145,6 @@ static fwts_framework_ops facs_ops = { .minor_tests = facs_tests }; -FWTS_REGISTER("facs", &facs_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("facs", &facs_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/fadt/fadt.c b/src/acpi/fadt/fadt.c index 4c35c849..0677a690 100644 --- a/src/acpi/fadt/fadt.c +++ b/src/acpi/fadt/fadt.c @@ -1855,6 +1855,5 @@ static fwts_framework_ops fadt_ops = { }; FWTS_REGISTER("fadt", &fadt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | - FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI | - FWTS_FLAG_TEST_COMPLIANCE_ACPI) + FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_ACPI | FWTS_FLAG_COMPLIANCE_ACPI) #endif diff --git a/src/acpi/fpdt/fpdt.c b/src/acpi/fpdt/fpdt.c index ce3257e5..7408c8a9 100644 --- a/src/acpi/fpdt/fpdt.c +++ b/src/acpi/fpdt/fpdt.c @@ -194,6 +194,6 @@ static fwts_framework_ops fpdt_ops = { .minor_tests = fpdt_tests }; -FWTS_REGISTER("fpdt", &fpdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("fpdt", &fpdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/gtdt/gtdt.c b/src/acpi/gtdt/gtdt.c index 270ade37..8cd41632 100644 --- a/src/acpi/gtdt/gtdt.c +++ b/src/acpi/gtdt/gtdt.c @@ -35,7 +35,7 @@ static int gtdt_init(fwts_framework *fw) return FWTS_ERROR; } if (table == NULL || (table && table->length == 0)) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) { + if (fw->flags & FWTS_FLAG_SBBR) { fwts_log_error(fw, "ACPI GTDT table does not exist"); return FWTS_ERROR; } else { @@ -276,6 +276,6 @@ static fwts_framework_ops gtdt_ops = { .minor_tests = gtdt_tests }; -FWTS_REGISTER("gtdt", >dt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) +FWTS_REGISTER("gtdt", >dt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) #endif diff --git a/src/acpi/hest/hest.c b/src/acpi/hest/hest.c index ce502cd4..bff25bc3 100644 --- a/src/acpi/hest/hest.c +++ b/src/acpi/hest/hest.c @@ -892,6 +892,6 @@ static fwts_framework_ops hest_ops = { .minor_tests = hest_tests }; -FWTS_REGISTER("hest", &hest_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("hest", &hest_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/hmat/hmat.c b/src/acpi/hmat/hmat.c index 86037152..ec93ce3b 100644 --- a/src/acpi/hmat/hmat.c +++ b/src/acpi/hmat/hmat.c @@ -217,6 +217,6 @@ static fwts_framework_ops hmat_ops = { .minor_tests = hmat_tests }; -FWTS_REGISTER("hmat", &hmat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("hmat", &hmat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/hpet/hpet.c b/src/acpi/hpet/hpet.c index 9e024757..2295b989 100644 --- a/src/acpi/hpet/hpet.c +++ b/src/acpi/hpet/hpet.c @@ -476,6 +476,6 @@ static fwts_framework_ops hpet_check_ops = { }; FWTS_REGISTER("hpet", &hpet_check_ops, FWTS_TEST_ANYTIME, - FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI) + FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/iort/iort.c b/src/acpi/iort/iort.c index 0a828de6..9881bf94 100644 --- a/src/acpi/iort/iort.c +++ b/src/acpi/iort/iort.c @@ -715,6 +715,6 @@ static fwts_framework_ops iort_ops = { .minor_tests = iort_tests }; -FWTS_REGISTER("iort", &iort_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("iort", &iort_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/lpit/lpit.c b/src/acpi/lpit/lpit.c index 40fbe687..5e5a7861 100644 --- a/src/acpi/lpit/lpit.c +++ b/src/acpi/lpit/lpit.c @@ -221,6 +221,6 @@ static fwts_framework_ops lpit_ops = { .minor_tests = lpit_tests }; -FWTS_REGISTER("lpit", &lpit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("lpit", &lpit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/madt/madt.c b/src/acpi/madt/madt.c index 7455c964..dd835392 100644 --- a/src/acpi/madt/madt.c +++ b/src/acpi/madt/madt.c @@ -385,7 +385,7 @@ static int madt_init(fwts_framework *fw) fadt_major = fadt->header.revision; fadt_minor = 0; - if (fw->flags & FWTS_FLAG_TEST_SBBR) { + if (fw->flags & FWTS_FLAG_SBBR) { if (fadt_major < SBBR_ACPI_MAJOR_VERSION) { fwts_log_error(fw, "SBBR support starts with ACPI v6.0," " Current revision is outdated: %" PRIu8 ".%" PRIu8, @@ -1547,7 +1547,7 @@ static int madt_subtables(fwts_framework *fw) hdr->type, madt_sub_names[type]); } - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) { + if (!(fw->flags & FWTS_FLAG_SBBR)) { bool passed = true; /* verify that the length is what we expect */ @@ -1698,7 +1698,7 @@ static int madt_subtables(fwts_framework *fw) length -= skip; } - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) { + if (!(fw->flags & FWTS_FLAG_SBBR)) { /* run comparison tests */ madt_ioapic_sapic_compare(fw, num_ioapics, num_iosapics); } @@ -1734,6 +1734,6 @@ static fwts_framework_ops madt_ops = { .minor_tests = madt_tests }; -FWTS_REGISTER("madt", &madt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_COMPLIANCE_ACPI | FWTS_FLAG_TEST_SBBR) +FWTS_REGISTER("madt", &madt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_COMPLIANCE_ACPI | FWTS_FLAG_SBBR) #endif diff --git a/src/acpi/mcfg/mcfg.c b/src/acpi/mcfg/mcfg.c index 35f07fb3..7cef0f43 100644 --- a/src/acpi/mcfg/mcfg.c +++ b/src/acpi/mcfg/mcfg.c @@ -252,6 +252,6 @@ static fwts_framework_ops mcfg_ops = { .minor_tests = mcfg_tests }; -FWTS_REGISTER("mcfg", &mcfg_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("mcfg", &mcfg_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/mchi/mchi.c b/src/acpi/mchi/mchi.c index 2a1732d9..e34f3636 100644 --- a/src/acpi/mchi/mchi.c +++ b/src/acpi/mchi/mchi.c @@ -209,6 +209,6 @@ static fwts_framework_ops mchi_ops = { .minor_tests = mchi_tests }; -FWTS_REGISTER("mchi", &mchi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("mchi", &mchi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c index 1c9203dd..9832c4e1 100644 --- a/src/acpi/method/method.c +++ b/src/acpi/method/method.c @@ -566,7 +566,7 @@ static void method_test_AEI_return( static int method_test_AEI(fwts_framework *fw) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) return method_evaluate_method(fw, METHOD_MANDATORY, "_AEI", NULL, 0, method_test_AEI_return, NULL); else @@ -655,7 +655,7 @@ static int method_test_EVT(fwts_framework *fw) int ret; /* Only test the _EVT method with pins defined in AEI. */ - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) ret = method_evaluate_method(fw, METHOD_MANDATORY | METHOD_SILENT, "_AEI", NULL, 0, method_test_EVT_return, NULL); else @@ -761,7 +761,7 @@ static int method_test_DDN(fwts_framework *fw) static int method_test_HID(fwts_framework *fw) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) return method_evaluate_method(fw, METHOD_MANDATORY, "_HID", NULL, 0, fwts_method_test_HID_return, NULL); else @@ -812,7 +812,7 @@ static int method_test_SUN(fwts_framework *fw) static int method_test_UID(fwts_framework *fw) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) return method_evaluate_method(fw, METHOD_MANDATORY, "_UID", NULL, 0, fwts_method_test_UID_return, NULL); else @@ -1109,7 +1109,7 @@ static int method_test_SLI(fwts_framework *fw) /* Section 6.2.17 _CCA */ static int method_test_CCA(fwts_framework *fw) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) return method_evaluate_method(fw, METHOD_MANDATORY, "_CCA", NULL, 0, fwts_method_test_passed_failed_return, "_CCA"); else @@ -1169,7 +1169,7 @@ static int method_test_RMV(fwts_framework *fw) static int method_test_STA(fwts_framework *fw) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) return method_evaluate_method(fw, METHOD_MANDATORY, "_STA", NULL, 0, fwts_method_test_STA_return, "_STA"); else @@ -2670,7 +2670,7 @@ static int method_test_SST(fwts_framework *fw) ret = method_evaluate_method(fw, METHOD_OPTIONAL, "_SST", arg, 1, fwts_method_test_NULL_return, NULL); - if (ret == FWTS_NOT_EXIST && (fw->flags & FWTS_FLAG_TEST_SBBR)) { + if (ret == FWTS_NOT_EXIST && (fw->flags & FWTS_FLAG_SBBR)) { fwts_warning(fw, "_SST method not found. This should be treated as error " "if the platform provides user visible status such as LED."); } @@ -4340,7 +4340,7 @@ static int method_test_VPO(fwts_framework *fw) static int method_test_ADR(fwts_framework *fw) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) return method_evaluate_method(fw, METHOD_MANDATORY, "_ADR", NULL, 0, fwts_method_test_integer_return, NULL); else @@ -5028,6 +5028,6 @@ static fwts_framework_ops method_ops = { }; FWTS_REGISTER("method", &method_ops, FWTS_TEST_ANYTIME, - FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) + FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) #endif diff --git a/src/acpi/mpst/mpst.c b/src/acpi/mpst/mpst.c index 4cf4bc10..3ce4ca9d 100644 --- a/src/acpi/mpst/mpst.c +++ b/src/acpi/mpst/mpst.c @@ -188,6 +188,6 @@ static fwts_framework_ops mpst_ops = { .minor_tests = mpst_tests }; -FWTS_REGISTER("mpst", &mpst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("mpst", &mpst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/msct/msct.c b/src/acpi/msct/msct.c index 168e7a4b..3764e5e9 100644 --- a/src/acpi/msct/msct.c +++ b/src/acpi/msct/msct.c @@ -116,6 +116,6 @@ static fwts_framework_ops msct_ops = { }; FWTS_REGISTER("msct", &msct_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | - FWTS_FLAG_TEST_ACPI) + FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/msdm/msdm.c b/src/acpi/msdm/msdm.c index b9b60ec6..008d050d 100644 --- a/src/acpi/msdm/msdm.c +++ b/src/acpi/msdm/msdm.c @@ -134,6 +134,6 @@ static fwts_framework_ops msdm_ops = { .minor_tests = msdm_tests }; -FWTS_REGISTER("msdm", &msdm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("msdm", &msdm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/nfit/nfit.c b/src/acpi/nfit/nfit.c index 71fb0bea..0ffacd1e 100644 --- a/src/acpi/nfit/nfit.c +++ b/src/acpi/nfit/nfit.c @@ -537,6 +537,6 @@ static fwts_framework_ops nfit_ops = { .minor_tests = nfit_tests }; -FWTS_REGISTER("nfit", &nfit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("nfit", &nfit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/pcc/pcc.c b/src/acpi/pcc/pcc.c index 8eb71caf..96286e23 100644 --- a/src/acpi/pcc/pcc.c +++ b/src/acpi/pcc/pcc.c @@ -471,6 +471,6 @@ static fwts_framework_ops pcc_ops = { .minor_tests = pcc_tests }; -FWTS_REGISTER("pcc", &pcc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("pcc", &pcc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/pcct/pcct.c b/src/acpi/pcct/pcct.c index 9cbbc54b..cec21f38 100644 --- a/src/acpi/pcct/pcct.c +++ b/src/acpi/pcct/pcct.c @@ -333,6 +333,6 @@ static fwts_framework_ops pcct_ops = { .minor_tests = pcct_tests }; -FWTS_REGISTER("pcct", &pcct_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("pcct", &pcct_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/pdtt/pdtt.c b/src/acpi/pdtt/pdtt.c index 93baacbf..061878ab 100644 --- a/src/acpi/pdtt/pdtt.c +++ b/src/acpi/pdtt/pdtt.c @@ -94,6 +94,6 @@ static fwts_framework_ops pdtt_ops = { .minor_tests = pdtt_tests }; -FWTS_REGISTER("pdtt", &pdtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("pdtt", &pdtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/phat/phat.c b/src/acpi/phat/phat.c index e8ab09c7..4810b15c 100644 --- a/src/acpi/phat/phat.c +++ b/src/acpi/phat/phat.c @@ -167,6 +167,6 @@ static fwts_framework_ops phat_ops = { .minor_tests = phat_tests }; -FWTS_REGISTER("phat", &phat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("phat", &phat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/pmtt/pmtt.c b/src/acpi/pmtt/pmtt.c index 86e46c6d..7515730b 100644 --- a/src/acpi/pmtt/pmtt.c +++ b/src/acpi/pmtt/pmtt.c @@ -225,6 +225,6 @@ static fwts_framework_ops pmtt_ops = { .minor_tests = pmtt_tests }; -FWTS_REGISTER("pmtt", &pmtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("pmtt", &pmtt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/pptt/pptt.c b/src/acpi/pptt/pptt.c index bc11fcb0..8a126ff9 100644 --- a/src/acpi/pptt/pptt.c +++ b/src/acpi/pptt/pptt.c @@ -178,6 +178,6 @@ static fwts_framework_ops pptt_ops = { .minor_tests = pptt_tests }; -FWTS_REGISTER("pptt", &pptt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("pptt", &pptt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/rasf/rasf.c b/src/acpi/rasf/rasf.c index 05f02de8..dc44a58a 100644 --- a/src/acpi/rasf/rasf.c +++ b/src/acpi/rasf/rasf.c @@ -64,6 +64,6 @@ static fwts_framework_ops rasf_ops = { .minor_tests = rasf_tests }; -FWTS_REGISTER("rasf", &rasf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("rasf", &rasf_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/rsdp/rsdp.c b/src/acpi/rsdp/rsdp.c index ac53ece2..d43a9d85 100644 --- a/src/acpi/rsdp/rsdp.c +++ b/src/acpi/rsdp/rsdp.c @@ -226,6 +226,6 @@ static fwts_framework_ops rsdp_ops = { }; FWTS_REGISTER("rsdp", &rsdp_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | - FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_COMPLIANCE_ACPI) + FWTS_FLAG_ACPI | FWTS_FLAG_COMPLIANCE_ACPI) #endif diff --git a/src/acpi/rsdt/rsdt.c b/src/acpi/rsdt/rsdt.c index 0298e093..4f08f9b7 100644 --- a/src/acpi/rsdt/rsdt.c +++ b/src/acpi/rsdt/rsdt.c @@ -70,6 +70,6 @@ static fwts_framework_ops rsdt_ops = { .minor_tests = rsdt_tests }; -FWTS_REGISTER("rsdt", &rsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("rsdt", &rsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/sbst/sbst.c b/src/acpi/sbst/sbst.c index 81c8179b..51660b07 100644 --- a/src/acpi/sbst/sbst.c +++ b/src/acpi/sbst/sbst.c @@ -80,6 +80,6 @@ static fwts_framework_ops sbst_ops = { .minor_tests = sbst_tests }; -FWTS_REGISTER("sbst", &sbst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("sbst", &sbst_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/sdei/sdei.c b/src/acpi/sdei/sdei.c index 1c94028b..d7fd513f 100644 --- a/src/acpi/sdei/sdei.c +++ b/src/acpi/sdei/sdei.c @@ -68,6 +68,6 @@ static fwts_framework_ops sdei_ops = { .minor_tests = sdei_tests }; -FWTS_REGISTER("sdei", &sdei_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("sdei", &sdei_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/sdev/sdev.c b/src/acpi/sdev/sdev.c index 0542d858..a115ebc8 100644 --- a/src/acpi/sdev/sdev.c +++ b/src/acpi/sdev/sdev.c @@ -129,6 +129,6 @@ static fwts_framework_ops sdev_ops = { .minor_tests = sdev_tests }; -FWTS_REGISTER("sdev", &sdev_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("sdev", &sdev_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/slic/slic.c b/src/acpi/slic/slic.c index f244b775..b4f32435 100644 --- a/src/acpi/slic/slic.c +++ b/src/acpi/slic/slic.c @@ -160,6 +160,6 @@ static fwts_framework_ops slic_ops = { .minor_tests = slic_tests }; -FWTS_REGISTER("slic", &slic_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("slic", &slic_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/slit/slit.c b/src/acpi/slit/slit.c index 8cdebb3f..1115e11b 100644 --- a/src/acpi/slit/slit.c +++ b/src/acpi/slit/slit.c @@ -168,6 +168,6 @@ static fwts_framework_ops slit_ops = { .minor_tests = slit_tests }; -FWTS_REGISTER("slit", &slit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("slit", &slit_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/spcr/spcr.c b/src/acpi/spcr/spcr.c index 626144bf..a1318f02 100644 --- a/src/acpi/spcr/spcr.c +++ b/src/acpi/spcr/spcr.c @@ -37,7 +37,7 @@ static int spcr_init(fwts_framework *fw) return FWTS_ERROR; } if (table == NULL || (table && table->length == 0)) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) { + if (fw->flags & FWTS_FLAG_SBBR) { fwts_log_error(fw, "ACPI SPCR table does not exist"); return FWTS_ERROR; } else { @@ -57,7 +57,7 @@ static int spcr_init(fwts_framework *fw) */ static int spcr_sbbr_revision_test(fwts_framework *fw) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) { + if (fw->flags & FWTS_FLAG_SBBR) { const uint8_t SBBR_LATEST_REVISION = 2; if (spcr->header.revision >= SBBR_LATEST_REVISION) @@ -72,7 +72,7 @@ static int spcr_sbbr_revision_test(fwts_framework *fw) static int spcr_sbbr_gsiv_test(fwts_framework *fw) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) { + if (fw->flags & FWTS_FLAG_SBBR) { const uint8_t ARMH_GIC_INTR_MASK = 0x08; const uint8_t IO_APIC_INTR_MASK = 0x02; @@ -296,6 +296,6 @@ static fwts_framework_ops spcr_ops = { .minor_tests = spcr_tests }; -FWTS_REGISTER("spcr", &spcr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) +FWTS_REGISTER("spcr", &spcr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) #endif diff --git a/src/acpi/spmi/spmi.c b/src/acpi/spmi/spmi.c index 0dc7d08b..10d4c95b 100644 --- a/src/acpi/spmi/spmi.c +++ b/src/acpi/spmi/spmi.c @@ -180,6 +180,6 @@ static fwts_framework_ops spmi_ops = { .minor_tests = spmi_tests }; -FWTS_REGISTER("spmi", &spmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("spmi", &spmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/srat/srat.c b/src/acpi/srat/srat.c index eaad90ca..008aeb2f 100644 --- a/src/acpi/srat/srat.c +++ b/src/acpi/srat/srat.c @@ -401,6 +401,6 @@ static fwts_framework_ops srat_ops = { .minor_tests = srat_tests }; -FWTS_REGISTER("srat", &srat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("srat", &srat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/stao/stao.c b/src/acpi/stao/stao.c index c0c24865..1bfbf8dd 100644 --- a/src/acpi/stao/stao.c +++ b/src/acpi/stao/stao.c @@ -144,6 +144,6 @@ static fwts_framework_ops stao_ops = { .minor_tests = stao_tests }; -FWTS_REGISTER("stao", &stao_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("stao", &stao_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/tcpa/tcpa.c b/src/acpi/tcpa/tcpa.c index 2abafba1..208aceee 100644 --- a/src/acpi/tcpa/tcpa.c +++ b/src/acpi/tcpa/tcpa.c @@ -155,6 +155,6 @@ static fwts_framework_ops tcpa_ops = { .minor_tests = tcpa_tests }; -FWTS_REGISTER("tcpa", &tcpa_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("tcpa", &tcpa_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/tpm2/tpm2.c b/src/acpi/tpm2/tpm2.c index ae4da486..7aef8887 100644 --- a/src/acpi/tpm2/tpm2.c +++ b/src/acpi/tpm2/tpm2.c @@ -97,6 +97,6 @@ static fwts_framework_ops tpm2_ops = { .minor_tests = tpm2_tests }; -FWTS_REGISTER("tpm2", &tpm2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("tpm2", &tpm2_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/uefi/uefi.c b/src/acpi/uefi/uefi.c index 93a12b6e..eef08cc6 100644 --- a/src/acpi/uefi/uefi.c +++ b/src/acpi/uefi/uefi.c @@ -115,6 +115,6 @@ static fwts_framework_ops uefi_ops = { .minor_tests = uefi_tests }; -FWTS_REGISTER("uefi", &uefi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("uefi", &uefi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/waet/waet.c b/src/acpi/waet/waet.c index 6d283c12..a239e26c 100644 --- a/src/acpi/waet/waet.c +++ b/src/acpi/waet/waet.c @@ -73,6 +73,6 @@ static fwts_framework_ops waet_ops = { .minor_tests = waet_tests }; -FWTS_REGISTER("waet", &waet_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("waet", &waet_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/wdat/wdat.c b/src/acpi/wdat/wdat.c index c5f806e0..92357bad 100644 --- a/src/acpi/wdat/wdat.c +++ b/src/acpi/wdat/wdat.c @@ -203,6 +203,6 @@ static fwts_framework_ops wdat_ops = { .minor_tests = wdat_tests }; -FWTS_REGISTER("wdat", &wdat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("wdat", &wdat_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/wmi/wmi.c b/src/acpi/wmi/wmi.c index c87df22e..93c3c9e8 100644 --- a/src/acpi/wmi/wmi.c +++ b/src/acpi/wmi/wmi.c @@ -426,6 +426,6 @@ static fwts_framework_ops wmi_ops = { .minor_tests = wmi_tests }; -FWTS_REGISTER("wmi", &wmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("wmi", &wmi_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/wpbt/wpbt.c b/src/acpi/wpbt/wpbt.c index 74c00a05..b97808f4 100644 --- a/src/acpi/wpbt/wpbt.c +++ b/src/acpi/wpbt/wpbt.c @@ -80,6 +80,6 @@ static fwts_framework_ops wpbt_ops = { .minor_tests = wpbt_tests }; -FWTS_REGISTER("wpbt", &wpbt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("wpbt", &wpbt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/wsmt/wsmt.c b/src/acpi/wsmt/wsmt.c index 18bfbdd9..5b55c5c6 100644 --- a/src/acpi/wsmt/wsmt.c +++ b/src/acpi/wsmt/wsmt.c @@ -70,6 +70,6 @@ static fwts_framework_ops wsmt_ops = { .minor_tests = wsmt_tests }; -FWTS_REGISTER("wsmt", &wsmt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) +FWTS_REGISTER("wsmt", &wsmt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/xenv/xenv.c b/src/acpi/xenv/xenv.c index 0aac43d6..20a4eefb 100644 --- a/src/acpi/xenv/xenv.c +++ b/src/acpi/xenv/xenv.c @@ -71,6 +71,6 @@ static fwts_framework_ops xenv_check_ops = { }; FWTS_REGISTER("xenv", &xenv_check_ops, FWTS_TEST_ANYTIME, - FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI) + FWTS_FLAG_BATCH | FWTS_FLAG_ACPI) #endif diff --git a/src/acpi/xsdt/xsdt.c b/src/acpi/xsdt/xsdt.c index cec7e651..31ede781 100644 --- a/src/acpi/xsdt/xsdt.c +++ b/src/acpi/xsdt/xsdt.c @@ -35,7 +35,7 @@ static int xsdt_init(fwts_framework *fw) return FWTS_ERROR; } if (table == NULL || (table && table->length == 0)) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) { + if (fw->flags & FWTS_FLAG_SBBR) { fwts_log_error(fw, "ACPI XSDT table does not exist"); return FWTS_ERROR; } else { @@ -59,7 +59,7 @@ static int xsdt_test1(fwts_framework *fw) for (i = 0; i < n; i++) { if (xsdt->entries[i] == 0) { passed = false; - if (fw->flags & FWTS_FLAG_TEST_SBBR) { + if (fw->flags & FWTS_FLAG_SBBR) { fwts_failed(fw, LOG_LEVEL_CRITICAL, "XSDTEntryNull", "XSDT Entry %zd is null, should not be non-zero.", i); @@ -78,7 +78,7 @@ static int xsdt_test1(fwts_framework *fw) } } if (passed) { - if (fw->flags & FWTS_FLAG_TEST_SBBR) { + if (fw->flags & FWTS_FLAG_SBBR) { fwts_passed(fw, "XSDT is present, pointed at by XsdrAddress=0x%" PRIx64 " and contain valid pointers to %d other ACPI tables mandated by SBBR", xsdt->entries[0], (int)n); @@ -100,6 +100,6 @@ static fwts_framework_ops xsdt_ops = { .minor_tests = xsdt_tests }; -FWTS_REGISTER("xsdt", &xsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_TEST_ACPI | FWTS_FLAG_TEST_SBBR) +FWTS_REGISTER("xsdt", &xsdt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ACPI | FWTS_FLAG_SBBR) #endif diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c index a2403653..fa685414 100644 --- a/src/dmi/dmicheck/dmicheck.c +++ b/src/dmi/dmicheck/dmicheck.c @@ -787,7 +787,7 @@ static int dmicheck_test1(fwts_framework *fw) } if (!smbios30_found) { - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) { + if (!(fw->flags & FWTS_FLAG_SBBR)) { if (smbios_found) return FWTS_OK; } @@ -2172,7 +2172,7 @@ static void dmi_scan_smbios30_table(fwts_framework *fw, if ((next_entry - table) <= table_max_length) { dmicheck_entry(fw, addr, &hdr, smbios_version); - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) sbbr_test_entry_check(&hdr); } else { @@ -2197,7 +2197,7 @@ static int dmicheck_test2(fwts_framework *fw) uint16_t version = 0; uint8_t *table; - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) return FWTS_SKIP; if (!smbios_found) { @@ -2271,7 +2271,7 @@ static int dmicheck_test4(fwts_framework *fw) { uint32_t i; - if (!(fw->flags & FWTS_FLAG_TEST_SBBR)) + if (!(fw->flags & FWTS_FLAG_SBBR)) return FWTS_SKIP; if (!smbios30_found) { @@ -2309,6 +2309,6 @@ static fwts_framework_ops dmicheck_ops = { .minor_tests = dmicheck_tests }; -FWTS_REGISTER("dmicheck", &dmicheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_SBBR) +FWTS_REGISTER("dmicheck", &dmicheck_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_SBBR) #endif diff --git a/src/lib/include/fwts_framework.h b/src/lib/include/fwts_framework.h index 31418a93..4d7eb191 100644 --- a/src/lib/include/fwts_framework.h +++ b/src/lib/include/fwts_framework.h @@ -54,25 +54,18 @@ typedef enum { FWTS_FLAG_ROOT_PRIV = 0x00002000, FWTS_FLAG_UNSAFE = 0x00004000, FWTS_FLAG_FIRMWARE_VENDOR = 0x00008000, - FWTS_FLAG_TEST_BIOS = 0x00010000, - FWTS_FLAG_TEST_UEFI = 0x00020000, - FWTS_FLAG_TEST_ACPI = 0x00040000, + FWTS_FLAG_UEFI = 0x00020000, + FWTS_FLAG_ACPI = 0x00040000, FWTS_FLAG_UTILS = 0x00080000, FWTS_FLAG_QUIET = 0x00100000, FWTS_FLAG_SHOW_TESTS_FULL = 0x00200000, FWTS_FLAG_SHOW_TESTS_CATEGORIES = 0x00400000, - FWTS_FLAG_TEST_COMPLIANCE_ACPI = 0x00800000, - FWTS_FLAG_TEST_SBBR = 0x01000000, - FWTS_FLAG_TEST_EBBR = 0x02000000, - FWTS_FLAG_TEST_XBBR = FWTS_FLAG_TEST_SBBR | FWTS_FLAG_TEST_EBBR + FWTS_FLAG_COMPLIANCE_ACPI = 0x00800000, + FWTS_FLAG_SBBR = 0x01000000, + FWTS_FLAG_EBBR = 0x02000000, + FWTS_FLAG_XBBR = FWTS_FLAG_SBBR | FWTS_FLAG_EBBR } fwts_framework_flags; -#define FWTS_FLAG_TEST_MASK \ - (FWTS_FLAG_TEST_BIOS | \ - FWTS_FLAG_TEST_UEFI | \ - FWTS_FLAG_TEST_ACPI | \ - FWTS_FLAG_TEST_SBBR) - /* * Test results */ diff --git a/src/lib/src/fwts_acpi_object_eval.c b/src/lib/src/fwts_acpi_object_eval.c index 013540f9..4923748c 100644 --- a/src/lib/src/fwts_acpi_object_eval.c +++ b/src/lib/src/fwts_acpi_object_eval.c @@ -1562,7 +1562,7 @@ static void method_test_CRS_mif_maf( if (len == 0) { if ((mif == 1) && (maf == 1)) { snprintf(tmp, sizeof(tmp), "Method%s%sMifMafBothOne", objname, tag); - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) fwts_warning(fw, tmp, "%s %s _MIF and _MAF flags are both " "set to one which is invalid when " @@ -1591,7 +1591,7 @@ static void method_test_CRS_mif_maf( *passed = false; } else if (min % tmpgran != 0) { snprintf(tmp, sizeof(tmp), "Method%s%sMinNotMultipleOfGran", objname, tag); - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) fwts_warning(fw, tmp, "%s %s _MIN address is not a multiple " "of the granularity when _MIF is 1.", @@ -1618,7 +1618,7 @@ static void method_test_CRS_mif_maf( *passed = false; } else if (max % tmpgran != 0) { snprintf(tmp, sizeof(tmp), "Method%s%sMaxNotMultipleOfGran", objname, tag); - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) fwts_warning(fw, tmp, "%s %s _MAX address is not a multiple " "of the granularity when _MAF is 1.", @@ -1637,7 +1637,7 @@ static void method_test_CRS_mif_maf( if ((mif == 0) && (maf == 0) && (len % (granularity + 1) != 0)) { snprintf(tmp, sizeof(tmp), "Method%s%sLenNotMultipleOfGran", objname, tag); - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) fwts_warning(fw, tmp, "%s %s length is not a multiple " "of the granularity when _MIF " @@ -1655,7 +1655,7 @@ static void method_test_CRS_mif_maf( } if (((mif == 0) && (maf == 1)) || ((mif == 1) && (maf == 0))) { snprintf(tmp, sizeof(tmp), "Method%s%sMifMafInvalid", objname, tag); - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) fwts_warning(fw, tmp, "%s %s _MIF and _MAF flags are either " "0 and 1 or 1 and 0 which is invalid when " @@ -1674,7 +1674,7 @@ static void method_test_CRS_mif_maf( if ((mif == 1) && (maf == 1)) { if (granularity != 0) { snprintf(tmp, sizeof(tmp), "Method%s%sGranularityNotZero", objname, tag); - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) fwts_warning(fw, tmp, "%s %s granularity 0x%" PRIx64 " is not zero as expected when " @@ -1692,7 +1692,7 @@ static void method_test_CRS_mif_maf( } if (min > max) { snprintf(tmp, sizeof(tmp), "Method%s%sMaxLessThanMin", objname, tag); - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) fwts_warning(fw, tmp, "%s %s minimum address range 0x%" PRIx64 " is greater than the maximum address " @@ -1710,7 +1710,7 @@ static void method_test_CRS_mif_maf( } if (max - min + 1 != len) { snprintf(tmp, sizeof(tmp), "Method%s%sLengthInvalid", objname, tag); - if (fw->flags & FWTS_FLAG_TEST_SBBR) + if (fw->flags & FWTS_FLAG_SBBR) fwts_warning(fw, tmp, "%s %s length 0x%" PRIx64 " does not match the difference between " diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c index 1f139a7e..076a5516 100644 --- a/src/lib/src/fwts_framework.c +++ b/src/lib/src/fwts_framework.c @@ -55,24 +55,24 @@ typedef struct { FWTS_FLAG_POWER_STATES | \ FWTS_FLAG_UTILS | \ FWTS_FLAG_UNSAFE | \ - FWTS_FLAG_TEST_UEFI | \ - FWTS_FLAG_TEST_ACPI | \ - FWTS_FLAG_TEST_COMPLIANCE_ACPI | \ - FWTS_FLAG_TEST_SBBR | \ - FWTS_FLAG_TEST_EBBR) + FWTS_FLAG_UEFI | \ + FWTS_FLAG_ACPI | \ + FWTS_FLAG_COMPLIANCE_ACPI | \ + FWTS_FLAG_SBBR | \ + FWTS_FLAG_EBBR) static const fwts_categories categories[] = { - { "ACPI", FWTS_FLAG_TEST_ACPI }, + { "ACPI", FWTS_FLAG_ACPI }, { "Batch", FWTS_FLAG_BATCH }, { "Interactive", FWTS_FLAG_INTERACTIVE }, { "Batch Experimental", FWTS_FLAG_BATCH_EXPERIMENTAL }, { "Interactive Experimental", FWTS_FLAG_INTERACTIVE_EXPERIMENTAL }, { "Power States", FWTS_FLAG_POWER_STATES }, - { "SBBR", FWTS_FLAG_TEST_SBBR }, + { "SBBR", FWTS_FLAG_SBBR }, { "Utilities", FWTS_FLAG_UTILS }, { "Unsafe", FWTS_FLAG_UNSAFE }, - { "UEFI", FWTS_FLAG_TEST_UEFI }, - { "ACPI Spec Compliance", FWTS_FLAG_TEST_COMPLIANCE_ACPI }, + { "UEFI", FWTS_FLAG_UEFI }, + { "ACPI Spec Compliance", FWTS_FLAG_COMPLIANCE_ACPI }, { NULL, 0 }, }; @@ -1309,7 +1309,7 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar return FWTS_ERROR; break; case 38: /* --uefitests */ - fw->flags |= FWTS_FLAG_TEST_UEFI; + fw->flags |= FWTS_FLAG_UEFI; break; case 39: /* --rsdp */ fw->rsdp = (void *)strtoul(optarg, NULL, 0); @@ -1322,10 +1322,10 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar fw->flags |= FWTS_FLAG_SHOW_TESTS_CATEGORIES; break; case 42: /* --acpitests */ - fw->flags |= FWTS_FLAG_TEST_ACPI; + fw->flags |= FWTS_FLAG_ACPI; break; case 43: /* --acpicompliance */ - fw->flags |= FWTS_FLAG_TEST_COMPLIANCE_ACPI; + fw->flags |= FWTS_FLAG_COMPLIANCE_ACPI; break; case 44: /* --log-level */ if (fwts_framework_ll_parse(fw, optarg) != FWTS_OK) @@ -1337,7 +1337,7 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar break; case 46: /* --sbbr */ #if defined(FWTS_ARCH_AARCH64) - fw->flags |= FWTS_FLAG_TEST_SBBR; + fw->flags |= FWTS_FLAG_SBBR; break; #else fprintf(stderr, "option not available on this architecture\n"); @@ -1351,7 +1351,7 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar break; case 49: /* --ebbr */ #if defined(FWTS_ARCH_AARCH64) - fw->flags |= FWTS_FLAG_TEST_EBBR; + fw->flags |= FWTS_FLAG_EBBR; break; #else fprintf(stderr, "option not available on this architecture\n"); diff --git a/src/sbbr/acpitables/acpitables.c b/src/sbbr/acpitables/acpitables.c index aed2908e..fa63be64 100644 --- a/src/sbbr/acpitables/acpitables.c +++ b/src/sbbr/acpitables/acpitables.c @@ -262,6 +262,6 @@ static fwts_framework_ops acpi_table_sbbr_check_ops = { .minor_tests = acpi_table_sbbr_check_tests }; -FWTS_REGISTER("acpi_sbbr", &acpi_table_sbbr_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_SBBR) +FWTS_REGISTER("acpi_sbbr", &acpi_table_sbbr_check_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_SBBR) #endif diff --git a/src/sbbr/fadt/fadt.c b/src/sbbr/fadt/fadt.c index 2c3ead40..47fa3bd7 100644 --- a/src/sbbr/fadt/fadt.c +++ b/src/sbbr/fadt/fadt.c @@ -417,5 +417,5 @@ static fwts_framework_ops fadt_sbbr_ops = { .minor_tests = fadt_sbbr_tests }; -FWTS_REGISTER("fadt_sbbr", &fadt_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_SBBR) +FWTS_REGISTER("fadt_sbbr", &fadt_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_SBBR) #endif diff --git a/src/sbbr/rsdp/rsdp.c b/src/sbbr/rsdp/rsdp.c index e8c5aacc..b02b428f 100644 --- a/src/sbbr/rsdp/rsdp.c +++ b/src/sbbr/rsdp/rsdp.c @@ -126,6 +126,6 @@ static fwts_framework_ops rsdp_sbbr_ops = { .minor_tests = rsdp_sbbr_tests }; -FWTS_REGISTER("rsdp_sbbr", &rsdp_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_SBBR) +FWTS_REGISTER("rsdp_sbbr", &rsdp_sbbr_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_SBBR) #endif diff --git a/src/uefi/csm/csm.c b/src/uefi/csm/csm.c index e2c0c927..372b2919 100644 --- a/src/uefi/csm/csm.c +++ b/src/uefi/csm/csm.c @@ -120,6 +120,6 @@ static fwts_framework_ops csm_ops = { .minor_tests = csm_tests }; -FWTS_REGISTER("csm", &csm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV) +FWTS_REGISTER("csm", &csm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV) #endif diff --git a/src/uefi/esrt/esrt.c b/src/uefi/esrt/esrt.c index 81a487e7..7193ef8c 100644 --- a/src/uefi/esrt/esrt.c +++ b/src/uefi/esrt/esrt.c @@ -263,6 +263,6 @@ static fwts_framework_ops esrt_ops = { .minor_tests = esrt_tests }; -FWTS_REGISTER("esrt", &esrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_ROOT_PRIV) +FWTS_REGISTER("esrt", &esrt_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_ROOT_PRIV) #endif diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c index edb5ed8f..7a0366ea 100644 --- a/src/uefi/securebootcert/securebootcert.c +++ b/src/uefi/securebootcert/securebootcert.c @@ -609,6 +609,6 @@ static fwts_framework_ops securebootcert_ops = { .minor_tests = securebootcert_tests }; -FWTS_REGISTER("securebootcert", &securebootcert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) +FWTS_REGISTER("securebootcert", &securebootcert_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) #endif diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c index eaffe5f6..417d36c3 100644 --- a/src/uefi/uefibootpath/uefibootpath.c +++ b/src/uefi/uefibootpath/uefibootpath.c @@ -936,6 +936,6 @@ static fwts_framework_ops uefibootpath_ops = { .minor_tests = uefibootpath_tests }; -FWTS_REGISTER("uefibootpath", &uefibootpath_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV); +FWTS_REGISTER("uefibootpath", &uefibootpath_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV); #endif diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c index e6ab9d45..7e26694a 100644 --- a/src/uefi/uefirtauthvar/uefirtauthvar.c +++ b/src/uefi/uefirtauthvar/uefirtauthvar.c @@ -796,6 +796,6 @@ static fwts_framework_ops uefirtauthvar_ops = { .minor_tests = uefirtauthvar_tests, }; -FWTS_REGISTER("uefirtauthvar", &uefirtauthvar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) +FWTS_REGISTER("uefirtauthvar", &uefirtauthvar_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV) #endif diff --git a/src/uefi/uefirtmisc/uefirtmisc.c b/src/uefi/uefirtmisc/uefirtmisc.c index bddff487..c00ed442 100644 --- a/src/uefi/uefirtmisc/uefirtmisc.c +++ b/src/uefi/uefirtmisc/uefirtmisc.c @@ -346,6 +346,6 @@ static fwts_framework_ops uefirtmisc_ops = { .minor_tests = uefirtmisc_tests }; -FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_XBBR) +FWTS_REGISTER("uefirtmisc", &uefirtmisc_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_XBBR) #endif diff --git a/src/uefi/uefirttime/uefirttime.c b/src/uefi/uefirttime/uefirttime.c index 41503843..c1a8ae6c 100644 --- a/src/uefi/uefirttime/uefirttime.c +++ b/src/uefi/uefirttime/uefirttime.c @@ -1427,6 +1427,6 @@ static fwts_framework_ops uefirttime_ops = { .minor_tests = uefirttime_tests }; -FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_XBBR) +FWTS_REGISTER("uefirttime", &uefirttime_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_XBBR) #endif diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c index f5aaa5fb..9f2b9dfc 100644 --- a/src/uefi/uefirtvariable/uefirtvariable.c +++ b/src/uefi/uefirtvariable/uefirtvariable.c @@ -2391,6 +2391,6 @@ static fwts_framework_ops uefirtvariable_ops = { .options_check = options_check, }; -FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_TEST_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_TEST_XBBR) +FWTS_REGISTER("uefirtvariable", &uefirtvariable_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_UEFI | FWTS_FLAG_UNSAFE | FWTS_FLAG_ROOT_PRIV | FWTS_FLAG_XBBR) #endif
Deleted as they aren't used: FWTS_FLAG_TEST_BIOS FWTS_FLAG_TEST_MASK Shortened to avoid long lines: FWTS_FLAG_TEST_UEFI -> FWTS_FLAG_UEFI FWTS_FLAG_TEST_ACPI -> FWTS_FLAG_ACPI FWTS_FLAG_TEST_SBBR -> FWTS_FLAG_SBBR FWTS_FLAG_TEST_EBBR -> FWTS_FLAG_EBBR FWTS_FLAG_TEST_XBBR -> FWTS_FLAG_XBBR FWTS_FLAG_TEST_COMPLIANCE_ACPI -> FWTS_FLAG_COMPLIANCE_ACPI Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/acpi/acpiinfo/acpiinfo.c | 2 +- src/acpi/acpitables/acpitables.c | 2 +- src/acpi/apicinstance/apicinstance.c | 2 +- src/acpi/asf/asf.c | 2 +- src/acpi/aspt/aspt.c | 2 +- src/acpi/bert/bert.c | 2 +- src/acpi/bgrt/bgrt.c | 2 +- src/acpi/boot/boot.c | 2 +- src/acpi/checksum/checksum.c | 2 +- src/acpi/cpep/cpep.c | 2 +- src/acpi/csrt/csrt.c | 2 +- src/acpi/cstates/cstates.c | 2 +- src/acpi/dbg2/dbg2.c | 6 ++--- src/acpi/dbgp/dbgp.c | 2 +- src/acpi/devices/ac_adapter/ac.c | 2 +- src/acpi/devices/battery/battery.c | 2 +- src/acpi/devices/battery/smart_battery.c | 2 +- src/acpi/devices/buttons/power_button.c | 2 +- src/acpi/devices/buttons/sleep_button.c | 2 +- src/acpi/devices/ec/ec.c | 2 +- src/acpi/devices/lid/lid.c | 2 +- src/acpi/devices/nvdimm/nvdimm.c | 2 +- src/acpi/devices/sensor/als.c | 2 +- src/acpi/devices/time/time.c | 2 +- src/acpi/devices/wpc/wpc.c | 2 +- src/acpi/dmar/dmar.c | 2 +- src/acpi/dppt/dppt.c | 2 +- src/acpi/drtm/drtm.c | 2 +- src/acpi/ecdt/ecdt.c | 2 +- src/acpi/einj/einj.c | 3 +-- src/acpi/erst/erst.c | 2 +- src/acpi/facs/facs.c | 2 +- src/acpi/fadt/fadt.c | 3 +-- src/acpi/fpdt/fpdt.c | 2 +- src/acpi/gtdt/gtdt.c | 4 ++-- src/acpi/hest/hest.c | 2 +- src/acpi/hmat/hmat.c | 2 +- src/acpi/hpet/hpet.c | 2 +- src/acpi/iort/iort.c | 2 +- src/acpi/lpit/lpit.c | 2 +- src/acpi/madt/madt.c | 8 +++---- src/acpi/mcfg/mcfg.c | 2 +- src/acpi/mchi/mchi.c | 2 +- src/acpi/method/method.c | 18 +++++++-------- src/acpi/mpst/mpst.c | 2 +- src/acpi/msct/msct.c | 2 +- src/acpi/msdm/msdm.c | 2 +- src/acpi/nfit/nfit.c | 2 +- src/acpi/pcc/pcc.c | 2 +- src/acpi/pcct/pcct.c | 2 +- src/acpi/pdtt/pdtt.c | 2 +- src/acpi/phat/phat.c | 2 +- src/acpi/pmtt/pmtt.c | 2 +- src/acpi/pptt/pptt.c | 2 +- src/acpi/rasf/rasf.c | 2 +- src/acpi/rsdp/rsdp.c | 2 +- src/acpi/rsdt/rsdt.c | 2 +- src/acpi/sbst/sbst.c | 2 +- src/acpi/sdei/sdei.c | 2 +- src/acpi/sdev/sdev.c | 2 +- src/acpi/slic/slic.c | 2 +- src/acpi/slit/slit.c | 2 +- src/acpi/spcr/spcr.c | 8 +++---- src/acpi/spmi/spmi.c | 2 +- src/acpi/srat/srat.c | 2 +- src/acpi/stao/stao.c | 2 +- src/acpi/tcpa/tcpa.c | 2 +- src/acpi/tpm2/tpm2.c | 2 +- src/acpi/uefi/uefi.c | 2 +- src/acpi/waet/waet.c | 2 +- src/acpi/wdat/wdat.c | 2 +- src/acpi/wmi/wmi.c | 2 +- src/acpi/wpbt/wpbt.c | 2 +- src/acpi/wsmt/wsmt.c | 2 +- src/acpi/xenv/xenv.c | 2 +- src/acpi/xsdt/xsdt.c | 8 +++---- src/dmi/dmicheck/dmicheck.c | 10 ++++----- src/lib/include/fwts_framework.h | 19 +++++----------- src/lib/src/fwts_acpi_object_eval.c | 16 +++++++------- src/lib/src/fwts_framework.c | 28 ++++++++++++------------ src/sbbr/acpitables/acpitables.c | 2 +- src/sbbr/fadt/fadt.c | 2 +- src/sbbr/rsdp/rsdp.c | 2 +- src/uefi/csm/csm.c | 2 +- src/uefi/esrt/esrt.c | 2 +- src/uefi/securebootcert/securebootcert.c | 2 +- src/uefi/uefibootpath/uefibootpath.c | 2 +- src/uefi/uefirtauthvar/uefirtauthvar.c | 2 +- src/uefi/uefirtmisc/uefirtmisc.c | 2 +- src/uefi/uefirttime/uefirttime.c | 2 +- src/uefi/uefirtvariable/uefirtvariable.c | 2 +- 91 files changed, 140 insertions(+), 149 deletions(-)