[PATCH] Rename fwts_log_*_verbatum to fwts_log_*_verbatim
Colin King
colin.king at canonical.com
Wed May 25 18:01:43 UTC 2016
From: Colin Ian King <colin.king at canonical.com>
The verbatim logging macros were misspelled and need fixing.
Historical note: verbatim logging logs messages without any formatting
re-working of the message (such as stripping off leading spaces or
line breaking), hence the "leave it as it is" nomenclature. Pity I
can't spell and get it right in the first place.
This includes a few minor white space cleanups.
Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
debian/changelog | 8 +-
src/acpi/acpidump/acpidump.c | 46 ++---
src/acpi/asf/asf.c | 104 +++++------
src/acpi/aspt/aspt.c | 10 +-
src/acpi/bert/bert.c | 26 +--
src/acpi/bgrt/bgrt.c | 14 +-
src/acpi/boot/boot.c | 24 +--
src/acpi/cpep/cpep.c | 4 +-
src/acpi/crsdump/crsdump.c | 10 +-
src/acpi/dbg2/dbg2.c | 44 ++---
src/acpi/dbgp/dbgp.c | 22 +--
src/acpi/ecdt/ecdt.c | 32 ++--
src/acpi/einj/einj.c | 34 ++--
src/acpi/erst/erst.c | 32 ++--
src/acpi/facs/facs.c | 24 +--
src/acpi/fpdt/fpdt.c | 24 +--
src/acpi/gpedump/gpedump.c | 22 +--
src/acpi/hest/hest.c | 298 +++++++++++++++----------------
src/acpi/hpet/hpet.c | 30 ++--
src/acpi/iort/iort.c | 102 +++++------
src/acpi/lpit/lpit.c | 44 ++---
src/acpi/mcfg/mcfg.c | 10 +-
src/acpi/mchi/mchi.c | 40 ++---
src/acpi/method/method.c | 52 +++---
src/acpi/msct/msct.c | 24 +--
src/acpi/msdm/msdm.c | 10 +-
src/acpi/osilinux/osilinux.c | 2 +-
src/acpi/pcc/pcc.c | 72 ++++----
src/acpi/plddump/plddump.c | 58 +++---
src/acpi/s3/s3.c | 8 +-
src/acpi/slic/slic.c | 42 ++---
src/acpi/slit/slit.c | 4 +-
src/acpi/spcr/spcr.c | 6 +-
src/acpi/spmi/spmi.c | 40 ++---
src/acpi/srat/srat.c | 74 ++++----
src/acpi/stao/stao.c | 6 +-
src/acpi/syntaxcheck/syntaxcheck.c | 8 +-
src/acpi/tcpa/tcpa.c | 64 +++----
src/acpi/tpm2/tpm2.c | 10 +-
src/acpi/uefi/uefi.c | 14 +-
src/acpi/waet/waet.c | 8 +-
src/acpi/wdat/wdat.c | 48 ++---
src/acpi/wmi/wmi.c | 26 +--
src/acpi/xenv/xenv.c | 10 +-
src/bios/bios32/bios32.c | 10 +-
src/bios/bios_info/bios_info.c | 2 +-
src/bios/ebdadump/ebdadump.c | 2 +-
src/bios/hdaaudio/hdaaudio.c | 6 +-
src/bios/mtrr/mtrr.c | 8 +-
src/bios/multiproc/mpdump.c | 196 ++++++++++----------
src/bios/pciirq/pciirq.c | 22 +--
src/bios/pnp/pnp.c | 20 +--
src/bios/romdump/romdump.c | 2 +-
src/cmos/cmosdump/cmosdump.c | 136 +++++++-------
src/cpu/cpufreq/cpufreq.c | 6 +-
src/dmi/dmicheck/dmicheck.c | 56 +++---
src/lib/include/fwts_log.h | 8 +-
src/lib/src/fwts_acpi_object_eval.c | 10 +-
src/lib/src/fwts_hwinfo.c | 28 +--
src/lib/src/fwts_memorymap.c | 6 +-
src/lib/src/fwts_oops.c | 2 +-
src/lib/src/fwts_summary.c | 14 +-
src/uefi/esrtdump/esrtdump.c | 22 +--
src/uefi/securebootcert/securebootcert.c | 16 +-
src/uefi/uefibootpath/uefibootpath.c | 18 +-
src/uefi/uefidump/uefidump.c | 108 +++++------
src/uefi/uefivarinfo/uefivarinfo.c | 12 +-
67 files changed, 1150 insertions(+), 1150 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7eaf213..a71a16a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2311,10 +2311,10 @@ fwts (0.25.03) quantal; urgency=low
* Update README
* lib: fwts_acpi_tables: fake table start address when loading from file.
* lib: fwts_framework: set log name suffix when using --log-type option
- * lib: fwts_summary: HTML summary should not be in verbatum
+ * lib: fwts_summary: HTML summary should not be in verbatim
* lib: fwts_log_html: tweak style and table format
- * lib: fwts_memorymap: output should be in verbatum style
- * bios: mtrr: make MTRR overview all verbatum style, looks better on HTML log
+ * lib: fwts_memorymap: output should be in verbatim style
+ * bios: mtrr: make MTRR overview all verbatim style, looks better on HTML log
* lib: add HTML logging backend
* lib: fwts_framework: log advice as LOG_ADVICE and not LOG_RESULT
* lib: fwts_framework: remove fwts_framework_results, remove redundant code
@@ -2353,7 +2353,7 @@ fwts (0.25.02) quantal; urgency=low
[Colin Ian King]
* doc: update man page
- * lib: fwts_summary.c: force non-word wrap using *_verbatum logging
+ * lib: fwts_summary.c: force non-word wrap using *_verbatim logging
* lib: fwts_framework: default to plaintext log type
* lib: re-work logging to add in json formatted log output
* lib: fwts_log: tidy up white spaces and strncmps
diff --git a/src/acpi/acpidump/acpidump.c b/src/acpi/acpidump/acpidump.c
index 689e8c6..ba53f1c 100644
--- a/src/acpi/acpidump/acpidump.c
+++ b/src/acpi/acpidump/acpidump.c
@@ -41,7 +41,7 @@ static void acpi_dump_raw_table(
int left = length - n;
char buffer[128];
fwts_dump_raw_data(buffer, sizeof(buffer), data + n, n, left > 16 ? 16 : left);
- fwts_log_info_verbatum(fw, "%s", buffer);
+ fwts_log_info_verbatim(fw, "%s", buffer);
}
}
@@ -55,23 +55,23 @@ static void acpidump_hdr(
{
if (length < sizeof(fwts_acpi_table_header))
return;
- fwts_log_info_verbatum(fw, "[000h 0000 4] Signature : \"%4.4s\"",
+ fwts_log_info_verbatim(fw, "[000h 0000 4] Signature : \"%4.4s\"",
hdr->signature);
- fwts_log_info_verbatum(fw, "[004h 0004 4] Table Length : %8.8" PRIx32,
+ fwts_log_info_verbatim(fw, "[004h 0004 4] Table Length : %8.8" PRIx32,
hdr->length);
- fwts_log_info_verbatum(fw, "[008h 0008 1] Revision : %2.2" PRIx8,
+ fwts_log_info_verbatim(fw, "[008h 0008 1] Revision : %2.2" PRIx8,
hdr->revision);
- fwts_log_info_verbatum(fw, "[009h 0009 1] Checksum : %2.2" PRIx8,
+ fwts_log_info_verbatim(fw, "[009h 0009 1] Checksum : %2.2" PRIx8,
hdr->checksum);
- fwts_log_info_verbatum(fw, "[00Ah 0010 6] Oem ID : \"%6.6s\"",
+ fwts_log_info_verbatim(fw, "[00Ah 0010 6] Oem ID : \"%6.6s\"",
hdr->oem_id);
- fwts_log_info_verbatum(fw, "[010h 0016 8] Oem Table ID : \"%8.8s\"",
+ fwts_log_info_verbatim(fw, "[010h 0016 8] Oem Table ID : \"%8.8s\"",
hdr->oem_tbl_id);
- fwts_log_info_verbatum(fw, "[018h 0024 4] Oem Revision : %8.8" PRIx32,
+ fwts_log_info_verbatim(fw, "[018h 0024 4] Oem Revision : %8.8" PRIx32,
hdr->oem_revision);
- fwts_log_info_verbatum(fw, "[01Ch 0028 4] Asl Compiler ID : \"%4.4s\"",
+ fwts_log_info_verbatim(fw, "[01Ch 0028 4] Asl Compiler ID : \"%4.4s\"",
hdr->creator_id);
- fwts_log_info_verbatum(fw, "[020h 0032 4] Asl Compiler Revision : %8.8" PRIx32,
+ fwts_log_info_verbatim(fw, "[020h 0032 4] Asl Compiler Revision : %8.8" PRIx32,
hdr->creator_revision);
}
@@ -87,23 +87,23 @@ static void acpidump_rsdp(
if (table->length < sizeof(fwts_acpi_table_rsdp))
return;
- fwts_log_info_verbatum(fw, "[000h 0000 8] Signature : \"%8.8s\"",
+ fwts_log_info_verbatim(fw, "[000h 0000 8] Signature : \"%8.8s\"",
rsdp->signature);
- fwts_log_info_verbatum(fw, "[008h 0008 1] Checksum : %1.1" PRIx8,
+ fwts_log_info_verbatim(fw, "[008h 0008 1] Checksum : %1.1" PRIx8,
rsdp->checksum);
- fwts_log_info_verbatum(fw, "[009h 0009 6] Oem ID : \"%6.6s\"",
+ fwts_log_info_verbatim(fw, "[009h 0009 6] Oem ID : \"%6.6s\"",
rsdp->oem_id);
- fwts_log_info_verbatum(fw, "[00fh 0015 1] Revision : %2.2" PRIx8,
+ fwts_log_info_verbatim(fw, "[00fh 0015 1] Revision : %2.2" PRIx8,
rsdp->revision);
- fwts_log_info_verbatum(fw, "[010h 0016 4] RSDT Address : %8.8" PRIx32,
+ fwts_log_info_verbatim(fw, "[010h 0016 4] RSDT Address : %8.8" PRIx32,
rsdp->rsdt_address);
- fwts_log_info_verbatum(fw, "[014h 0020 4] Table Length : %8.8" PRIx32,
+ fwts_log_info_verbatim(fw, "[014h 0020 4] Table Length : %8.8" PRIx32,
rsdp->length);
- fwts_log_info_verbatum(fw, "[018h 0024 8] XSDT Address : %16.16" PRIx64,
+ fwts_log_info_verbatim(fw, "[018h 0024 8] XSDT Address : %16.16" PRIx64,
rsdp->xsdt_address);
- fwts_log_info_verbatum(fw, "[020h 0032 1] Extended Checksum : %2.2" PRIx8,
+ fwts_log_info_verbatim(fw, "[020h 0032 1] Extended Checksum : %2.2" PRIx8,
rsdp->extended_checksum);
- fwts_log_info_verbatum(fw, "[021h 0033 3] Reserved : %2.2" PRIx8 " %2.2" PRIx8 " %2.2" PRIx8,
+ fwts_log_info_verbatim(fw, "[021h 0033 3] Reserved : %2.2" PRIx8 " %2.2" PRIx8 " %2.2" PRIx8,
rsdp->reserved[0], rsdp->reserved[1], rsdp->reserved[2]);
}
@@ -139,9 +139,9 @@ static int acpidump_test1(fwts_framework *fw)
break;
}
- fwts_log_info_verbatum(fw, "%s @ %lx (%zd bytes)%s",
+ fwts_log_info_verbatim(fw, "%s @ %lx (%zd bytes)%s",
table->name, (unsigned long)table->addr, table->length, provenance);
- fwts_log_info_verbatum(fw, "----");
+ fwts_log_info_verbatim(fw, "----");
if (!strcmp(table->name, "RSDP")) {
/* RSDP is a special case */
@@ -155,7 +155,7 @@ static int acpidump_test1(fwts_framework *fw)
fwts_acpi_table_get_header(&hdr, data);
acpidump_hdr(fw, &hdr, table->length);
- fwts_log_info_verbatum(fw, "Contains AML Object Code.");
+ fwts_log_info_verbatim(fw, "Contains AML Object Code.");
} else if (fwts_iasl_disassemble(fw, table, true, &output) != FWTS_OK) {
/* Cannot find, assume standard table header */
@@ -184,7 +184,7 @@ static int acpidump_test1(fwts_framework *fw)
if (!strncmp(text, "/*", 2))
skip = true;
if (!(ignore | skip | unknown))
- fwts_log_info_verbatum(fw, "%s", fwts_text_list_text(line));
+ fwts_log_info_verbatim(fw, "%s", fwts_text_list_text(line));
if (!strncmp(text, " */", 3))
skip = false;
}
diff --git a/src/acpi/asf/asf.c b/src/acpi/asf/asf.c
index fdc98d6..686111e 100644
--- a/src/acpi/asf/asf.c
+++ b/src/acpi/asf/asf.c
@@ -71,15 +71,15 @@ static void asf_check_info(
}
#if ASF_DUMP
- fwts_log_info_verbatum(fw, "ASF! ASF_INFO Record:");
- fwts_log_info_verbatum(fw, " Min Watchdog Reset Value: 0x%2.2" PRIx8, info->watchdog_reset_value);
- fwts_log_info_verbatum(fw, " Min Poll Wait Time: 0x%2.2" PRIx8, info->min_sensor_poll_wait_time);
- fwts_log_info_verbatum(fw, " System ID: 0x%2.2" PRIx8, info->id);
- fwts_log_info_verbatum(fw, " IANA Manufacturer ID: 0x%2.2" PRIx8, info->iana_id);
- fwts_log_info_verbatum(fw, " Feature Flags: 0x%2.2" PRIx8, info->flags);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, info->reserved1);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, info->reserved2);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, info->reserved3);
+ fwts_log_info_verbatim(fw, "ASF! ASF_INFO Record:");
+ fwts_log_info_verbatim(fw, " Min Watchdog Reset Value: 0x%2.2" PRIx8, info->watchdog_reset_value);
+ fwts_log_info_verbatim(fw, " Min Poll Wait Time: 0x%2.2" PRIx8, info->min_sensor_poll_wait_time);
+ fwts_log_info_verbatim(fw, " System ID: 0x%2.2" PRIx8, info->id);
+ fwts_log_info_verbatim(fw, " IANA Manufacturer ID: 0x%2.2" PRIx8, info->iana_id);
+ fwts_log_info_verbatim(fw, " Feature Flags: 0x%2.2" PRIx8, info->flags);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, info->reserved1);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, info->reserved2);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, info->reserved3);
#endif
if (info->watchdog_reset_value == 0) {
@@ -144,11 +144,11 @@ static void asf_check_alrt(
}
#if ASF_DUMP
- fwts_log_info_verbatum(fw, "ASF! ASF_ALRT Record:");
- fwts_log_info_verbatum(fw, " Assertion Event Mask: 0x%2.2" PRIx8, alrt->assertion_mask);
- fwts_log_info_verbatum(fw, " De-Assertion Event Mask: 0x%2.2" PRIx8, alrt->deassertion_mask);
- fwts_log_info_verbatum(fw, " Number of Alerts: 0x%2.2" PRIx8, alrt->number_of_alerts);
- fwts_log_info_verbatum(fw, " Array Element Length: 0x%2.2" PRIx8, alrt->array_length);
+ fwts_log_info_verbatim(fw, "ASF! ASF_ALRT Record:");
+ fwts_log_info_verbatim(fw, " Assertion Event Mask: 0x%2.2" PRIx8, alrt->assertion_mask);
+ fwts_log_info_verbatim(fw, " De-Assertion Event Mask: 0x%2.2" PRIx8, alrt->deassertion_mask);
+ fwts_log_info_verbatim(fw, " Number of Alerts: 0x%2.2" PRIx8, alrt->number_of_alerts);
+ fwts_log_info_verbatim(fw, " Array Element Length: 0x%2.2" PRIx8, alrt->array_length);
#endif
if ((alrt->number_of_alerts < 1) ||
@@ -193,19 +193,19 @@ static void asf_check_alrt(
(fwts_acpi_table_asf_alrt_element *)data;
#if ASF_DUMP
- fwts_log_info_verbatum(fw, "ASF! ASF_ALRT Element %" PRIu8 ":", i);
- fwts_log_info_verbatum(fw, " Device Address: 0x%2.2" PRIx8, element->device_addr);
- fwts_log_info_verbatum(fw, " Alert Command: 0x%2.2" PRIx8, element->command);
- fwts_log_info_verbatum(fw, " Alert Data Mask: 0x%2.2" PRIx8, element->data_mask);
- fwts_log_info_verbatum(fw, " Alert Compare Value: 0x%2.2" PRIx8, element->compare_value);
- fwts_log_info_verbatum(fw, " Alert Event Sensor Type: 0x%2.2" PRIx8, element->sensor_type);
- fwts_log_info_verbatum(fw, " Alert Event Type: 0x%2.2" PRIx8, element->event_type);
- fwts_log_info_verbatum(fw, " Alert Event Offset: 0x%2.2" PRIx8, element->event_offset);
- fwts_log_info_verbatum(fw, " Alert Source Type: 0x%2.2" PRIx8, element->event_source_type);
- fwts_log_info_verbatum(fw, " Alert Event Severity: 0x%2.2" PRIx8, element->event_severity);
- fwts_log_info_verbatum(fw, " Alert Sensor Number: 0x%2.2" PRIx8, element->sensor_number);
- fwts_log_info_verbatum(fw, " Alert Entity: 0x%2.2" PRIx8, element->entity);
- fwts_log_info_verbatum(fw, " Alert Entity Instance: 0x%2.2" PRIx8, element->entity_instance);
+ fwts_log_info_verbatim(fw, "ASF! ASF_ALRT Element %" PRIu8 ":", i);
+ fwts_log_info_verbatim(fw, " Device Address: 0x%2.2" PRIx8, element->device_addr);
+ fwts_log_info_verbatim(fw, " Alert Command: 0x%2.2" PRIx8, element->command);
+ fwts_log_info_verbatim(fw, " Alert Data Mask: 0x%2.2" PRIx8, element->data_mask);
+ fwts_log_info_verbatim(fw, " Alert Compare Value: 0x%2.2" PRIx8, element->compare_value);
+ fwts_log_info_verbatim(fw, " Alert Event Sensor Type: 0x%2.2" PRIx8, element->sensor_type);
+ fwts_log_info_verbatim(fw, " Alert Event Type: 0x%2.2" PRIx8, element->event_type);
+ fwts_log_info_verbatim(fw, " Alert Event Offset: 0x%2.2" PRIx8, element->event_offset);
+ fwts_log_info_verbatim(fw, " Alert Source Type: 0x%2.2" PRIx8, element->event_source_type);
+ fwts_log_info_verbatim(fw, " Alert Event Severity: 0x%2.2" PRIx8, element->event_severity);
+ fwts_log_info_verbatim(fw, " Alert Sensor Number: 0x%2.2" PRIx8, element->sensor_number);
+ fwts_log_info_verbatim(fw, " Alert Entity: 0x%2.2" PRIx8, element->entity);
+ fwts_log_info_verbatim(fw, " Alert Entity Instance: 0x%2.2" PRIx8, element->entity_instance);
#endif
if (element->event_offset & 0x80) {
@@ -247,10 +247,10 @@ static void asf_check_rctl(
return;
}
#if ASF_DUMP
- fwts_log_info_verbatum(fw, "ASF! ASF_RCTL Record:");
- fwts_log_info_verbatum(fw, " Number of Controls: 0x%2.2" PRIx8, rctl->number_of_controls);
- fwts_log_info_verbatum(fw, " Array Element Length: 0x%2.2" PRIx8, rctl->array_element_length);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, rctl->array_element_length);
+ fwts_log_info_verbatim(fw, "ASF! ASF_RCTL Record:");
+ fwts_log_info_verbatim(fw, " Number of Controls: 0x%2.2" PRIx8, rctl->number_of_controls);
+ fwts_log_info_verbatim(fw, " Array Element Length: 0x%2.2" PRIx8, rctl->array_element_length);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, rctl->array_element_length);
#endif
if (rctl->array_element_length != sizeof(fwts_acpi_table_asf_rctl_element)) {
*passed = false;
@@ -282,11 +282,11 @@ static void asf_check_rctl(
fwts_acpi_table_asf_rctl_element *element =
(fwts_acpi_table_asf_rctl_element *)data;
#if ASF_DUMP
- fwts_log_info_verbatum(fw, "ASF! ASF_RCTL Element %" PRIu8 ":", i);
- fwts_log_info_verbatum(fw, " Control Function: 0x%2.2" PRIx8, element->control_function);
- fwts_log_info_verbatum(fw, " Control Device Address: 0x%2.2" PRIx8, element->control_device_addr);
- fwts_log_info_verbatum(fw, " Control Command: 0x%2.2" PRIx8, element->control_command);
- fwts_log_info_verbatum(fw, " Control Value: 0x%2.2" PRIx8, element->control_value);
+ fwts_log_info_verbatim(fw, "ASF! ASF_RCTL Element %" PRIu8 ":", i);
+ fwts_log_info_verbatim(fw, " Control Function: 0x%2.2" PRIx8, element->control_function);
+ fwts_log_info_verbatim(fw, " Control Device Address: 0x%2.2" PRIx8, element->control_device_addr);
+ fwts_log_info_verbatim(fw, " Control Command: 0x%2.2" PRIx8, element->control_command);
+ fwts_log_info_verbatim(fw, " Control Value: 0x%2.2" PRIx8, element->control_value);
#endif
if (element->control_function > 0x03) {
@@ -328,8 +328,8 @@ static void asf_check_rmcp(
return;
}
#if ASF_DUMP
- fwts_log_info_verbatum(fw, "ASF! ASF_RMCP Record:");
- fwts_log_info_verbatum(fw, " Remote Control Cap.: "
+ fwts_log_info_verbatim(fw, "ASF! ASF_RMCP Record:");
+ fwts_log_info_verbatim(fw, " Remote Control Cap.: "
"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " "
"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
rmcp->remote_control_capabilities[0],
@@ -339,13 +339,13 @@ static void asf_check_rmcp(
rmcp->remote_control_capabilities[4],
rmcp->remote_control_capabilities[5],
rmcp->remote_control_capabilities[6]);
- fwts_log_info_verbatum(fw, " Boot Opt. Completion Code:0x%2.2" PRIx8, rmcp->completion_code);
- fwts_log_info_verbatum(fw, " IANA Enterprise ID: 0x%8.8" PRIx32, rmcp->iana);
- fwts_log_info_verbatum(fw, " Special Command: 0x%2.2" PRIx8, rmcp->special_command);
- fwts_log_info_verbatum(fw, " Special Command Parameter:0x%4.4" PRIx16, rmcp->special_command_param);
- fwts_log_info_verbatum(fw, " Boot Options: 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Boot Opt. Completion Code:0x%2.2" PRIx8, rmcp->completion_code);
+ fwts_log_info_verbatim(fw, " IANA Enterprise ID: 0x%8.8" PRIx32, rmcp->iana);
+ fwts_log_info_verbatim(fw, " Special Command: 0x%2.2" PRIx8, rmcp->special_command);
+ fwts_log_info_verbatim(fw, " Special Command Parameter:0x%4.4" PRIx16, rmcp->special_command_param);
+ fwts_log_info_verbatim(fw, " Boot Options: 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
rmcp->boot_options[0], rmcp->boot_options[1]);
- fwts_log_info_verbatum(fw, " OEM Parameters: 0x%4.4" PRIx16, rmcp->oem_parameters);
+ fwts_log_info_verbatim(fw, " OEM Parameters: 0x%4.4" PRIx16, rmcp->oem_parameters);
#endif
/* Specification, page 33-34 */
@@ -394,9 +394,9 @@ static void asf_check_addr(
return;
}
#if ASF_DUMP
- fwts_log_info_verbatum(fw, "ASF! ASF_ADDR Record:");
- fwts_log_info_verbatum(fw, " SEEPROM Address: 0x%2.2" PRIx8, addr->seeprom_addr);
- fwts_log_info_verbatum(fw, " Number of Devices: 0x%2.2" PRIx8, addr->number_of_devices);
+ fwts_log_info_verbatim(fw, "ASF! ASF_ADDR Record:");
+ fwts_log_info_verbatim(fw, " SEEPROM Address: 0x%2.2" PRIx8, addr->seeprom_addr);
+ fwts_log_info_verbatim(fw, " Number of Devices: 0x%2.2" PRIx8, addr->number_of_devices);
#endif
total_length = sizeof(fwts_acpi_table_asf_addr) +
(addr->number_of_devices * sizeof(fwts_acpi_table_asf_addr_element));
@@ -418,7 +418,7 @@ static void asf_check_addr(
for (i = 0; i < addr->number_of_devices; i++) {
fwts_acpi_table_asf_addr_element *element =
(fwts_acpi_table_asf_addr_element *)data;
- fwts_log_info_verbatum(fw, " Fixed SMBus Address 0x%2.2" PRIx8, element->fixed_smbus_addr);
+ fwts_log_info_verbatim(fw, " Fixed SMBus Address 0x%2.2" PRIx8, element->fixed_smbus_addr);
data += sizeof(fwts_acpi_table_asf_addr_element);
}
#endif
@@ -439,7 +439,7 @@ static int asf_test1(fwts_framework *fw)
uint8_t *data = (uint8_t *)table->data;
ssize_t length = (ssize_t)hdr->length;
- fwts_log_info_verbatum(fw, "ASF! Hardware Error Source Table");
+ fwts_log_info_verbatim(fw, "ASF! Hardware Error Source Table");
data += sizeof(fwts_acpi_table_header);
length -= sizeof(fwts_acpi_table_header);
@@ -463,9 +463,9 @@ static int asf_test1(fwts_framework *fw)
}
#if ASF_DUMP
- fwts_log_info_verbatum(fw, "Type: 0x%2.2" PRIx8, asf_hdr->type);
- fwts_log_info_verbatum(fw, "Reserved: 0x%2.2" PRIx8, asf_hdr->reserved);
- fwts_log_info_verbatum(fw, "Length: 0x%4.4" PRIx16, asf_hdr->length);
+ fwts_log_info_verbatim(fw, "Type: 0x%2.2" PRIx8, asf_hdr->type);
+ fwts_log_info_verbatim(fw, "Reserved: 0x%2.2" PRIx8, asf_hdr->reserved);
+ fwts_log_info_verbatim(fw, "Length: 0x%4.4" PRIx16, asf_hdr->length);
#endif
if (asf_hdr->reserved) {
diff --git a/src/acpi/aspt/aspt.c b/src/acpi/aspt/aspt.c
index 4051305..66b0c3c 100644
--- a/src/acpi/aspt/aspt.c
+++ b/src/acpi/aspt/aspt.c
@@ -64,14 +64,14 @@ static int aspt_test1(fwts_framework *fw)
goto done;
}
- fwts_log_info_verbatum(fw, "ASPT Table:");
- fwts_log_info_verbatum(fw, " SPTT Start Address: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, "ASPT Table:");
+ fwts_log_info_verbatim(fw, " SPTT Start Address: 0x%8.8" PRIx32,
aspt->sptt_addr_start);
- fwts_log_info_verbatum(fw, " SPTT End Address: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " SPTT End Address: 0x%8.8" PRIx32,
aspt->sptt_addr_end);
- fwts_log_info_verbatum(fw, " AMRT Start Address: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " AMRT Start Address: 0x%8.8" PRIx32,
aspt->amrt_addr_start);
- fwts_log_info_verbatum(fw, " AMRT End Address: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " AMRT End Address: 0x%8.8" PRIx32,
aspt->amrt_addr_end);
fwts_log_nl(fw);
diff --git a/src/acpi/bert/bert.c b/src/acpi/bert/bert.c
index d2b254c..19ce608 100644
--- a/src/acpi/bert/bert.c
+++ b/src/acpi/bert/bert.c
@@ -53,9 +53,9 @@ static int bert_test1(fwts_framework *fw)
bool passed = true;
const fwts_acpi_table_bert *bert = (const fwts_acpi_table_bert *)table->data;
- fwts_log_info_verbatum(fw, "Boot Error Record Table:");
- fwts_log_info_verbatum(fw, " Error Region Length 0x%8.8" PRIx32, bert->boot_error_region_length);
- fwts_log_info_verbatum(fw, " Error Region 0x%16.16" PRIx64, bert->boot_error_region);
+ fwts_log_info_verbatim(fw, "Boot Error Record Table:");
+ fwts_log_info_verbatim(fw, " Error Region Length 0x%8.8" PRIx32, bert->boot_error_region_length);
+ fwts_log_info_verbatim(fw, " Error Region 0x%16.16" PRIx64, bert->boot_error_region);
fwts_log_nl(fw);
/* Sanity check length */
@@ -92,24 +92,24 @@ static int bert_test1(fwts_framework *fw)
fwts_acpi_table_boot_error_region *region =
(fwts_acpi_table_boot_error_region *)mapping;
- fwts_log_info_verbatum(fw, "Boot Error Region:");
- fwts_log_info_verbatum(fw, " Block Status: bit [0] 0x%" PRIx32 " (Uncorrectable Error Valid)",
+ fwts_log_info_verbatim(fw, "Boot Error Region:");
+ fwts_log_info_verbatim(fw, " Block Status: bit [0] 0x%" PRIx32 " (Uncorrectable Error Valid)",
(region->block_status >> 0) & 1);
- fwts_log_info_verbatum(fw, " Block Status: bit [1] 0x%" PRIx32 " (Correctable Error Valid)",
+ fwts_log_info_verbatim(fw, " Block Status: bit [1] 0x%" PRIx32 " (Correctable Error Valid)",
(region->block_status >> 1) & 1);
- fwts_log_info_verbatum(fw, " Block Status: bit [2] 0x%" PRIx32 " (Multiple Uncorrectable Errors)",
+ fwts_log_info_verbatim(fw, " Block Status: bit [2] 0x%" PRIx32 " (Multiple Uncorrectable Errors)",
(region->block_status >> 2) & 1);
- fwts_log_info_verbatum(fw, " Block Status: bit [3] 0x%" PRIx32 " (Multiple Correctable Errors)",
+ fwts_log_info_verbatim(fw, " Block Status: bit [3] 0x%" PRIx32 " (Multiple Correctable Errors)",
(region->block_status >> 3) & 1);
- fwts_log_info_verbatum(fw, " Block Status: bit [13:4] 0x%" PRIx32 " (Error Data Entry Count)",
+ fwts_log_info_verbatim(fw, " Block Status: bit [13:4] 0x%" PRIx32 " (Error Data Entry Count)",
(region->block_status >> 4) & 0x3ff);
- fwts_log_info_verbatum(fw, " Raw Data Offset: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Raw Data Offset: 0x%8.8" PRIx32,
region->raw_data_offset);
- fwts_log_info_verbatum(fw, " Raw Data Length: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Raw Data Length: 0x%8.8" PRIx32,
region->raw_data_length);
- fwts_log_info_verbatum(fw, " Data Length: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Data Length: 0x%8.8" PRIx32,
region->data_length);
- fwts_log_info_verbatum(fw, " Error Severity 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Error Severity 0x%8.8" PRIx32,
region->error_severity);
/* Sanity check raw data fields */
diff --git a/src/acpi/bgrt/bgrt.c b/src/acpi/bgrt/bgrt.c
index 0d1fc6a..5a58632 100644
--- a/src/acpi/bgrt/bgrt.c
+++ b/src/acpi/bgrt/bgrt.c
@@ -52,13 +52,13 @@ static int bgrt_test1(fwts_framework *fw)
fwts_acpi_table_bgrt *bgrt = (fwts_acpi_table_bgrt*)table->data;
bool passed = true;
- fwts_log_info_verbatum(fw, "BGRT Boot Graphics Resource Table:");
- fwts_log_info_verbatum(fw, " Version: 0x%4.4" PRIx16, bgrt->version);
- fwts_log_info_verbatum(fw, " Status: 0x%2.2" PRIx8, bgrt->status);
- fwts_log_info_verbatum(fw, " Image Type: 0x%2.2" PRIx8, bgrt->image_type);
- fwts_log_info_verbatum(fw, " Image Memory Address: 0x%16.16" PRIx64, bgrt->image_addr);
- fwts_log_info_verbatum(fw, " Image Offset X: 0x%8.8" PRIx32, bgrt->image_offset_x);
- fwts_log_info_verbatum(fw, " Image Offset Y: 0x%8.8" PRIx32, bgrt->image_offset_y);
+ fwts_log_info_verbatim(fw, "BGRT Boot Graphics Resource Table:");
+ fwts_log_info_verbatim(fw, " Version: 0x%4.4" PRIx16, bgrt->version);
+ fwts_log_info_verbatim(fw, " Status: 0x%2.2" PRIx8, bgrt->status);
+ fwts_log_info_verbatim(fw, " Image Type: 0x%2.2" PRIx8, bgrt->image_type);
+ fwts_log_info_verbatim(fw, " Image Memory Address: 0x%16.16" PRIx64, bgrt->image_addr);
+ fwts_log_info_verbatim(fw, " Image Offset X: 0x%8.8" PRIx32, bgrt->image_offset_x);
+ fwts_log_info_verbatim(fw, " Image Offset Y: 0x%8.8" PRIx32, bgrt->image_offset_y);
if (bgrt->version != 1) {
passed = false;
diff --git a/src/acpi/boot/boot.c b/src/acpi/boot/boot.c
index fba9cf4..8e35d63 100644
--- a/src/acpi/boot/boot.c
+++ b/src/acpi/boot/boot.c
@@ -64,11 +64,11 @@ static int boot_test1(fwts_framework *fw)
goto done;
}
- fwts_log_info_verbatum(fw, "BOOT Table:");
- fwts_log_info_verbatum(fw, " CMOS Index: 0x%2.2" PRIx8, boot->cmos_index);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, boot->reserved[0]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, boot->reserved[1]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, boot->reserved[2]);
+ fwts_log_info_verbatim(fw, "BOOT Table:");
+ fwts_log_info_verbatim(fw, " CMOS Index: 0x%2.2" PRIx8, boot->cmos_index);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, boot->reserved[0]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, boot->reserved[1]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, boot->reserved[2]);
fwts_log_nl(fw);
/*
@@ -83,13 +83,13 @@ static int boot_test1(fwts_framework *fw)
fwts_cmos_read(boot->cmos_index, &val);
- fwts_log_info_verbatum(fw, "CMOS value: Bit 0x%" PRIx8, val);
- fwts_log_info_verbatum(fw, " PnP OS [0] 0x%" PRIx8, (val >> 0) & 1);
- fwts_log_info_verbatum(fw, " Booting Bit [1] 0x%" PRIx8, (val >> 1) & 1);
- fwts_log_info_verbatum(fw, " DIAG Bit [2] 0x%" PRIx8, (val >> 2) & 1);
- fwts_log_info_verbatum(fw, " SUPPRESSBOOTDISPLAY [3] 0x%" PRIx8, (val >> 3) & 1);
- fwts_log_info_verbatum(fw, " RESERVED [4-6] 0x%" PRIx8, (val >> 4) & 7);
- fwts_log_info_verbatum(fw, " PARITY [7] 0x%" PRIx8, (val >> 7) & 1);
+ fwts_log_info_verbatim(fw, "CMOS value: Bit 0x%" PRIx8, val);
+ fwts_log_info_verbatim(fw, " PnP OS [0] 0x%" PRIx8, (val >> 0) & 1);
+ fwts_log_info_verbatim(fw, " Booting Bit [1] 0x%" PRIx8, (val >> 1) & 1);
+ fwts_log_info_verbatim(fw, " DIAG Bit [2] 0x%" PRIx8, (val >> 2) & 1);
+ fwts_log_info_verbatim(fw, " SUPPRESSBOOTDISPLAY [3] 0x%" PRIx8, (val >> 3) & 1);
+ fwts_log_info_verbatim(fw, " RESERVED [4-6] 0x%" PRIx8, (val >> 4) & 7);
+ fwts_log_info_verbatim(fw, " PARITY [7] 0x%" PRIx8, (val >> 7) & 1);
/* Ignore doing parity check sum */
}
done:
diff --git a/src/acpi/cpep/cpep.c b/src/acpi/cpep/cpep.c
index 02dd102..b4f832a 100644
--- a/src/acpi/cpep/cpep.c
+++ b/src/acpi/cpep/cpep.c
@@ -53,8 +53,8 @@ static int cpep_test1(fwts_framework *fw)
bool passed = true;
uint32_t i, n;
- fwts_log_info_verbatum(fw, "CPEP Corrected Platform Error Polling Table:");
- fwts_log_info_verbatum(fw, " Reserved: "
+ fwts_log_info_verbatim(fw, "CPEP Corrected Platform Error Polling Table:");
+ fwts_log_info_verbatim(fw, " Reserved: "
" 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8
" 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 ,
cpep->reserved[0], cpep->reserved[1], cpep->reserved[2], cpep->reserved[3],
diff --git a/src/acpi/crsdump/crsdump.c b/src/acpi/crsdump/crsdump.c
index 3f608b1..910776c 100644
--- a/src/acpi/crsdump/crsdump.c
+++ b/src/acpi/crsdump/crsdump.c
@@ -50,7 +50,7 @@ static void crsdump_show_header(
const char *objname,
const char *crs_name)
{
- fwts_log_info_verbatum(fw, "%s (%s):", objname, crs_name);
+ fwts_log_info_verbatim(fw, "%s (%s):", objname, crs_name);
}
static void crsdump_show_info(
@@ -106,15 +106,15 @@ static void crsdump_show_info(
val = val << info->shift;
if (info->annotation) {
- fwts_log_info_verbatum(fw, " 0x%4.4" PRIx16 ": %-30.30s: 0x%-*.*" PRIx64 " (%s)",
+ fwts_log_info_verbatim(fw, " 0x%4.4" PRIx16 ": %-30.30s: 0x%-*.*" PRIx64 " (%s)",
(uint16_t)info->offset, info->label, hexdigits, hexdigits, val,
info->annotation[val]);
} else if (info->callback) {
- fwts_log_info_verbatum(fw, " 0x%4.4" PRIx16 ": %-30.30s: 0x%-*.*" PRIx64 " (%s)",
+ fwts_log_info_verbatim(fw, " 0x%4.4" PRIx16 ": %-30.30s: 0x%-*.*" PRIx64 " (%s)",
(uint16_t)info->offset, info->label, hexdigits, hexdigits, val,
info->callback(val));
} else {
- fwts_log_info_verbatum(fw, " 0x%4.4" PRIx16 ": %-30.30s: 0x%-*.*" PRIx64,
+ fwts_log_info_verbatim(fw, " 0x%4.4" PRIx16 ": %-30.30s: 0x%-*.*" PRIx64,
(uint16_t)info->offset, info->label, hexdigits, hexdigits, val);
}
}
@@ -149,7 +149,7 @@ static void crsdump_data(
fwts_dump_raw_data(buffer, sizeof(buffer), data + i, i, n > 16 ? 16 : n);
buffer[56] = '\0'; /* Truncate off text version of hex dump */
- fwts_log_info_verbatum(fw, " 0x%4.4" PRIx16 ": %-30.30s: %s",
+ fwts_log_info_verbatim(fw, " 0x%4.4" PRIx16 ": %-30.30s: %s",
(uint16_t)i, "Hex Dump", buffer + 8);
}
}
diff --git a/src/acpi/dbg2/dbg2.c b/src/acpi/dbg2/dbg2.c
index e19b372..f8f3d09 100644
--- a/src/acpi/dbg2/dbg2.c
+++ b/src/acpi/dbg2/dbg2.c
@@ -187,9 +187,9 @@ static int dbg2_test1(fwts_framework *fw)
goto done;
}
- fwts_log_info_verbatum(fw, "DBG2 Table:");
- fwts_log_info_verbatum(fw, " Info Offset: 0x%8.8" PRIx32, dbg2->info_offset);
- fwts_log_info_verbatum(fw, " Info Count: 0x%8.8" PRIx32, dbg2->info_count);
+ fwts_log_info_verbatim(fw, "DBG2 Table:");
+ fwts_log_info_verbatim(fw, " Info Offset: 0x%8.8" PRIx32, dbg2->info_offset);
+ fwts_log_info_verbatim(fw, " Info Count: 0x%8.8" PRIx32, dbg2->info_count);
fwts_log_nl(fw);
total_size = dbg2->info_offset +
@@ -265,21 +265,21 @@ static int dbg2_test1(fwts_framework *fw)
break;
}
- fwts_log_info_verbatum(fw, "DBG2 Info Structure %" PRIu32 ":", i);
- fwts_log_info_verbatum(fw, " Revision: 0x%2.2" PRIx8, info->revision);
- fwts_log_info_verbatum(fw, " Length: 0x%4.4" PRIx16, info->length);
- fwts_log_info_verbatum(fw, " Number of Registers 0x%2.2" PRIx8, info->number_of_regs);
- fwts_log_info_verbatum(fw, " Namespace String Length: 0x%4.4" PRIx16, info->namespace_length);
- fwts_log_info_verbatum(fw, " Namespace String Offset: 0x%4.4" PRIx16, info->namespace_offset);
- fwts_log_info_verbatum(fw, " OEM Data Length: 0x%4.4" PRIx16, info->oem_data_length);
- fwts_log_info_verbatum(fw, " OEM Data Offset: 0x%4.4" PRIx16, info->oem_data_offset);
- fwts_log_info_verbatum(fw, " Port Type: 0x%4.4" PRIx16 " (%s)", info->port_type,
+ fwts_log_info_verbatim(fw, "DBG2 Info Structure %" PRIu32 ":", i);
+ fwts_log_info_verbatim(fw, " Revision: 0x%2.2" PRIx8, info->revision);
+ fwts_log_info_verbatim(fw, " Length: 0x%4.4" PRIx16, info->length);
+ fwts_log_info_verbatim(fw, " Number of Registers 0x%2.2" PRIx8, info->number_of_regs);
+ fwts_log_info_verbatim(fw, " Namespace String Length: 0x%4.4" PRIx16, info->namespace_length);
+ fwts_log_info_verbatim(fw, " Namespace String Offset: 0x%4.4" PRIx16, info->namespace_offset);
+ fwts_log_info_verbatim(fw, " OEM Data Length: 0x%4.4" PRIx16, info->oem_data_length);
+ fwts_log_info_verbatim(fw, " OEM Data Offset: 0x%4.4" PRIx16, info->oem_data_offset);
+ fwts_log_info_verbatim(fw, " Port Type: 0x%4.4" PRIx16 " (%s)", info->port_type,
port ? port : "(Reserved)");
- fwts_log_info_verbatum(fw, " Port Subtype: 0x%4.4" PRIx16 " (%s)", info->port_subtype,
+ fwts_log_info_verbatim(fw, " Port Subtype: 0x%4.4" PRIx16 " (%s)", info->port_subtype,
subport ? subport : "(Reserved)");
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, info->reserved);
- fwts_log_info_verbatum(fw, " Base Address Offset: 0x%4.4" PRIx16, info->base_address_offset);
- fwts_log_info_verbatum(fw, " Address Size Offset: 0x%4.4" PRIx16, info->address_size_offset);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, info->reserved);
+ fwts_log_info_verbatim(fw, " Base Address Offset: 0x%4.4" PRIx16, info->base_address_offset);
+ fwts_log_info_verbatim(fw, " Address Size Offset: 0x%4.4" PRIx16, info->address_size_offset);
fwts_log_nl(fw);
if (info->revision != 0) {
@@ -320,7 +320,7 @@ static int dbg2_test1(fwts_framework *fw)
if (ok) {
char *str = (char *)table->data + offset + info->namespace_offset;
dbg2_check_namespace_string(fw, str, info->namespace_length, &passed);
- fwts_log_info_verbatum(fw, " Namespace String: '%s'", str);
+ fwts_log_info_verbatim(fw, " Namespace String: '%s'", str);
if (strcmp(str, "."))
dbg2_obj_find(fw, str, &ok);
}
@@ -351,11 +351,11 @@ static int dbg2_test1(fwts_framework *fw)
uint32_t *addrsize = (uint32_t *)(table->data + offset + info->address_size_offset);
for (j = 0; j < info->number_of_regs; j++, gas++, addrsize++) {
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, gas->address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, gas->register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, gas->register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, gas->access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, gas->address);
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, gas->address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, gas->register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, gas->register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, gas->access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, gas->address);
fwts_log_nl(fw);
if (*addrsize == 0) {
diff --git a/src/acpi/dbgp/dbgp.c b/src/acpi/dbgp/dbgp.c
index 49ba618..9b867ae 100644
--- a/src/acpi/dbgp/dbgp.c
+++ b/src/acpi/dbgp/dbgp.c
@@ -77,18 +77,18 @@ static int dbgp_test1(fwts_framework *fw)
break;
}
- fwts_log_info_verbatum(fw, "DBGP Table:");
- fwts_log_info_verbatum(fw, " Interface Type 0x%2.2" PRIx8 " (%s)",
+ fwts_log_info_verbatim(fw, "DBGP Table:");
+ fwts_log_info_verbatim(fw, " Interface Type 0x%2.2" PRIx8 " (%s)",
dbgp->interface_type, interface_type);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, dbgp->reserved1[0]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, dbgp->reserved1[1]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, dbgp->reserved1[2]);
- fwts_log_info_verbatum(fw, " Base Address:");
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, dbgp->base_address.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, dbgp->base_address.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, dbgp->base_address.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, dbgp->base_address.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, dbgp->base_address.address);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, dbgp->reserved1[0]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, dbgp->reserved1[1]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, dbgp->reserved1[2]);
+ fwts_log_info_verbatim(fw, " Base Address:");
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, dbgp->base_address.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, dbgp->base_address.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, dbgp->base_address.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, dbgp->base_address.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, dbgp->base_address.address);
fwts_log_nl(fw);
if (dbgp->interface_type > 2) {
diff --git a/src/acpi/ecdt/ecdt.c b/src/acpi/ecdt/ecdt.c
index 4e844c1..2da61be 100644
--- a/src/acpi/ecdt/ecdt.c
+++ b/src/acpi/ecdt/ecdt.c
@@ -130,22 +130,22 @@ static int ecdt_test1(fwts_framework *fw)
}
/* Now we have got some sane data, dump the ECDT */
- fwts_log_info_verbatum(fw, "ECDT Embedded Controller Boot Resources Table:");
- fwts_log_info_verbatum(fw, " EC_CONTROL:");
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, ecdt->ec_control.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, ecdt->ec_control.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, ecdt->ec_control.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, ecdt->ec_control.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, ecdt->ec_control.address);
- fwts_log_info_verbatum(fw, " EC_DATA:");
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, ecdt->ec_data.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, ecdt->ec_data.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, ecdt->ec_data.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, ecdt->ec_data.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, ecdt->ec_data.address);
- fwts_log_info_verbatum(fw, " UID: 0x%8.8" PRIx32, ecdt->uid);
- fwts_log_info_verbatum(fw, " GPE_BIT: 0x%2.2" PRIx8, ecdt->gpe_bit);
- fwts_log_info_verbatum(fw, " EC_ID: '%s'", (char *)ecdt->ec_id);
+ fwts_log_info_verbatim(fw, "ECDT Embedded Controller Boot Resources Table:");
+ fwts_log_info_verbatim(fw, " EC_CONTROL:");
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, ecdt->ec_control.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, ecdt->ec_control.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, ecdt->ec_control.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, ecdt->ec_control.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, ecdt->ec_control.address);
+ fwts_log_info_verbatim(fw, " EC_DATA:");
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, ecdt->ec_data.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, ecdt->ec_data.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, ecdt->ec_data.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, ecdt->ec_data.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, ecdt->ec_data.address);
+ fwts_log_info_verbatim(fw, " UID: 0x%8.8" PRIx32, ecdt->uid);
+ fwts_log_info_verbatim(fw, " GPE_BIT: 0x%2.2" PRIx8, ecdt->gpe_bit);
+ fwts_log_info_verbatim(fw, " EC_ID: '%s'", (char *)ecdt->ec_id);
fwts_log_nl(fw);
if (fwts_acpi_init(fw) != FWTS_OK) {
diff --git a/src/acpi/einj/einj.c b/src/acpi/einj/einj.c
index 3eae36a..1b8b8db 100644
--- a/src/acpi/einj/einj.c
+++ b/src/acpi/einj/einj.c
@@ -53,14 +53,14 @@ static int einj_test1(fwts_framework *fw)
reserved = einj->reserved[0] + (einj->reserved[1] << 4) +
(einj->reserved[2] << 8);
- fwts_log_info_verbatum(fw, "EINJ Error Injection Table:");
- fwts_log_info_verbatum(fw, " Injection Header Size: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, "EINJ Error Injection Table:");
+ fwts_log_info_verbatim(fw, " Injection Header Size: 0x%8.8" PRIx32,
einj->header_size);
- fwts_log_info_verbatum(fw, " Injection Flags: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Injection Flags: 0x%8.8" PRIx32,
einj->flags);
- fwts_log_info_verbatum(fw, " Reserved: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Reserved: 0x%8.8" PRIx32,
reserved);
- fwts_log_info_verbatum(fw, " Injection Entry Count: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Injection Entry Count: 0x%8.8" PRIx32,
einj->count);
if (einj->flags) {
@@ -85,29 +85,29 @@ static int einj_test1(fwts_framework *fw)
(char *) einj + 48;
for (i = 0; i < einj->count; i++, entry++) {
fwts_acpi_gas gas = entry->register_region;
- fwts_log_info_verbatum(fw, " Injection Instruction Entry %2.2"
+ fwts_log_info_verbatim(fw, " Injection Instruction Entry %2.2"
PRId8, i);
- fwts_log_info_verbatum(fw, " Injection Action : 0x%2.2"
+ fwts_log_info_verbatim(fw, " Injection Action : 0x%2.2"
PRIx8, entry->serialization_action);
- fwts_log_info_verbatum(fw, " Instruction : 0x%2.2"
+ fwts_log_info_verbatim(fw, " Instruction : 0x%2.2"
PRIx8, entry->instruction);
- fwts_log_info_verbatum(fw, " Flags : 0x%2.2"
+ fwts_log_info_verbatim(fw, " Flags : 0x%2.2"
PRIx8, entry->flags);
- fwts_log_info_verbatum(fw, " Reserved : 0x%2.2"
+ fwts_log_info_verbatim(fw, " Reserved : 0x%2.2"
PRIx8, entry->reserved);
- fwts_log_info_verbatum(fw, " Address Space ID : 0x%2.2"
+ fwts_log_info_verbatim(fw, " Address Space ID : 0x%2.2"
PRIx8, gas.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width : 0x%2.2"
+ fwts_log_info_verbatim(fw, " Register Bit Width : 0x%2.2"
PRIx8, gas.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset : 0x%2.2"
+ fwts_log_info_verbatim(fw, " Register Bit Offset : 0x%2.2"
PRIx8, gas.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size : 0x%2.2"
+ fwts_log_info_verbatim(fw, " Access Size : 0x%2.2"
PRIx8, gas.access_width);
- fwts_log_info_verbatum(fw, " Address : 0x%16.16"
+ fwts_log_info_verbatim(fw, " Address : 0x%16.16"
PRIx64, gas.address);
- fwts_log_info_verbatum(fw, " Value : 0x%16.16"
+ fwts_log_info_verbatim(fw, " Value : 0x%16.16"
PRIx64, entry->value);
- fwts_log_info_verbatum(fw, " Mask : 0x%16.16"
+ fwts_log_info_verbatim(fw, " Mask : 0x%16.16"
PRIx64, entry->mask);
if (entry->serialization_action > 0x8 &&
diff --git a/src/acpi/erst/erst.c b/src/acpi/erst/erst.c
index f84463f..b8c1ced 100644
--- a/src/acpi/erst/erst.c
+++ b/src/acpi/erst/erst.c
@@ -53,10 +53,10 @@ static int erst_test1(fwts_framework *fw)
uint64_t total_length;
uint32_t i;
- fwts_log_info_verbatum(fw, "ERST Error Record Serialization Table :");
- fwts_log_info_verbatum(fw, " Serialization Hdr. Size: 0x%8.8" PRIx32, erst->serialization_header_size);
- fwts_log_info_verbatum(fw, " Reserved: 0x%8.8" PRIx32, erst->reserved);
- fwts_log_info_verbatum(fw, " Instruction Entry Count: 0x%8.8" PRIx32, erst->instruction_entry_count);
+ fwts_log_info_verbatim(fw, "ERST Error Record Serialization Table :");
+ fwts_log_info_verbatim(fw, " Serialization Hdr. Size: 0x%8.8" PRIx32, erst->serialization_header_size);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%8.8" PRIx32, erst->reserved);
+ fwts_log_info_verbatim(fw, " Instruction Entry Count: 0x%8.8" PRIx32, erst->instruction_entry_count);
if (erst->reserved) {
passed = false;
@@ -98,18 +98,18 @@ static int erst_test1(fwts_framework *fw)
#if defined(ERST_DEBUG_ENTRY)
/* Disable this for now, it causes the test to be too verbose */
- fwts_log_info_verbatum(fw, "ERST Serialization Instruction Entry %" PRIu32 ":", i);
- fwts_log_info_verbatum(fw, " Serialization Action: 0x%8.8" PRIx8, entry->serialization_action);
- fwts_log_info_verbatum(fw, " Instruction: 0x%8.8" PRIx8, entry->instruction);
- fwts_log_info_verbatum(fw, " Flags: 0x%8.8" PRIx8, entry->flags);
- fwts_log_info_verbatum(fw, " Reserved: 0x%8.8" PRIx8, entry->reserved);
- fwts_log_info_verbatum(fw, " Value: 0x%16.16" PRIx64, entry->value);
- fwts_log_info_verbatum(fw, " Mask: 0x%16.16" PRIx64, entry->mask);
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, entry->register_region.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, entry->register_region.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, entry->register_region.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, entry->register_region.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, entry->register_region.address);
+ fwts_log_info_verbatim(fw, "ERST Serialization Instruction Entry %" PRIu32 ":", i);
+ fwts_log_info_verbatim(fw, " Serialization Action: 0x%8.8" PRIx8, entry->serialization_action);
+ fwts_log_info_verbatim(fw, " Instruction: 0x%8.8" PRIx8, entry->instruction);
+ fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx8, entry->flags);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%8.8" PRIx8, entry->reserved);
+ fwts_log_info_verbatim(fw, " Value: 0x%16.16" PRIx64, entry->value);
+ fwts_log_info_verbatim(fw, " Mask: 0x%16.16" PRIx64, entry->mask);
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, entry->register_region.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, entry->register_region.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, entry->register_region.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, entry->register_region.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, entry->register_region.address);
#endif
switch (entry->serialization_action) {
diff --git a/src/acpi/facs/facs.c b/src/acpi/facs/facs.c
index 4f43563..817d1df 100644
--- a/src/acpi/facs/facs.c
+++ b/src/acpi/facs/facs.c
@@ -63,20 +63,20 @@ static int facs_test1(fwts_framework *fw)
goto done;
}
- fwts_log_info_verbatum(fw, "FACS Firmware ACPI Control Structure:");
- fwts_log_info_verbatum(fw, " Signature: '%4.4s'", facs->signature);
- fwts_log_info_verbatum(fw, " Length: 0x%8.8" PRIx32, facs->length);
- fwts_log_info_verbatum(fw, " Hardware Signature: 0x%8.8" PRIx32, facs->hardware_signature);
- fwts_log_info_verbatum(fw, " Firmware Waking Vector: 0x%8.8" PRIx32, facs->firmware_waking_vector);
- fwts_log_info_verbatum(fw, " Global Lock: 0x%8.8" PRIx32, facs->global_lock);
- fwts_log_info_verbatum(fw, " Flags: 0x%8.8" PRIx32, facs->flags);
- fwts_log_info_verbatum(fw, " X-Firmware Waking Vector: 0x%16.16" PRIx64, facs->x_firmware_waking_vector);
- fwts_log_info_verbatum(fw, " Version: 0x%2.2" PRIx8, facs->version);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, "FACS Firmware ACPI Control Structure:");
+ fwts_log_info_verbatim(fw, " Signature: '%4.4s'", facs->signature);
+ fwts_log_info_verbatim(fw, " Length: 0x%8.8" PRIx32, facs->length);
+ fwts_log_info_verbatim(fw, " Hardware Signature: 0x%8.8" PRIx32, facs->hardware_signature);
+ fwts_log_info_verbatim(fw, " Firmware Waking Vector: 0x%8.8" PRIx32, facs->firmware_waking_vector);
+ fwts_log_info_verbatim(fw, " Global Lock: 0x%8.8" PRIx32, facs->global_lock);
+ fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx32, facs->flags);
+ fwts_log_info_verbatim(fw, " X-Firmware Waking Vector: 0x%16.16" PRIx64, facs->x_firmware_waking_vector);
+ fwts_log_info_verbatim(fw, " Version: 0x%2.2" PRIx8, facs->version);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
facs->reserved[0], facs->reserved[1], facs->reserved[2]);
- fwts_log_info_verbatum(fw, " OSPM Flags: 0x%8.8" PRIx32, facs->ospm_flags);
+ fwts_log_info_verbatim(fw, " OSPM Flags: 0x%8.8" PRIx32, facs->ospm_flags);
for (i = 0; i < 24; i+= 4) {
- fwts_log_info_verbatum(fw, " Reserved: "
+ fwts_log_info_verbatim(fw, " Reserved: "
"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
facs->reserved2[i + 0], facs->reserved2[i + 1],
facs->reserved2[i + 2], facs->reserved2[i + 3]);
diff --git a/src/acpi/fpdt/fpdt.c b/src/acpi/fpdt/fpdt.c
index db01b91..db0d130 100644
--- a/src/acpi/fpdt/fpdt.c
+++ b/src/acpi/fpdt/fpdt.c
@@ -49,10 +49,10 @@ static void fpdt_rec_header_dump(
const char *type_name,
fwts_acpi_table_fpdt_header *header)
{
- fwts_log_info_verbatum(fw, " %s:", type_name);
- fwts_log_info_verbatum(fw, " Perf Rec Type: 0x%4.4" PRIx16, header->type);
- fwts_log_info_verbatum(fw, " Rec Length: 0x%2.2" PRIx8, header->length);
- fwts_log_info_verbatum(fw, " Revision: 0x%2.2" PRIx8, header->revision);
+ fwts_log_info_verbatim(fw, " %s:", type_name);
+ fwts_log_info_verbatim(fw, " Perf Rec Type: 0x%4.4" PRIx16, header->type);
+ fwts_log_info_verbatim(fw, " Rec Length: 0x%2.2" PRIx8, header->length);
+ fwts_log_info_verbatim(fw, " Revision: 0x%2.2" PRIx8, header->revision);
}
static void fpdt_dump_raw_data(
@@ -63,12 +63,12 @@ static void fpdt_dump_raw_data(
{
size_t n;
- fwts_log_info_verbatum(fw, " Data:");
- for (n = 0; n < length; n += 16) {
- int left = length - n;
+ fwts_log_info_verbatim(fw, " Data:");
+ for (n = 0; n < length; n += 16) {
+ int left = length - n;
char buffer[128];
fwts_dump_raw_data(buffer, sizeof(buffer), data + n, n + offset, left > 16 ? 16 : left);
- fwts_log_info_verbatum(fw, "%s", buffer);
+ fwts_log_info_verbatim(fw, "%s", buffer);
}
}
@@ -127,8 +127,8 @@ static int fpdt_test1(fwts_framework *fw)
fbbpr->fpdt.length, sizeof(fwts_acpi_table_fpdt_basic_boot_perf_ptr));
} else {
fpdt_rec_header_dump(fw, " Firmware Basic Boot Performance Pointer Record", fpdt);
- fwts_log_info_verbatum(fw, " Reserved: 0x%8.8" PRIx32, fbbpr->reserved);
- fwts_log_info_verbatum(fw, " FBPT Pointer: 0x%16.16" PRIx64, fbbpr->fbpt_addr);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%8.8" PRIx32, fbbpr->reserved);
+ fwts_log_info_verbatim(fw, " FBPT Pointer: 0x%16.16" PRIx64, fbbpr->fbpt_addr);
/*
* For the moment, only dump the 64-bit processor-relative physical address
@@ -158,8 +158,8 @@ static int fpdt_test1(fwts_framework *fw)
s3ptpr->fpdt.length, sizeof(fwts_acpi_table_fpdt_s3_perf_ptr));
} else {
fpdt_rec_header_dump(fw, "S3 Performance Table Pointer Record", fpdt);
- fwts_log_info_verbatum(fw, " Reserved: 0x%8.8" PRIx32, s3ptpr->reserved);
- fwts_log_info_verbatum(fw, " S3PT Pointer: 0x%16.16" PRIx64, s3ptpr->s3pt_addr);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%8.8" PRIx32, s3ptpr->reserved);
+ fwts_log_info_verbatim(fw, " S3PT Pointer: 0x%16.16" PRIx64, s3ptpr->s3pt_addr);
/*
* For the moment, only dump 64-bit processor-relative physical
diff --git a/src/acpi/gpedump/gpedump.c b/src/acpi/gpedump/gpedump.c
index e42f65f..67787c6 100644
--- a/src/acpi/gpedump/gpedump.c
+++ b/src/acpi/gpedump/gpedump.c
@@ -86,13 +86,13 @@ static void gpu_dump_gpes(
snprintf(buf, sizeof(buf), "notifes %" PRIu32 " devices", n);
break;
}
- fwts_log_info_verbatum(fw, " GPE 0x%2.2" PRIx8 ":",
+ fwts_log_info_verbatim(fw, " GPE 0x%2.2" PRIx8 ":",
gpe_block_info->BlockBaseNumber + gpe);
- fwts_log_info_verbatum(fw, " Flags: 0x%2.2" PRIx8 " (trigger: %s, wake: %s)",
+ fwts_log_info_verbatim(fw, " Flags: 0x%2.2" PRIx8 " (trigger: %s, wake: %s)",
GpeEventInfo->Flags,
(GpeEventInfo->Flags & ACPI_GPE_LEVEL_TRIGGERED) ? "level" : "edge",
(GpeEventInfo->Flags & ACPI_GPE_CAN_WAKE) ? "can wake" : "run only");
- fwts_log_info_verbatum(fw, " Dispatch: %s", buf);
+ fwts_log_info_verbatim(fw, " Dispatch: %s", buf);
}
}
@@ -115,17 +115,17 @@ static void gpedump_block(
strncpy(name, "unknown", sizeof(name));
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Block %" PRIu32": DeviceNode %s (%s)\n",
+ fwts_log_info_verbatim(fw, "Block %" PRIu32": DeviceNode %s (%s)\n",
block, name,
gpe_block_info->Node == AcpiGbl_FadtGpeDevice ?
"FADT Defined GPE Block" :
"GPE Block Device");
- fwts_log_info_verbatum(fw, " GPE range: 0x%2.2" PRIx8 " to 0x%2.2" PRIx8 " on interrupt %" PRIu32 "\n",
+ fwts_log_info_verbatim(fw, " GPE range: 0x%2.2" PRIx8 " to 0x%2.2" PRIx8 " on interrupt %" PRIu32 "\n",
(uint8_t)gpe_block_info->BlockBaseNumber,
(uint8_t)gpe_block_info->BlockBaseNumber + (gpe_block_info->GpeCount - 1),
(uint32_t)gpe_xrupt_info->InterruptNumber);
- fwts_log_info_verbatum(fw, " GPE count: %" PRIu32 " (%" PRIu32 " registers)\n",
+ fwts_log_info_verbatim(fw, " GPE count: %" PRIu32 " (%" PRIu32 " registers)\n",
(uint32_t)gpe_block_info->GpeCount,
(uint32_t)gpe_block_info->RegisterCount);
@@ -133,18 +133,18 @@ static void gpedump_block(
ACPI_GPE_REGISTER_INFO *gpe_reg_info = &gpe_block_info->RegisterInfo[reg];
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw,
+ fwts_log_info_verbatim(fw,
" Register %" PRIu32 ": (GPE 0x%2.2" PRIx8 "-0x%2.2" PRIx8 ")",
reg,
gpe_reg_info->BaseGpeNumber,
gpe_reg_info->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1));
- fwts_log_info_verbatum(fw, " Run Enable: 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Run Enable: 0x%2.2" PRIx8,
gpe_reg_info->EnableForRun);
- fwts_log_info_verbatum(fw, " Wake Enable: 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Wake Enable: 0x%2.2" PRIx8,
gpe_reg_info->EnableForWake);
- fwts_log_info_verbatum(fw, " Status Address: 0x%8.8" PRIx64,
+ fwts_log_info_verbatim(fw, " Status Address: 0x%8.8" PRIx64,
(uint64_t)gpe_reg_info->StatusAddress.Address);
- fwts_log_info_verbatum(fw, " Enable Address: 0x%8.8" PRIx64,
+ fwts_log_info_verbatim(fw, " Enable Address: 0x%8.8" PRIx64,
(uint64_t)gpe_reg_info->EnableAddress.Address);
gpu_dump_gpes(fw, reg, gpe_block_info);
diff --git a/src/acpi/hest/hest.c b/src/acpi/hest/hest.c
index 5e2b3ec..ecfd337 100644
--- a/src/acpi/hest/hest.c
+++ b/src/acpi/hest/hest.c
@@ -81,39 +81,39 @@ static void hest_check_ia32_arch_machine_check_exception(
return;
}
- fwts_log_info_verbatum(fw, "HEST IA-32 Architecture Machine Check Exception:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, exception->type);
- fwts_log_info_verbatum(fw, " Source ID: 0x%4.4" PRIx16, exception->source_id);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, exception->reserved1);
- fwts_log_info_verbatum(fw, " Flags: 0x%2.2" PRIx8, exception->flags);
- fwts_log_info_verbatum(fw, " Enabled: 0x%2.2" PRIx8, exception->enabled);
- fwts_log_info_verbatum(fw, " Number of Records: 0x%8.8" PRIx32, exception->number_of_records_to_preallocate);
- fwts_log_info_verbatum(fw, " Max Sections Per Record: 0x%8.8" PRIx32, exception->max_sections_per_record);
- fwts_log_info_verbatum(fw, " Global Capability Data: 0x%16.16" PRIx64, exception->global_capability_init_data);
- fwts_log_info_verbatum(fw, " Global Control Data: 0x%16.16" PRIx64, exception->global_control_init_data);
- fwts_log_info_verbatum(fw, " Number of Hardware Banks: 0x%8.8" PRIx32, exception->number_of_hardware_banks);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[0]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[1]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[2]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[3]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[4]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[5]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[6]);
+ fwts_log_info_verbatim(fw, "HEST IA-32 Architecture Machine Check Exception:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, exception->type);
+ fwts_log_info_verbatim(fw, " Source ID: 0x%4.4" PRIx16, exception->source_id);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, exception->reserved1);
+ fwts_log_info_verbatim(fw, " Flags: 0x%2.2" PRIx8, exception->flags);
+ fwts_log_info_verbatim(fw, " Enabled: 0x%2.2" PRIx8, exception->enabled);
+ fwts_log_info_verbatim(fw, " Number of Records: 0x%8.8" PRIx32, exception->number_of_records_to_preallocate);
+ fwts_log_info_verbatim(fw, " Max Sections Per Record: 0x%8.8" PRIx32, exception->max_sections_per_record);
+ fwts_log_info_verbatim(fw, " Global Capability Data: 0x%16.16" PRIx64, exception->global_capability_init_data);
+ fwts_log_info_verbatim(fw, " Global Control Data: 0x%16.16" PRIx64, exception->global_control_init_data);
+ fwts_log_info_verbatim(fw, " Number of Hardware Banks: 0x%8.8" PRIx32, exception->number_of_hardware_banks);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[0]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[1]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[2]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[3]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[4]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[5]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, exception->reserved2[6]);
fwts_log_nl(fw);
for (i = 0; i < exception->number_of_hardware_banks; i++) {
fwts_acpi_table_hest_machine_check_bank *bank = &exception->bank[i];
- fwts_log_info_verbatum(fw, " HEST IA-32 Architecture Machine Check Exception Bank %zd", i);
- fwts_log_info_verbatum(fw, " Bank Number: 0x%2.2" PRIx8, bank->bank_number);
- fwts_log_info_verbatum(fw, " Clear Status On Init.: 0x%2.2" PRIx8, bank->clear_status_on_initialization);
- fwts_log_info_verbatum(fw, " Status Data Format: 0x%2.2" PRIx8, bank->status_data_format);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, bank->reserved);
- fwts_log_info_verbatum(fw, " Control Reg. MSR Addr: 0x%8.8" PRIx32, bank->control_register_msr_address);
- fwts_log_info_verbatum(fw, " Control Init Data: 0x%16.16" PRIx64, bank->control_init_data);
- fwts_log_info_verbatum(fw, " Status Reg. MSR Addr: 0x%8.8" PRIx32, bank->status_register_msr_address);
- fwts_log_info_verbatum(fw, " Addr Reg. MSR Addr: 0x%8.8" PRIx32, bank->address_register_msr_address);
- fwts_log_info_verbatum(fw, " Misc Reg. MSR Addr: 0x%8.8" PRIx32, bank->misc_register_msr_address);
+ fwts_log_info_verbatim(fw, " HEST IA-32 Architecture Machine Check Exception Bank %zd", i);
+ fwts_log_info_verbatim(fw, " Bank Number: 0x%2.2" PRIx8, bank->bank_number);
+ fwts_log_info_verbatim(fw, " Clear Status On Init.: 0x%2.2" PRIx8, bank->clear_status_on_initialization);
+ fwts_log_info_verbatim(fw, " Status Data Format: 0x%2.2" PRIx8, bank->status_data_format);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, bank->reserved);
+ fwts_log_info_verbatim(fw, " Control Reg. MSR Addr: 0x%8.8" PRIx32, bank->control_register_msr_address);
+ fwts_log_info_verbatim(fw, " Control Init Data: 0x%16.16" PRIx64, bank->control_init_data);
+ fwts_log_info_verbatim(fw, " Status Reg. MSR Addr: 0x%8.8" PRIx32, bank->status_register_msr_address);
+ fwts_log_info_verbatim(fw, " Addr Reg. MSR Addr: 0x%8.8" PRIx32, bank->address_register_msr_address);
+ fwts_log_info_verbatim(fw, " Misc Reg. MSR Addr: 0x%8.8" PRIx32, bank->misc_register_msr_address);
fwts_log_nl(fw);
if (bank->clear_status_on_initialization > 1) {
@@ -177,50 +177,50 @@ static void hest_check_ia32_arch_corrected_machine_check(
return;
}
- fwts_log_info_verbatum(fw, "HEST IA-32 Architecture Machine Check:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, check->type);
- fwts_log_info_verbatum(fw, " Source ID: 0x%4.4" PRIx16, check->source_id);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, check->reserved1);
- fwts_log_info_verbatum(fw, " Flags: 0x%2.2" PRIx8, check->flags);
- fwts_log_info_verbatum(fw, " Enabled: 0x%2.2" PRIx8, check->enabled);
- fwts_log_info_verbatum(fw, " Number of Records: 0x%8.8" PRIx32, check->number_of_records_to_preallocate);
- fwts_log_info_verbatum(fw, " Max Sections Per Record: 0x%8.8" PRIx32, check->max_sections_per_record);
- fwts_log_info_verbatum(fw, " Hardware Error Notification:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, check->notification.type);
- fwts_log_info_verbatum(fw, " Length: 0x%2.2" PRIx8, check->notification.length);
- fwts_log_info_verbatum(fw, " Config. Write. Enable: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, "HEST IA-32 Architecture Machine Check:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, check->type);
+ fwts_log_info_verbatim(fw, " Source ID: 0x%4.4" PRIx16, check->source_id);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, check->reserved1);
+ fwts_log_info_verbatim(fw, " Flags: 0x%2.2" PRIx8, check->flags);
+ fwts_log_info_verbatim(fw, " Enabled: 0x%2.2" PRIx8, check->enabled);
+ fwts_log_info_verbatim(fw, " Number of Records: 0x%8.8" PRIx32, check->number_of_records_to_preallocate);
+ fwts_log_info_verbatim(fw, " Max Sections Per Record: 0x%8.8" PRIx32, check->max_sections_per_record);
+ fwts_log_info_verbatim(fw, " Hardware Error Notification:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, check->notification.type);
+ fwts_log_info_verbatim(fw, " Length: 0x%2.2" PRIx8, check->notification.length);
+ fwts_log_info_verbatim(fw, " Config. Write. Enable: 0x%4.4" PRIx16,
check->notification.configuration_write_enable);
- fwts_log_info_verbatum(fw, " Poll Interval: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Poll Interval: 0x%4.4" PRIx16,
check->notification.poll_interval);
- fwts_log_info_verbatum(fw, " Interrupt Vector: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Interrupt Vector: 0x%4.4" PRIx16,
check->notification.vector);
- fwts_log_info_verbatum(fw, " Sw. to Polling Value: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Sw. to Polling Value: 0x%4.4" PRIx16,
check->notification.switch_to_polling_threshold_value);
- fwts_log_info_verbatum(fw, " Sw. to Polling Window: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Sw. to Polling Window: 0x%4.4" PRIx16,
check->notification.switch_to_polling_threshold_window);
- fwts_log_info_verbatum(fw, " Error: Thresh. Value: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Error: Thresh. Value: 0x%4.4" PRIx16,
check->notification.error_threshold_value);
- fwts_log_info_verbatum(fw, " Error: Thresh. Window: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Error: Thresh. Window: 0x%4.4" PRIx16,
check->notification.error_threshold_window);
- fwts_log_info_verbatum(fw, " Number of Hardware Banks: 0x%8.8" PRIx32, check->number_of_hardware_banks);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, check->reserved2[0]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, check->reserved2[1]);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, check->reserved2[2]);
+ fwts_log_info_verbatim(fw, " Number of Hardware Banks: 0x%8.8" PRIx32, check->number_of_hardware_banks);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, check->reserved2[0]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, check->reserved2[1]);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, check->reserved2[2]);
fwts_log_nl(fw);
for (i = 0; i < check->number_of_hardware_banks; i++) {
fwts_acpi_table_hest_machine_check_bank *bank = &check->bank[i];
- fwts_log_info_verbatum(fw, " HEST IA-32 Architecture Machine Check Bank %zd", i);
- fwts_log_info_verbatum(fw, " Bank Number: 0x%2.2" PRIx8, bank->bank_number);
- fwts_log_info_verbatum(fw, " Clear Status On Init.: 0x%2.2" PRIx8, bank->clear_status_on_initialization);
- fwts_log_info_verbatum(fw, " Status Data Format: 0x%2.2" PRIx8, bank->status_data_format);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, bank->reserved);
- fwts_log_info_verbatum(fw, " Control Reg. MSR Addr: 0x%8.8" PRIx32, bank->control_register_msr_address);
- fwts_log_info_verbatum(fw, " Control Init Data: 0x%16.16" PRIx64, bank->control_init_data);
- fwts_log_info_verbatum(fw, " Status Reg. MSR Addr: 0x%8.8" PRIx32, bank->status_register_msr_address);
- fwts_log_info_verbatum(fw, " Addr Reg. MSR Addr: 0x%8.8" PRIx32, bank->address_register_msr_address);
- fwts_log_info_verbatum(fw, " Misc Reg. MSR Addr: 0x%8.8" PRIx32, bank->misc_register_msr_address);
+ fwts_log_info_verbatim(fw, " HEST IA-32 Architecture Machine Check Bank %zd", i);
+ fwts_log_info_verbatim(fw, " Bank Number: 0x%2.2" PRIx8, bank->bank_number);
+ fwts_log_info_verbatim(fw, " Clear Status On Init.: 0x%2.2" PRIx8, bank->clear_status_on_initialization);
+ fwts_log_info_verbatim(fw, " Status Data Format: 0x%2.2" PRIx8, bank->status_data_format);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, bank->reserved);
+ fwts_log_info_verbatim(fw, " Control Reg. MSR Addr: 0x%8.8" PRIx32, bank->control_register_msr_address);
+ fwts_log_info_verbatim(fw, " Control Init Data: 0x%16.16" PRIx64, bank->control_init_data);
+ fwts_log_info_verbatim(fw, " Status Reg. MSR Addr: 0x%8.8" PRIx32, bank->status_register_msr_address);
+ fwts_log_info_verbatim(fw, " Addr Reg. MSR Addr: 0x%8.8" PRIx32, bank->address_register_msr_address);
+ fwts_log_info_verbatim(fw, " Misc Reg. MSR Addr: 0x%8.8" PRIx32, bank->misc_register_msr_address);
fwts_log_nl(fw);
if (bank->clear_status_on_initialization > 1) {
@@ -274,13 +274,13 @@ static void hest_check_fwts_acpi_table_hest_nmi_error(
return;
}
- fwts_log_info_verbatum(fw, "HEST IA-32 Architecture Non-Maskable Interrupt:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, err->type);
- fwts_log_info_verbatum(fw, " Source ID: 0x%4.4" PRIx16, err->source_id);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, err->reserved1);
- fwts_log_info_verbatum(fw, " Number of Records: 0x%8.8" PRIx32, err->number_of_records_to_preallocate);
- fwts_log_info_verbatum(fw, " Max Sections Per Record: 0x%8.8" PRIx32, err->max_sections_per_record);
- fwts_log_info_verbatum(fw, " Max Raw Data Length: 0x%8.8" PRIx32, err->max_raw_data_length);
+ fwts_log_info_verbatim(fw, "HEST IA-32 Architecture Non-Maskable Interrupt:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, err->type);
+ fwts_log_info_verbatim(fw, " Source ID: 0x%4.4" PRIx16, err->source_id);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, err->reserved1);
+ fwts_log_info_verbatim(fw, " Number of Records: 0x%8.8" PRIx32, err->number_of_records_to_preallocate);
+ fwts_log_info_verbatim(fw, " Max Sections Per Record: 0x%8.8" PRIx32, err->max_sections_per_record);
+ fwts_log_info_verbatim(fw, " Max Raw Data Length: 0x%8.8" PRIx32, err->max_raw_data_length);
fwts_log_nl(fw);
if (err->reserved1) {
@@ -338,24 +338,24 @@ static void hest_check_pci_express_root_port_aer(
return;
}
- fwts_log_info_verbatum(fw, "HEST PCI Express Root Port AER:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, aer->type);
- fwts_log_info_verbatum(fw, " Source ID: 0x%4.4" PRIx16, aer->source_id);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, aer->reserved1);
- fwts_log_info_verbatum(fw, " Flags: 0x%2.2" PRIx8, aer->flags);
- fwts_log_info_verbatum(fw, " Enabled: 0x%2.2" PRIx8, aer->enabled);
- fwts_log_info_verbatum(fw, " Number of Records: 0x%8.8" PRIx32, aer->number_of_records_to_preallocate);
- fwts_log_info_verbatum(fw, " Max Sections Per Record: 0x%8.8" PRIx32, aer->max_sections_per_record);
- fwts_log_info_verbatum(fw, " Bus: 0x%8.8" PRIx32, aer->bus);
- fwts_log_info_verbatum(fw, " Device: 0x%4.4" PRIx16, aer->device);
- fwts_log_info_verbatum(fw, " Function: 0x%4.4" PRIx16, aer->function);
- fwts_log_info_verbatum(fw, " Device Control: 0x%4.4" PRIx16, aer->device_control);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, aer->reserved2);
- fwts_log_info_verbatum(fw, " Uncorrectable Mask: 0x%8.8" PRIx32, aer->uncorrectable_error_mask);
- fwts_log_info_verbatum(fw, " Uncorrectable Severity: 0x%8.8" PRIx32, aer->uncorrectable_error_severity);
- fwts_log_info_verbatum(fw, " Correctable Error Mask: 0x%8.8" PRIx32, aer->correctable_error_mask);
- fwts_log_info_verbatum(fw, " Advanced Capabilities: 0x%8.8" PRIx32, aer->advanced_error_capabilities_and_control);
- fwts_log_info_verbatum(fw, " Root Error Command: 0x%8.8" PRIx32, aer->root_error_command);
+ fwts_log_info_verbatim(fw, "HEST PCI Express Root Port AER:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, aer->type);
+ fwts_log_info_verbatim(fw, " Source ID: 0x%4.4" PRIx16, aer->source_id);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, aer->reserved1);
+ fwts_log_info_verbatim(fw, " Flags: 0x%2.2" PRIx8, aer->flags);
+ fwts_log_info_verbatim(fw, " Enabled: 0x%2.2" PRIx8, aer->enabled);
+ fwts_log_info_verbatim(fw, " Number of Records: 0x%8.8" PRIx32, aer->number_of_records_to_preallocate);
+ fwts_log_info_verbatim(fw, " Max Sections Per Record: 0x%8.8" PRIx32, aer->max_sections_per_record);
+ fwts_log_info_verbatim(fw, " Bus: 0x%8.8" PRIx32, aer->bus);
+ fwts_log_info_verbatim(fw, " Device: 0x%4.4" PRIx16, aer->device);
+ fwts_log_info_verbatim(fw, " Function: 0x%4.4" PRIx16, aer->function);
+ fwts_log_info_verbatim(fw, " Device Control: 0x%4.4" PRIx16, aer->device_control);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, aer->reserved2);
+ fwts_log_info_verbatim(fw, " Uncorrectable Mask: 0x%8.8" PRIx32, aer->uncorrectable_error_mask);
+ fwts_log_info_verbatim(fw, " Uncorrectable Severity: 0x%8.8" PRIx32, aer->uncorrectable_error_severity);
+ fwts_log_info_verbatim(fw, " Correctable Error Mask: 0x%8.8" PRIx32, aer->correctable_error_mask);
+ fwts_log_info_verbatim(fw, " Advanced Capabilities: 0x%8.8" PRIx32, aer->advanced_error_capabilities_and_control);
+ fwts_log_info_verbatim(fw, " Root Error Command: 0x%8.8" PRIx32, aer->root_error_command);
fwts_log_nl(fw);
if (aer->flags & ~0x3) {
@@ -420,22 +420,22 @@ static void hest_check_pci_express_device_aer(
return;
}
- fwts_log_info_verbatum(fw, "HEST PCI Express Device AER:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, aer->type);
- fwts_log_info_verbatum(fw, " Source ID: 0x%4.4" PRIx16, aer->source_id);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, aer->reserved1);
- fwts_log_info_verbatum(fw, " Flags: 0x%2.2" PRIx8, aer->flags);
- fwts_log_info_verbatum(fw, " Enabled: 0x%2.2" PRIx8, aer->enabled);
- fwts_log_info_verbatum(fw, " Number of Records: 0x%8.8" PRIx32, aer->number_of_records_to_preallocate);
- fwts_log_info_verbatum(fw, " Max Sections Per Record: 0x%8.8" PRIx32, aer->max_sections_per_record);
- fwts_log_info_verbatum(fw, " Bus: 0x%8.8" PRIx32, aer->bus);
- fwts_log_info_verbatum(fw, " Device: 0x%4.4" PRIx16, aer->device);
- fwts_log_info_verbatum(fw, " Function: 0x%4.4" PRIx16, aer->function);
- fwts_log_info_verbatum(fw, " Device Control: 0x%4.4" PRIx16, aer->device_control);
- fwts_log_info_verbatum(fw, " Uncorrectable Mask: 0x%8.8" PRIx32, aer->uncorrectable_error_mask);
- fwts_log_info_verbatum(fw, " Uncorrectable Severity: 0x%8.8" PRIx32, aer->uncorrectable_error_severity);
- fwts_log_info_verbatum(fw, " Correctable Error Mask: 0x%8.8" PRIx32, aer->correctable_error_mask);
- fwts_log_info_verbatum(fw, " Advanced Capabilities: 0x%8.8" PRIx32, aer->advanced_error_capabilities_and_control);
+ fwts_log_info_verbatim(fw, "HEST PCI Express Device AER:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, aer->type);
+ fwts_log_info_verbatim(fw, " Source ID: 0x%4.4" PRIx16, aer->source_id);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, aer->reserved1);
+ fwts_log_info_verbatim(fw, " Flags: 0x%2.2" PRIx8, aer->flags);
+ fwts_log_info_verbatim(fw, " Enabled: 0x%2.2" PRIx8, aer->enabled);
+ fwts_log_info_verbatim(fw, " Number of Records: 0x%8.8" PRIx32, aer->number_of_records_to_preallocate);
+ fwts_log_info_verbatim(fw, " Max Sections Per Record: 0x%8.8" PRIx32, aer->max_sections_per_record);
+ fwts_log_info_verbatim(fw, " Bus: 0x%8.8" PRIx32, aer->bus);
+ fwts_log_info_verbatim(fw, " Device: 0x%4.4" PRIx16, aer->device);
+ fwts_log_info_verbatim(fw, " Function: 0x%4.4" PRIx16, aer->function);
+ fwts_log_info_verbatim(fw, " Device Control: 0x%4.4" PRIx16, aer->device_control);
+ fwts_log_info_verbatim(fw, " Uncorrectable Mask: 0x%8.8" PRIx32, aer->uncorrectable_error_mask);
+ fwts_log_info_verbatim(fw, " Uncorrectable Severity: 0x%8.8" PRIx32, aer->uncorrectable_error_severity);
+ fwts_log_info_verbatim(fw, " Correctable Error Mask: 0x%8.8" PRIx32, aer->correctable_error_mask);
+ fwts_log_info_verbatim(fw, " Advanced Capabilities: 0x%8.8" PRIx32, aer->advanced_error_capabilities_and_control);
fwts_log_nl(fw);
if (aer->flags & ~0x3) {
@@ -500,26 +500,26 @@ static void hest_heck_pci_express_bridge_aer(
return;
}
- fwts_log_info_verbatum(fw, "HEST PCI Express Bridge AER:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, aer->type);
- fwts_log_info_verbatum(fw, " Source ID: 0x%4.4" PRIx16, aer->source_id);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, aer->reserved1);
- fwts_log_info_verbatum(fw, " Flags: 0x%2.2" PRIx8, aer->flags);
- fwts_log_info_verbatum(fw, " Enabled: 0x%2.2" PRIx8, aer->enabled);
- fwts_log_info_verbatum(fw, " Number of Records: 0x%8.8" PRIx32, aer->number_of_records_to_preallocate);
- fwts_log_info_verbatum(fw, " Max Sections Per Record: 0x%8.8" PRIx32, aer->max_sections_per_record);
- fwts_log_info_verbatum(fw, " Bus: 0x%8.8" PRIx32, aer->bus);
- fwts_log_info_verbatum(fw, " Device: 0x%4.4" PRIx16, aer->device);
- fwts_log_info_verbatum(fw, " Function: 0x%4.4" PRIx16, aer->function);
- fwts_log_info_verbatum(fw, " Device Control: 0x%4.4" PRIx16, aer->device_control);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, aer->reserved2);
- fwts_log_info_verbatum(fw, " Uncorrectable Mask: 0x%8.8" PRIx32, aer->uncorrectable_error_mask);
- fwts_log_info_verbatum(fw, " Uncorrectable Severity: 0x%8.8" PRIx32, aer->uncorrectable_error_severity);
- fwts_log_info_verbatum(fw, " Correctable Mask: 0x%8.8" PRIx32, aer->correctable_error_mask);
- fwts_log_info_verbatum(fw, " Advanced Capabilities: 0x%8.8" PRIx32, aer->advanced_error_capabilities_and_control);
- fwts_log_info_verbatum(fw, " 2nd Uncorrectable Mask: 0x%8.8" PRIx32, aer->secondary_uncorrectable_error_mask);
- fwts_log_info_verbatum(fw, " 2nd Uncurrectable Svrity: 0x%8.8" PRIx32, aer->secondary_uncorrectable_error_severity);
- fwts_log_info_verbatum(fw, " 2nd Advanced Capabilities:0x%8.8" PRIx32, aer->secondary_advanced_error_capabilities_and_control);
+ fwts_log_info_verbatim(fw, "HEST PCI Express Bridge AER:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, aer->type);
+ fwts_log_info_verbatim(fw, " Source ID: 0x%4.4" PRIx16, aer->source_id);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, aer->reserved1);
+ fwts_log_info_verbatim(fw, " Flags: 0x%2.2" PRIx8, aer->flags);
+ fwts_log_info_verbatim(fw, " Enabled: 0x%2.2" PRIx8, aer->enabled);
+ fwts_log_info_verbatim(fw, " Number of Records: 0x%8.8" PRIx32, aer->number_of_records_to_preallocate);
+ fwts_log_info_verbatim(fw, " Max Sections Per Record: 0x%8.8" PRIx32, aer->max_sections_per_record);
+ fwts_log_info_verbatim(fw, " Bus: 0x%8.8" PRIx32, aer->bus);
+ fwts_log_info_verbatim(fw, " Device: 0x%4.4" PRIx16, aer->device);
+ fwts_log_info_verbatim(fw, " Function: 0x%4.4" PRIx16, aer->function);
+ fwts_log_info_verbatim(fw, " Device Control: 0x%4.4" PRIx16, aer->device_control);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, aer->reserved2);
+ fwts_log_info_verbatim(fw, " Uncorrectable Mask: 0x%8.8" PRIx32, aer->uncorrectable_error_mask);
+ fwts_log_info_verbatim(fw, " Uncorrectable Severity: 0x%8.8" PRIx32, aer->uncorrectable_error_severity);
+ fwts_log_info_verbatim(fw, " Correctable Mask: 0x%8.8" PRIx32, aer->correctable_error_mask);
+ fwts_log_info_verbatim(fw, " Advanced Capabilities: 0x%8.8" PRIx32, aer->advanced_error_capabilities_and_control);
+ fwts_log_info_verbatim(fw, " 2nd Uncorrectable Mask: 0x%8.8" PRIx32, aer->secondary_uncorrectable_error_mask);
+ fwts_log_info_verbatim(fw, " 2nd Uncurrectable Svrity: 0x%8.8" PRIx32, aer->secondary_uncorrectable_error_severity);
+ fwts_log_info_verbatim(fw, " 2nd Advanced Capabilities:0x%8.8" PRIx32, aer->secondary_advanced_error_capabilities_and_control);
fwts_log_nl(fw);
if (aer->flags & ~0x3) {
@@ -586,45 +586,45 @@ static void hest_check_generic_error_source(
return;
}
- fwts_log_info_verbatum(fw, "HEST Generic Hardware Error Source");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, source->type);
- fwts_log_info_verbatum(fw, " Source ID: 0x%4.4" PRIx16, source->source_id);
- fwts_log_info_verbatum(fw, " Related Source ID: 0x%4.4" PRIx16, source->related_source_id);
- fwts_log_info_verbatum(fw, " Flags: 0x%2.2" PRIx8, source->flags);
- fwts_log_info_verbatum(fw, " Enabled: 0x%2.2" PRIx8, source->enabled);
- fwts_log_info_verbatum(fw, " Num. Records. Prealloc.: 0x%8.8" PRIx32, source->number_of_records_to_preallocate);
- fwts_log_info_verbatum(fw, " Max. Sections Per Rec.: 0x%8.8" PRIx32, source->max_sections_per_record);
- fwts_log_info_verbatum(fw, " Max. Raw Data Length: 0x%8.8" PRIx32, source->max_raw_data_length);
+ fwts_log_info_verbatim(fw, "HEST Generic Hardware Error Source");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, source->type);
+ fwts_log_info_verbatim(fw, " Source ID: 0x%4.4" PRIx16, source->source_id);
+ fwts_log_info_verbatim(fw, " Related Source ID: 0x%4.4" PRIx16, source->related_source_id);
+ fwts_log_info_verbatim(fw, " Flags: 0x%2.2" PRIx8, source->flags);
+ fwts_log_info_verbatim(fw, " Enabled: 0x%2.2" PRIx8, source->enabled);
+ fwts_log_info_verbatim(fw, " Num. Records. Prealloc.: 0x%8.8" PRIx32, source->number_of_records_to_preallocate);
+ fwts_log_info_verbatim(fw, " Max. Sections Per Rec.: 0x%8.8" PRIx32, source->max_sections_per_record);
+ fwts_log_info_verbatim(fw, " Max. Raw Data Length: 0x%8.8" PRIx32, source->max_raw_data_length);
- fwts_log_info_verbatum(fw, " Error Status Address:");
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Error Status Address:");
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8,
source->error_status_address.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8,
source->error_status_address.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8,
source->error_status_address.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8,
source->error_status_address.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64,
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64,
source->error_status_address.address);
- fwts_log_info_verbatum(fw, " Hardware Error Notification:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, source->notification.type);
- fwts_log_info_verbatum(fw, " Length: 0x%2.2" PRIx8, source->notification.length);
- fwts_log_info_verbatum(fw, " Config. Write. Enable: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Hardware Error Notification:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, source->notification.type);
+ fwts_log_info_verbatim(fw, " Length: 0x%2.2" PRIx8, source->notification.length);
+ fwts_log_info_verbatim(fw, " Config. Write. Enable: 0x%4.4" PRIx16,
source->notification.configuration_write_enable);
- fwts_log_info_verbatum(fw, " Poll Interval: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Poll Interval: 0x%4.4" PRIx16,
source->notification.poll_interval);
- fwts_log_info_verbatum(fw, " Interrupt Vector: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Interrupt Vector: 0x%4.4" PRIx16,
source->notification.vector);
- fwts_log_info_verbatum(fw, " Sw. to Polling Value: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Sw. to Polling Value: 0x%4.4" PRIx16,
source->notification.switch_to_polling_threshold_value);
- fwts_log_info_verbatum(fw, " Sw. to Polling Window: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Sw. to Polling Window: 0x%4.4" PRIx16,
source->notification.switch_to_polling_threshold_window);
- fwts_log_info_verbatum(fw, " Error: Thresh. Value: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Error: Thresh. Value: 0x%4.4" PRIx16,
source->notification.error_threshold_value);
- fwts_log_info_verbatum(fw, " Error: Thresh. Window: 0x%4.4" PRIx16,
+ fwts_log_info_verbatim(fw, " Error: Thresh. Window: 0x%4.4" PRIx16,
source->notification.error_threshold_window);
- fwts_log_info_verbatum(fw, " Error Status Blk. Length: 0x%8.8" PRIx32, source->error_status_block_length);
+ fwts_log_info_verbatim(fw, " Error Status Blk. Length: 0x%8.8" PRIx32, source->error_status_block_length);
fwts_log_nl(fw);
if (source->number_of_records_to_preallocate < 1) {
@@ -694,8 +694,8 @@ static int hest_test1(fwts_framework *fw)
goto done;
}
- fwts_log_info_verbatum(fw, "HEST Hardware Error Source Table test");
- fwts_log_info_verbatum(fw, " Error Source Count: 0x%2.2" PRIx8, hest->error_source_count);
+ fwts_log_info_verbatim(fw, "HEST Hardware Error Source Table test");
+ fwts_log_info_verbatim(fw, " Error Source Count: 0x%2.2" PRIx8, hest->error_source_count);
fwts_log_nl(fw);
data += sizeof(fwts_acpi_table_hest);
diff --git a/src/acpi/hpet/hpet.c b/src/acpi/hpet/hpet.c
index a488670..782401b 100644
--- a/src/acpi/hpet/hpet.c
+++ b/src/acpi/hpet/hpet.c
@@ -325,31 +325,31 @@ static int hpet_check_test2(fwts_framework *fw)
/*
* Dump out HPET
*/
- fwts_log_info_verbatum(fw, "Hardware ID of Event Block:");
- fwts_log_info_verbatum(fw, " PCI Vendor ID : 0x%" PRIx32,
+ fwts_log_info_verbatim(fw, "Hardware ID of Event Block:");
+ fwts_log_info_verbatim(fw, " PCI Vendor ID : 0x%" PRIx32,
(hpet->event_timer_block_id >> 16) & 0xffff);
- fwts_log_info_verbatum(fw, " Legacy IRQ Routing Capable : %" PRIu32,
+ fwts_log_info_verbatim(fw, " Legacy IRQ Routing Capable : %" PRIu32,
(hpet->event_timer_block_id >> 15) & 1);
- fwts_log_info_verbatum(fw, " COUNT_SIZE_CAP counter size: %" PRIu32,
+ fwts_log_info_verbatim(fw, " COUNT_SIZE_CAP counter size: %" PRIu32,
(hpet->event_timer_block_id >> 13) & 1);
- fwts_log_info_verbatum(fw, " Number of comparitors : %" PRIu32,
+ fwts_log_info_verbatim(fw, " Number of comparitors : %" PRIu32,
(hpet->event_timer_block_id >> 8) & 0x1f);
- fwts_log_info_verbatum(fw, " Hardwre Revision ID : 0x%" PRIx8,
+ fwts_log_info_verbatim(fw, " Hardwre Revision ID : 0x%" PRIx8,
hpet->event_timer_block_id & 0xff);
- fwts_log_info_verbatum(fw, "Lower 32 bit base Address : 0x%" PRIx64,
+ fwts_log_info_verbatim(fw, "Lower 32 bit base Address : 0x%" PRIx64,
hpet->base_address.address);
- fwts_log_info_verbatum(fw, " Address Space ID : 0x%" PRIx8,
+ fwts_log_info_verbatim(fw, " Address Space ID : 0x%" PRIx8,
hpet->base_address.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width : 0x%" PRIx8,
+ fwts_log_info_verbatim(fw, " Register Bit Width : 0x%" PRIx8,
hpet->base_address.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset : 0x%" PRIx8,
+ fwts_log_info_verbatim(fw, " Register Bit Offset : 0x%" PRIx8,
hpet->base_address.register_bit_offset);
- fwts_log_info_verbatum(fw, " Address Width : 0x%" PRIx8,
+ fwts_log_info_verbatim(fw, " Address Width : 0x%" PRIx8,
hpet->base_address.access_width);
- fwts_log_info_verbatum(fw, "HPET sequence number : 0x%" PRIx8,
+ fwts_log_info_verbatim(fw, "HPET sequence number : 0x%" PRIx8,
hpet->hpet_number);
- fwts_log_info_verbatum(fw, "Minimum clock tick : 0x%" PRIx16,
+ fwts_log_info_verbatim(fw, "Minimum clock tick : 0x%" PRIx16,
hpet->main_counter_minimum);
switch (hpet->page_prot_and_oem_attribute & 0xf) {
@@ -366,10 +366,10 @@ static int hpet_check_test2(fwts_framework *fw)
page_prot = "Reserved";
break;
}
- fwts_log_info_verbatum(fw, "Page Protection : 0x%" PRIx8 " (%s)",
+ fwts_log_info_verbatim(fw, "Page Protection : 0x%" PRIx8 " (%s)",
hpet->page_prot_and_oem_attribute & 0xf,
page_prot);
- fwts_log_info_verbatum(fw, "OEM attributes : 0x%" PRIx8,
+ fwts_log_info_verbatim(fw, "OEM attributes : 0x%" PRIx8,
(hpet->page_prot_and_oem_attribute >> 4) & 0xf);
if (passed)
diff --git a/src/acpi/iort/iort.c b/src/acpi/iort/iort.c
index 89989aa..d54e5e0 100644
--- a/src/acpi/iort/iort.c
+++ b/src/acpi/iort/iort.c
@@ -54,13 +54,13 @@ static void iort_node_dump(
const char *node_name,
fwts_acpi_table_iort_node *node)
{
- fwts_log_info_verbatum(fw, "%s:", node_name);
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, node->type);
- fwts_log_info_verbatum(fw, " Length: 0x%4.4" PRIx16, node->length);
- fwts_log_info_verbatum(fw, " Revision: 0x%2.2" PRIx8, node->revision);
- fwts_log_info_verbatum(fw, " Reserved: 0x%8.8" PRIx32, node->reserved);
- fwts_log_info_verbatum(fw, " Number of ID mappings: 0x%8.8" PRIx32, node->id_mappings_count);
- fwts_log_info_verbatum(fw, " Reference to ID Array: 0x%8.8" PRIx32, node->id_array_offset);
+ fwts_log_info_verbatim(fw, "%s:", node_name);
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, node->type);
+ fwts_log_info_verbatim(fw, " Length: 0x%4.4" PRIx16, node->length);
+ fwts_log_info_verbatim(fw, " Revision: 0x%2.2" PRIx8, node->revision);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%8.8" PRIx32, node->reserved);
+ fwts_log_info_verbatim(fw, " Number of ID mappings: 0x%8.8" PRIx32, node->id_mappings_count);
+ fwts_log_info_verbatim(fw, " Reference to ID Array: 0x%8.8" PRIx32, node->id_array_offset);
}
/*
@@ -124,12 +124,12 @@ static void iort_id_mapping_dump(
uint32_t i,
fwts_acpi_table_iort_id_mapping *id_mapping)
{
- fwts_log_info_verbatum(fw, "ID Mapping %" PRIu32, i);
- fwts_log_info_verbatum(fw, " Input Base: 0x%8.8" PRIx32, id_mapping->input_base);
- fwts_log_info_verbatum(fw, " ID Count: 0x%8.8" PRIx32, id_mapping->id_count);
- fwts_log_info_verbatum(fw, " Output Base: 0x%8.8" PRIx32, id_mapping->output_base);
- fwts_log_info_verbatum(fw, " Output Reference: 0x%8.8" PRIx32, id_mapping->output_reference);
- fwts_log_info_verbatum(fw, " Flags: 0x%8.8" PRIx32, id_mapping->flags);
+ fwts_log_info_verbatim(fw, "ID Mapping %" PRIu32, i);
+ fwts_log_info_verbatim(fw, " Input Base: 0x%8.8" PRIx32, id_mapping->input_base);
+ fwts_log_info_verbatim(fw, " ID Count: 0x%8.8" PRIx32, id_mapping->id_count);
+ fwts_log_info_verbatim(fw, " Output Base: 0x%8.8" PRIx32, id_mapping->output_base);
+ fwts_log_info_verbatim(fw, " Output Reference: 0x%8.8" PRIx32, id_mapping->output_reference);
+ fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx32, id_mapping->flags);
}
/*
@@ -229,8 +229,8 @@ static void iort_smmu_interrupt_dump(
for (i = 0; i < count; i++, intr++) {
if (sizeof(*intr) + (uint8_t *)intr > data_end)
break;
- fwts_log_info_verbatum(fw, " GSIV: 0x%8.8" PRIx32, intr->gsiv);
- fwts_log_info_verbatum(fw, " Interrupt Flags: 0x%8.8" PRIx32, intr->flags);
+ fwts_log_info_verbatim(fw, " GSIV: 0x%8.8" PRIx32, intr->gsiv);
+ fwts_log_info_verbatim(fw, " Interrupt Flags: 0x%8.8" PRIx32, intr->flags);
}
}
@@ -305,10 +305,10 @@ static void iort_smmu_global_interrupt_dump(
(fwts_acpi_table_iort_smmu_global_interrupt_array *)(data + offset);
if (sizeof(*intr) + (uint8_t*)intr <= data_end) {
- fwts_log_info_verbatum(fw, " SMMU_NSgIrpt: 0x%8.8" PRIx32, intr->smmu_nsgirpt);
- fwts_log_info_verbatum(fw, " SMMU_NSgIrpt Flags: 0x%8.8" PRIx32, intr->smmu_nsgirpt_flags);
- fwts_log_info_verbatum(fw, " SMMU_NSgCfgIrpt: 0x%8.8" PRIx32, intr->smmu_nsgcfgirpt);
- fwts_log_info_verbatum(fw, " SMMU_NSgCfgIrpt Flags: 0x%8.8" PRIx32, intr->smmu_nsgcfgirpt_flags);
+ fwts_log_info_verbatim(fw, " SMMU_NSgIrpt: 0x%8.8" PRIx32, intr->smmu_nsgirpt);
+ fwts_log_info_verbatim(fw, " SMMU_NSgIrpt Flags: 0x%8.8" PRIx32, intr->smmu_nsgirpt_flags);
+ fwts_log_info_verbatim(fw, " SMMU_NSgCfgIrpt: 0x%8.8" PRIx32, intr->smmu_nsgcfgirpt);
+ fwts_log_info_verbatim(fw, " SMMU_NSgCfgIrpt Flags: 0x%8.8" PRIx32, intr->smmu_nsgcfgirpt_flags);
}
}
@@ -362,7 +362,7 @@ static void iort_check_its_group(
size_t its_id_array_size = node->its_count * sizeof(*its_id);
iort_node_dump(fw, "IORT ITS Group Node", (fwts_acpi_table_iort_node *)data);
- fwts_log_info_verbatum(fw, " Number of ITSs: 0x%8.8" PRIx32, node->its_count);
+ fwts_log_info_verbatim(fw, " Number of ITSs: 0x%8.8" PRIx32, node->its_count);
/* Array too big? */
@@ -377,7 +377,7 @@ static void iort_check_its_group(
uint32_t i;
for (i = 0; i < node->its_count; i++, its_id++) {
- fwts_log_info_verbatum(fw, " GIC ITS Identifier: 0x%8.8" PRIx32, *its_id);
+ fwts_log_info_verbatim(fw, " GIC ITS Identifier: 0x%8.8" PRIx32, *its_id);
}
}
iort_node_check(fw, data, true, true, passed);
@@ -466,12 +466,12 @@ static void iort_check_named_component(
uint8_t *obj_name;
iort_node_dump(fw, "IORT Named Component Node", (fwts_acpi_table_iort_node *)data);
- fwts_log_info_verbatum(fw, " Node Flags: 0x%8.8" PRIx32, node->flags);
- fwts_log_info_verbatum(fw, " Cache Coherent Attribute: 0x%8.8" PRIx32, node->properties.cache_coherent);
- fwts_log_info_verbatum(fw, " Allocation Hints: 0x%2.2" PRIx8, node->properties.allocation_hints);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, node->properties.reserved);
- fwts_log_info_verbatum(fw, " Memory Access Flags 0x%2.2" PRIx8, node->properties.memory_access_flags);
- fwts_log_info_verbatum(fw, " Device Memory Addr. Size: 0x%2.2" PRIx8, node->device_memory_address_size);
+ fwts_log_info_verbatim(fw, " Node Flags: 0x%8.8" PRIx32, node->flags);
+ fwts_log_info_verbatim(fw, " Cache Coherent Attribute: 0x%8.8" PRIx32, node->properties.cache_coherent);
+ fwts_log_info_verbatim(fw, " Allocation Hints: 0x%2.2" PRIx8, node->properties.allocation_hints);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, node->properties.reserved);
+ fwts_log_info_verbatim(fw, " Memory Access Flags 0x%2.2" PRIx8, node->properties.memory_access_flags);
+ fwts_log_info_verbatim(fw, " Device Memory Addr. Size: 0x%2.2" PRIx8, node->device_memory_address_size);
/* Is object name sane, zero terminated and inside the table? */
for (obj_name = node->device_object_name; *obj_name; obj_name++) {
@@ -488,7 +488,7 @@ static void iort_check_named_component(
goto next;
}
}
- fwts_log_info_verbatum(fw, " Device Object Name: %s", (char *)node->device_object_name);
+ fwts_log_info_verbatim(fw, " Device Object Name: %s", (char *)node->device_object_name);
next:
iort_id_mappings_dump(fw, data, node_end);
@@ -520,12 +520,12 @@ static void iort_check_pci_root_complex(
(fwts_acpi_table_iort_pci_root_complex_node *)data;
iort_node_dump(fw, "IORT PCI Root Complex Node", (fwts_acpi_table_iort_node *)data);
- fwts_log_info_verbatum(fw, " Cache Coherent Attribute: 0x%8.8" PRIx32, node->properties.cache_coherent);
- fwts_log_info_verbatum(fw, " Allocation Hints: 0x%2.2" PRIx8, node->properties.allocation_hints);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, node->properties.reserved);
- fwts_log_info_verbatum(fw, " Memory Access Flags 0x%4.4" PRIx16, node->properties.memory_access_flags);
- fwts_log_info_verbatum(fw, " ATS Attribute: 0x%8.8" PRIx32, node->ats_attribute);
- fwts_log_info_verbatum(fw, " PCI Segment Number: 0x%8.8" PRIx32, node->pci_segment_number);
+ fwts_log_info_verbatim(fw, " Cache Coherent Attribute: 0x%8.8" PRIx32, node->properties.cache_coherent);
+ fwts_log_info_verbatim(fw, " Allocation Hints: 0x%2.2" PRIx8, node->properties.allocation_hints);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, node->properties.reserved);
+ fwts_log_info_verbatim(fw, " Memory Access Flags 0x%4.4" PRIx16, node->properties.memory_access_flags);
+ fwts_log_info_verbatim(fw, " ATS Attribute: 0x%8.8" PRIx32, node->ats_attribute);
+ fwts_log_info_verbatim(fw, " PCI Segment Number: 0x%8.8" PRIx32, node->pci_segment_number);
iort_id_mappings_dump(fw, data, node_end);
iort_node_check(fw, data, false, false, passed);
@@ -558,23 +558,23 @@ static void iort_check_smmu(
(fwts_acpi_table_iort_smmu_node *)data;
iort_node_dump(fw, "IORT SMMU node", (fwts_acpi_table_iort_node *)data);
- fwts_log_info_verbatum(fw, " Base Address: 0x%16.16" PRIx64, node->base_address);
- fwts_log_info_verbatum(fw, " Span: 0x%16.16" PRIx64, node->span);
- fwts_log_info_verbatum(fw, " Model: 0x%8.8" PRIx32, node->model);
- fwts_log_info_verbatum(fw, " Flags: 0x%8.8" PRIx32, node->flags);
- fwts_log_info_verbatum(fw, " Global Intr. Offset: 0x%8.8" PRIx32, node->global_interrupt_array_offset);
- fwts_log_info_verbatum(fw, " Number of Context Intr.: 0x%8.8" PRIx32, node->context_interrupt_count);
- fwts_log_info_verbatum(fw, " Context Intr. Offset: 0x%8.8" PRIx32, node->context_interrupt_array_offset);
- fwts_log_info_verbatum(fw, " Number of PMU Intr.: 0x%8.8" PRIx32, node->pmu_interrupt_count);
- fwts_log_info_verbatum(fw, " PMU Intr. Offset: 0x%8.8" PRIx32, node->pmu_interrupt_array_offset);
-
- fwts_log_info_verbatum(fw, "Global Interrupt Array:");
+ fwts_log_info_verbatim(fw, " Base Address: 0x%16.16" PRIx64, node->base_address);
+ fwts_log_info_verbatim(fw, " Span: 0x%16.16" PRIx64, node->span);
+ fwts_log_info_verbatim(fw, " Model: 0x%8.8" PRIx32, node->model);
+ fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx32, node->flags);
+ fwts_log_info_verbatim(fw, " Global Intr. Offset: 0x%8.8" PRIx32, node->global_interrupt_array_offset);
+ fwts_log_info_verbatim(fw, " Number of Context Intr.: 0x%8.8" PRIx32, node->context_interrupt_count);
+ fwts_log_info_verbatim(fw, " Context Intr. Offset: 0x%8.8" PRIx32, node->context_interrupt_array_offset);
+ fwts_log_info_verbatim(fw, " Number of PMU Intr.: 0x%8.8" PRIx32, node->pmu_interrupt_count);
+ fwts_log_info_verbatim(fw, " PMU Intr. Offset: 0x%8.8" PRIx32, node->pmu_interrupt_array_offset);
+
+ fwts_log_info_verbatim(fw, "Global Interrupt Array:");
iort_smmu_global_interrupt_dump(fw, data, node_end,
node->global_interrupt_array_offset);
- fwts_log_info_verbatum(fw, "Context Interrupt Array:");
+ fwts_log_info_verbatim(fw, "Context Interrupt Array:");
iort_smmu_interrupt_dump(fw, data, node_end,
node->context_interrupt_array_offset, node->context_interrupt_count);
- fwts_log_info_verbatum(fw, "PMU Interrupt Array:");
+ fwts_log_info_verbatim(fw, "PMU Interrupt Array:");
iort_smmu_interrupt_dump(fw, data, node_end,
node->pmu_interrupt_array_offset, node->pmu_interrupt_count);
iort_id_mappings_dump(fw, data, node_end);
@@ -640,10 +640,10 @@ static int iort_test1(fwts_framework *fw)
data_end = data + table->length;
- fwts_log_info_verbatum(fw, "IORT IO Remapping Table test");
- fwts_log_info_verbatum(fw, " Number of IORT Nodes: 0x%4.4" PRIx8, iort->io_rt_nodes_count);
- fwts_log_info_verbatum(fw, " IORT Node Array Offset: 0x%4.4" PRIx8, iort->io_rt_offset);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx8, iort->reserved);
+ fwts_log_info_verbatim(fw, "IORT IO Remapping Table test");
+ fwts_log_info_verbatim(fw, " Number of IORT Nodes: 0x%4.4" PRIx8, iort->io_rt_nodes_count);
+ fwts_log_info_verbatim(fw, " IORT Node Array Offset: 0x%4.4" PRIx8, iort->io_rt_offset);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx8, iort->reserved);
fwts_log_nl(fw);
data = (uint8_t *)table->data + iort->io_rt_offset;
diff --git a/src/acpi/lpit/lpit.c b/src/acpi/lpit/lpit.c
index b660e64..eb670b4 100644
--- a/src/acpi/lpit/lpit.c
+++ b/src/acpi/lpit/lpit.c
@@ -54,9 +54,9 @@ static void lpit_check_type_0(
fwts_acpi_table_lpit_c_state *lpi = (fwts_acpi_table_lpit_c_state *)*data;
/* We know table is at least long enough to access type and length.. */
- fwts_log_info_verbatum(fw, "Native C-state based LPI structure:");
- fwts_log_info_verbatum(fw, " Type: 0x%8.8" PRIx32, lpi->type);
- fwts_log_info_verbatum(fw, " Length: 0x%8.8" PRIx32, lpi->length);
+ fwts_log_info_verbatim(fw, "Native C-state based LPI structure:");
+ fwts_log_info_verbatim(fw, " Type: 0x%8.8" PRIx32, lpi->type);
+ fwts_log_info_verbatim(fw, " Length: 0x%8.8" PRIx32, lpi->length);
if (lpi->length < sizeof(fwts_acpi_table_lpit_c_state)) {
*passed = false;
@@ -70,29 +70,29 @@ static void lpit_check_type_0(
return;
}
- fwts_log_info_verbatum(fw, " ID: 0x%4.4" PRIx16, lpi->id);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, lpi->reserved);
- fwts_log_info_verbatum(fw, " Flags: 0x%8.8" PRIx32, lpi->flags);
- fwts_log_info_verbatum(fw, " Entry Trigger:");
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, lpi->entry_trigger.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, lpi->entry_trigger.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, lpi->entry_trigger.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, lpi->entry_trigger.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, lpi->entry_trigger.address);
- fwts_log_info_verbatum(fw, " Residency: 0x%8.8" PRIx32, lpi->residency);
- fwts_log_info_verbatum(fw, " Latency: 0x%8.8" PRIx32, lpi->latency);
+ fwts_log_info_verbatim(fw, " ID: 0x%4.4" PRIx16, lpi->id);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, lpi->reserved);
+ fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx32, lpi->flags);
+ fwts_log_info_verbatim(fw, " Entry Trigger:");
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, lpi->entry_trigger.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, lpi->entry_trigger.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, lpi->entry_trigger.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, lpi->entry_trigger.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, lpi->entry_trigger.address);
+ fwts_log_info_verbatim(fw, " Residency: 0x%8.8" PRIx32, lpi->residency);
+ fwts_log_info_verbatim(fw, " Latency: 0x%8.8" PRIx32, lpi->latency);
/* If flags [1] set, then counter is not available */
if (lpi->flags & 0x2) {
- fwts_log_info_verbatum(fw, " Residency Counter not available");
+ fwts_log_info_verbatim(fw, " Residency Counter not available");
} else {
- fwts_log_info_verbatum(fw, " Residency Counter:");
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, lpi->residency_counter.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, lpi->residency_counter.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, lpi->residency_counter.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, lpi->residency_counter.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, lpi->residency_counter.address);
- fwts_log_info_verbatum(fw, " Residency Counter Freq: 0x%16.16" PRIx64, lpi->residency_counter_freq);
+ fwts_log_info_verbatim(fw, " Residency Counter:");
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, lpi->residency_counter.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, lpi->residency_counter.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, lpi->residency_counter.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, lpi->residency_counter.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, lpi->residency_counter.address);
+ fwts_log_info_verbatim(fw, " Residency Counter Freq: 0x%16.16" PRIx64, lpi->residency_counter_freq);
}
fwts_log_nl(fw);
diff --git a/src/acpi/mcfg/mcfg.c b/src/acpi/mcfg/mcfg.c
index 32a167b..119ba8b 100644
--- a/src/acpi/mcfg/mcfg.c
+++ b/src/acpi/mcfg/mcfg.c
@@ -188,11 +188,11 @@ static int mcfg_test1(fwts_framework *fw)
config = &mcfg->configuration[0];
for (i = 0; i < nr; i++, config++) {
- fwts_log_info_verbatum(fw, "Configuration Entry #%d:", i);
- fwts_log_info_verbatum(fw, " Base Address : 0x%" PRIx64, config->base_address);
- fwts_log_info_verbatum(fw, " Segment : %" PRIu8, config->pci_segment_group_number);
- fwts_log_info_verbatum(fw, " Start bus : %" PRIu8, config->start_bus_number);
- fwts_log_info_verbatum(fw, " End bus : %" PRIu8, config->end_bus_number);
+ fwts_log_info_verbatim(fw, "Configuration Entry #%d:", i);
+ fwts_log_info_verbatim(fw, " Base Address : 0x%" PRIx64, config->base_address);
+ fwts_log_info_verbatim(fw, " Segment : %" PRIu8, config->pci_segment_group_number);
+ fwts_log_info_verbatim(fw, " Start bus : %" PRIu8, config->start_bus_number);
+ fwts_log_info_verbatim(fw, " End bus : %" PRIu8, config->end_bus_number);
if ((memory_map_list != NULL) &&
(!fwts_memory_map_is_reserved(memory_map_list, config->base_address))) {
diff --git a/src/acpi/mchi/mchi.c b/src/acpi/mchi/mchi.c
index ac49e01..a2d4b67 100644
--- a/src/acpi/mchi/mchi.c
+++ b/src/acpi/mchi/mchi.c
@@ -65,35 +65,35 @@ static int mchi_test1(fwts_framework *fw)
}
#if DUMP_MCHI_TABLE
- fwts_log_info_verbatum(fw, "MCHI Table:");
- fwts_log_info_verbatum(fw, " Interface Type: 0x%2.2" PRIx8, mchi->interface_type);
- fwts_log_info_verbatum(fw, " Protocol Identifier 0x%2.2" PRIx8, mchi->protocol_identifier);
- fwts_log_info_verbatum(fw, " Protocol Data: "
+ fwts_log_info_verbatim(fw, "MCHI Table:");
+ fwts_log_info_verbatim(fw, " Interface Type: 0x%2.2" PRIx8, mchi->interface_type);
+ fwts_log_info_verbatim(fw, " Protocol Identifier 0x%2.2" PRIx8, mchi->protocol_identifier);
+ fwts_log_info_verbatim(fw, " Protocol Data: "
"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
mchi->protocol_data[0], mchi->protocol_data[1],
mchi->protocol_data[2], mchi->protocol_data[3]);
- fwts_log_info_verbatum(fw, " "
+ fwts_log_info_verbatim(fw, " "
"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
mchi->protocol_data[4], mchi->protocol_data[5],
mchi->protocol_data[6], mchi->protocol_data[7]);
- fwts_log_info_verbatum(fw, " Interrupt Type: 0x%2.2" PRIx8, mchi->interrupt_type);
- fwts_log_info_verbatum(fw, " GPE: 0x%2.2" PRIx8, mchi->gpe);
- fwts_log_info_verbatum(fw, " PCI Device Flag: 0x%2.2" PRIx8, mchi->pci_device_flag);
- fwts_log_info_verbatum(fw, " Global System Interrupt: 0x%8.8" PRIx32, mchi->global_system_interrupt);
- fwts_log_info_verbatum(fw, " Base Address:");
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, mchi->base_address.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, mchi->base_address.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, mchi->base_address.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, mchi->base_address.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, mchi->base_address.address);
+ fwts_log_info_verbatim(fw, " Interrupt Type: 0x%2.2" PRIx8, mchi->interrupt_type);
+ fwts_log_info_verbatim(fw, " GPE: 0x%2.2" PRIx8, mchi->gpe);
+ fwts_log_info_verbatim(fw, " PCI Device Flag: 0x%2.2" PRIx8, mchi->pci_device_flag);
+ fwts_log_info_verbatim(fw, " Global System Interrupt: 0x%8.8" PRIx32, mchi->global_system_interrupt);
+ fwts_log_info_verbatim(fw, " Base Address:");
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, mchi->base_address.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, mchi->base_address.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, mchi->base_address.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, mchi->base_address.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, mchi->base_address.address);
if ((mchi->pci_device_flag & 1) == 1) {
- fwts_log_info_verbatum(fw, " PCI Segment Group: 0x%2.2" PRIx8, mchi->bytes[0]);
- fwts_log_info_verbatum(fw, " PCI Bus Number: 0x%2.2" PRIx8, mchi->bytes[1]);
- fwts_log_info_verbatum(fw, " PCI Device Number: 0x%2.2" PRIx8, mchi->bytes[2]);
- fwts_log_info_verbatum(fw, " PCI Function Number: 0x%2.2" PRIx8, mchi->bytes[3]);
+ fwts_log_info_verbatim(fw, " PCI Segment Group: 0x%2.2" PRIx8, mchi->bytes[0]);
+ fwts_log_info_verbatim(fw, " PCI Bus Number: 0x%2.2" PRIx8, mchi->bytes[1]);
+ fwts_log_info_verbatim(fw, " PCI Device Number: 0x%2.2" PRIx8, mchi->bytes[2]);
+ fwts_log_info_verbatim(fw, " PCI Function Number: 0x%2.2" PRIx8, mchi->bytes[3]);
} else {
/* Zero -> UIDS */
- fwts_log_info_verbatum(fw, " UID Bytes 1-4: "
+ fwts_log_info_verbatim(fw, " UID Bytes 1-4: "
"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
mchi->bytes[0], mchi->bytes[1], mchi->bytes[2], mchi->bytes[3]);
}
diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
index 406da35..3150663 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -3492,20 +3492,20 @@ static void method_test_CST_return(
/* Now dump out per CPU C-state information */
if (an_element_ok) {
- fwts_log_info_verbatum(fw, "%s values:", name);
- fwts_log_info_verbatum(fw, "# C-State Latency Power");
- fwts_log_info_verbatum(fw, " (us) (mW)");
+ fwts_log_info_verbatim(fw, "%s values:", name);
+ fwts_log_info_verbatim(fw, "# C-State Latency Power");
+ fwts_log_info_verbatim(fw, " (us) (mW)");
for (i = 1; i < obj->Package.Count; i++){
if (cst_elements_ok[i]) {
ACPI_OBJECT *pkg = &obj->Package.Elements[i];
- fwts_log_info_verbatum(fw,
+ fwts_log_info_verbatim(fw,
"%2" PRIu32 " C%" PRIu64 " %6" PRIu64 " %6" PRIu64,
i,
(uint64_t)pkg->Package.Elements[1].Integer.Value,
(uint64_t)pkg->Package.Elements[2].Integer.Value,
(uint64_t)pkg->Package.Elements[3].Integer.Value);
} else {
- fwts_log_info_verbatum(fw,
+ fwts_log_info_verbatim(fw,
"%2" PRIu32 " -- ----- -----", i);
}
}
@@ -3663,13 +3663,13 @@ static void method_test_PSS_return(
* If we have some valid data then dump it out, it is useful to see
*/
if (dump_elements) {
- fwts_log_info_verbatum(fw, "%s values:", name);
- fwts_log_info_verbatum(fw, "P-State Freq Power Latency Bus Master");
- fwts_log_info_verbatum(fw, " (MHz) (mW) (us) Latency (us)");
+ fwts_log_info_verbatim(fw, "%s values:", name);
+ fwts_log_info_verbatim(fw, "P-State Freq Power Latency Bus Master");
+ fwts_log_info_verbatim(fw, " (MHz) (mW) (us) Latency (us)");
for (i = 0; i < obj->Package.Count; i++) {
ACPI_OBJECT *pstate = &obj->Package.Elements[i];
if (element_ok[i]) {
- fwts_log_info_verbatum(fw, " %3d %7" PRIu64 " %8" PRIu64
+ fwts_log_info_verbatim(fw, " %3d %7" PRIu64 " %8" PRIu64
" %5" PRIu64 " %5" PRIu64,
i,
(uint64_t)pstate->Package.Elements[0].Integer.Value,
@@ -3677,7 +3677,7 @@ static void method_test_PSS_return(
(uint64_t)pstate->Package.Elements[2].Integer.Value,
(uint64_t)pstate->Package.Elements[3].Integer.Value);
} else {
- fwts_log_info_verbatum(fw,
+ fwts_log_info_verbatim(fw,
" %3d ---- ----- -- -- (invalid)", i);
}
}
@@ -4080,14 +4080,14 @@ static void method_test_TSS_return(
/* Summary info */
if (an_element_ok) {
- fwts_log_info_verbatum(fw, "%s values:", name);
- fwts_log_info_verbatum(fw, "T-State CPU Power Latency Control Status");
- fwts_log_info_verbatum(fw, " Freq (mW) (usecs)");
+ fwts_log_info_verbatim(fw, "%s values:", name);
+ fwts_log_info_verbatim(fw, "T-State CPU Power Latency Control Status");
+ fwts_log_info_verbatim(fw, " Freq (mW) (usecs)");
for (i = 0; i < obj->Package.Count; i++) {
if (tss_elements_ok[i]) {
ACPI_OBJECT *pkg = &obj->Package.Elements[i];
- fwts_log_info_verbatum(fw,
+ fwts_log_info_verbatim(fw,
" %3d %3" PRIu64 "%% %7" PRIu64 " %7" PRIu64
" %2.2" PRIx64 " %2.2" PRIx64, i,
(uint64_t)pkg->Package.Elements[0].Integer.Value,
@@ -4096,7 +4096,7 @@ static void method_test_TSS_return(
(uint64_t)pkg->Package.Elements[3].Integer.Value,
(uint64_t)pkg->Package.Elements[4].Integer.Value);
} else {
- fwts_log_info_verbatum(fw,
+ fwts_log_info_verbatim(fw,
" %3d ---- ----- ----- -- -- (invalid)", i);
}
}
@@ -6508,17 +6508,17 @@ static void method_test_DOD_return(
failed = true;
else {
uint32_t val = obj->Package.Elements[i].Integer.Value;
- fwts_log_info_verbatum(fw, "Device %" PRIu32 ":", i);
+ fwts_log_info_verbatim(fw, "Device %" PRIu32 ":", i);
if ((val & 0x80000000)) {
- fwts_log_info_verbatum(fw, " Video Chip Vendor Scheme %" PRIu32, val);
+ fwts_log_info_verbatim(fw, " Video Chip Vendor Scheme %" PRIu32, val);
} else {
- fwts_log_info_verbatum(fw, " Instance: %" PRIu32, val & 0xf);
- fwts_log_info_verbatum(fw, " Display port attachment: %" PRIu32, (val >> 4) & 0xf);
- fwts_log_info_verbatum(fw, " Type of display: %" PRIu32 " (%s)",
+ fwts_log_info_verbatim(fw, " Instance: %" PRIu32, val & 0xf);
+ fwts_log_info_verbatim(fw, " Display port attachment: %" PRIu32, (val >> 4) & 0xf);
+ fwts_log_info_verbatim(fw, " Type of display: %" PRIu32 " (%s)",
(val >> 8) & 0xf, dod_type[(val >> 8) & 0xf]);
- fwts_log_info_verbatum(fw, " BIOS can detect device: %" PRIu32, (val >> 16) & 1);
- fwts_log_info_verbatum(fw, " Non-VGA device: %" PRIu32, (val >> 17) & 1);
- fwts_log_info_verbatum(fw, " Head or pipe ID: %" PRIu32, (val >> 18) & 0x7);
+ fwts_log_info_verbatim(fw, " BIOS can detect device: %" PRIu32, (val >> 16) & 1);
+ fwts_log_info_verbatim(fw, " Non-VGA device: %" PRIu32, (val >> 17) & 1);
+ fwts_log_info_verbatim(fw, " Head or pipe ID: %" PRIu32, (val >> 18) & 0x7);
}
}
}
@@ -6661,9 +6661,9 @@ static void method_test_BCL_return(
}
fwts_log_info(fw, "Brightness levels for %s:" ,name);
- fwts_log_info_verbatum(fw, " Level on full power : %" PRIu64,
+ fwts_log_info_verbatim(fw, " Level on full power : %" PRIu64,
(uint64_t)obj->Package.Elements[0].Integer.Value);
- fwts_log_info_verbatum(fw, " Level on battery power: %" PRIu64,
+ fwts_log_info_verbatim(fw, " Level on battery power: %" PRIu64,
(uint64_t)obj->Package.Elements[1].Integer.Value);
for (i = 2; i < obj->Package.Count; i++) {
char tmp[12];
@@ -6676,7 +6676,7 @@ static void method_test_BCL_return(
break;
}
if (str) {
- fwts_log_info_verbatum(fw, " Brightness Levels : %s", str);
+ fwts_log_info_verbatim(fw, " Brightness Levels : %s", str);
free(str);
}
diff --git a/src/acpi/msct/msct.c b/src/acpi/msct/msct.c
index 88c29d3..4aa3fb5 100644
--- a/src/acpi/msct/msct.c
+++ b/src/acpi/msct/msct.c
@@ -51,14 +51,14 @@ static int msct_test1(fwts_framework *fw)
uint32_t i;
bool passed = true;
- fwts_log_info_verbatum(fw, "MSCT Max System Characteristics Table:");
- fwts_log_info_verbatum(fw, " Proximity Offset: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, "MSCT Max System Characteristics Table:");
+ fwts_log_info_verbatim(fw, " Proximity Offset: 0x%8.8" PRIx32,
msct->proximity_offset);
- fwts_log_info_verbatum(fw, " Max Proximity Domains: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Max Proximity Domains: 0x%8.8" PRIx32,
msct->max_proximity_domains);
- fwts_log_info_verbatum(fw, " Max Clock Domains: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Max Clock Domains: 0x%8.8" PRIx32,
msct->max_clock_domains);
- fwts_log_info_verbatum(fw, " Max Physical Address: 0x%16.16" PRIx64,
+ fwts_log_info_verbatim(fw, " Max Physical Address: 0x%16.16" PRIx64,
msct->max_address);
if (msct->proximity_offset < 0x38) {
@@ -98,18 +98,18 @@ static int msct_test1(fwts_framework *fw)
proximity = (fwts_acpi_msct_proximity *)((char *) msct + offset_proximity);
for (i = 0; i < num_proximity; i++, proximity++) {
- fwts_log_info_verbatum(fw, " Proximity Domain %2.2" PRIu8, i);
- fwts_log_info_verbatum(fw, " Revision: 0x%2.2"
+ fwts_log_info_verbatim(fw, " Proximity Domain %2.2" PRIu8, i);
+ fwts_log_info_verbatim(fw, " Revision: 0x%2.2"
PRIx8, proximity->revision);
- fwts_log_info_verbatum(fw, " Length: 0x%2.2"
+ fwts_log_info_verbatim(fw, " Length: 0x%2.2"
PRIx8, proximity->length);
- fwts_log_info_verbatum(fw, " Domain Range (low): 0x%8.8"
+ fwts_log_info_verbatim(fw, " Domain Range (low): 0x%8.8"
PRIx32, proximity->range_start);
- fwts_log_info_verbatum(fw, " Domain Range (high): 0x%8.8"
+ fwts_log_info_verbatim(fw, " Domain Range (high): 0x%8.8"
PRIx32, proximity->range_end);
- fwts_log_info_verbatum(fw, " Max Processor Capacity: 0x%8.8"
+ fwts_log_info_verbatim(fw, " Max Processor Capacity: 0x%8.8"
PRIx32, proximity->processor_capacity);
- fwts_log_info_verbatum(fw, " Max Memory Capacity: "
+ fwts_log_info_verbatim(fw, " Max Memory Capacity: "
"0x%16.16" PRIx64, proximity->memory_capacity);
fwts_log_nl(fw);
}
diff --git a/src/acpi/msdm/msdm.c b/src/acpi/msdm/msdm.c
index 4e36981..71be6f6 100644
--- a/src/acpi/msdm/msdm.c
+++ b/src/acpi/msdm/msdm.c
@@ -64,10 +64,10 @@ static int msdm_test1(fwts_framework *fw)
sizeof(fwts_acpi_table_msdm), table->length);
goto done;
}
- fwts_log_info_verbatum(fw, " Reserved: 0x%8.8" PRIx32, msdm->reserved);
- fwts_log_info_verbatum(fw, " Data Type: 0x%8.8" PRIx32, msdm->data_type);
- fwts_log_info_verbatum(fw, " Data Reserved: 0x%8.8" PRIx32, msdm->data_reserved);
- fwts_log_info_verbatum(fw, " Data Length: 0x%8.8" PRIx32, msdm->data_length);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%8.8" PRIx32, msdm->reserved);
+ fwts_log_info_verbatim(fw, " Data Type: 0x%8.8" PRIx32, msdm->data_type);
+ fwts_log_info_verbatim(fw, " Data Reserved: 0x%8.8" PRIx32, msdm->data_reserved);
+ fwts_log_info_verbatim(fw, " Data Length: 0x%8.8" PRIx32, msdm->data_length);
if (msdm->reserved) {
passed = false;
@@ -116,7 +116,7 @@ static int msdm_test1(fwts_framework *fw)
bool invalid = false;
/* Note, no checks to see if this is a valid key! */
- fwts_log_info_verbatum(fw, " Data: '%*.*s'",
+ fwts_log_info_verbatim(fw, " Data: '%*.*s'",
msdm->data_length, msdm->data_length, msdm->data);
/* Expect XXXXX-XXXXX-XXXXX-XXXXX-XXXXX */
diff --git a/src/acpi/osilinux/osilinux.c b/src/acpi/osilinux/osilinux.c
index 1a631fb..2b8d0de 100644
--- a/src/acpi/osilinux/osilinux.c
+++ b/src/acpi/osilinux/osilinux.c
@@ -84,7 +84,7 @@ static int osilinux_test1(fwts_framework *fw)
found = true;
while (dumpitem != NULL &&
dumpitem != item->next) {
- fwts_log_warning_verbatum(fw, "%s", fwts_text_list_text(dumpitem));
+ fwts_log_warning_verbatim(fw, "%s", fwts_text_list_text(dumpitem));
dumpitem = dumpitem->next;
}
dumpdepth = 0;
diff --git a/src/acpi/pcc/pcc.c b/src/acpi/pcc/pcc.c
index b806d21..7ebf8b1 100644
--- a/src/acpi/pcc/pcc.c
+++ b/src/acpi/pcc/pcc.c
@@ -116,20 +116,20 @@ static void pcc_check_pcc_header(
return;
}
- fwts_log_info_verbatum(fw, "PCC header at 0x%" PRIx64 ".", addr);
- fwts_log_info_verbatum(fw, " Signature: 0x%" PRIx32, hdr->signature);
- fwts_log_info_verbatum(fw, " Length: 0x%" PRIx16, hdr->length);
- fwts_log_info_verbatum(fw, " Major: 0x%" PRIx8, hdr->major);
- fwts_log_info_verbatum(fw, " Minor: 0x%" PRIx8, hdr->minor);
- fwts_log_info_verbatum(fw, " Features: 0x%" PRIx32, hdr->features);
- fwts_log_info_verbatum(fw, " Commend: 0x%" PRIx16, hdr->command);
- fwts_log_info_verbatum(fw, " Status: 0x%" PRIx16, hdr->status);
- fwts_log_info_verbatum(fw, " Latency: 0x%" PRIx32, hdr->latency);
- fwts_log_info_verbatum(fw, " Minimum Time: 0x%" PRIx32, hdr->minimum_time);
- fwts_log_info_verbatum(fw, " Maximum Time: 0x%" PRIx32, hdr->maximum_time);
- fwts_log_info_verbatum(fw, " Nominal: 0x%" PRIx32, hdr->nominal);
- fwts_log_info_verbatum(fw, " Throttled Freq.: 0x%" PRIx32, hdr->throttled_frequency);
- fwts_log_info_verbatum(fw, " Minimum Freq.: 0x%" PRIx32, hdr->minimum_frequency);
+ fwts_log_info_verbatim(fw, "PCC header at 0x%" PRIx64 ".", addr);
+ fwts_log_info_verbatim(fw, " Signature: 0x%" PRIx32, hdr->signature);
+ fwts_log_info_verbatim(fw, " Length: 0x%" PRIx16, hdr->length);
+ fwts_log_info_verbatim(fw, " Major: 0x%" PRIx8, hdr->major);
+ fwts_log_info_verbatim(fw, " Minor: 0x%" PRIx8, hdr->minor);
+ fwts_log_info_verbatim(fw, " Features: 0x%" PRIx32, hdr->features);
+ fwts_log_info_verbatim(fw, " Commend: 0x%" PRIx16, hdr->command);
+ fwts_log_info_verbatim(fw, " Status: 0x%" PRIx16, hdr->status);
+ fwts_log_info_verbatim(fw, " Latency: 0x%" PRIx32, hdr->latency);
+ fwts_log_info_verbatim(fw, " Minimum Time: 0x%" PRIx32, hdr->minimum_time);
+ fwts_log_info_verbatim(fw, " Maximum Time: 0x%" PRIx32, hdr->maximum_time);
+ fwts_log_info_verbatim(fw, " Nominal: 0x%" PRIx32, hdr->nominal);
+ fwts_log_info_verbatim(fw, " Throttled Freq.: 0x%" PRIx32, hdr->throttled_frequency);
+ fwts_log_info_verbatim(fw, " Minimum Freq.: 0x%" PRIx32, hdr->minimum_frequency);
fwts_munmap(hdr, (size_t)length);
fwts_log_nl(fw);
@@ -183,16 +183,16 @@ static void pcc_check_shared_memory_region(
pcc_mr = (fwts_pcc_memory_resource *)pcc_obj->Buffer.Pointer;
- fwts_log_info_verbatum(fw, "PCC Memory Resource (Shared Memory Region) for %s:", name);
- fwts_log_info_verbatum(fw, " Descriptor: 0x%" PRIx8, pcc_mr->descriptor);
- fwts_log_info_verbatum(fw, " Length: 0x%" PRIx8, pcc_mr->length);
- fwts_log_info_verbatum(fw, " Space ID: 0x%" PRIx8, pcc_mr->space_id);
- fwts_log_info_verbatum(fw, " Resource Usage: 0x%" PRIx8, pcc_mr->resource_usage);
- fwts_log_info_verbatum(fw, " Type Specific: 0x%" PRIx8, pcc_mr->type_specific);
- fwts_log_info_verbatum(fw, " Minimum: 0x%" PRIx64, pcc_mr->minimum);
- fwts_log_info_verbatum(fw, " Maximum: 0x%" PRIx64, pcc_mr->maximum);
- fwts_log_info_verbatum(fw, " Translation Offset: 0x%" PRIx64, pcc_mr->translation_offset);
- fwts_log_info_verbatum(fw, " Address Length: 0x%" PRIx64, pcc_mr->address_length);
+ fwts_log_info_verbatim(fw, "PCC Memory Resource (Shared Memory Region) for %s:", name);
+ fwts_log_info_verbatim(fw, " Descriptor: 0x%" PRIx8, pcc_mr->descriptor);
+ fwts_log_info_verbatim(fw, " Length: 0x%" PRIx8, pcc_mr->length);
+ fwts_log_info_verbatim(fw, " Space ID: 0x%" PRIx8, pcc_mr->space_id);
+ fwts_log_info_verbatim(fw, " Resource Usage: 0x%" PRIx8, pcc_mr->resource_usage);
+ fwts_log_info_verbatim(fw, " Type Specific: 0x%" PRIx8, pcc_mr->type_specific);
+ fwts_log_info_verbatim(fw, " Minimum: 0x%" PRIx64, pcc_mr->minimum);
+ fwts_log_info_verbatim(fw, " Maximum: 0x%" PRIx64, pcc_mr->maximum);
+ fwts_log_info_verbatim(fw, " Translation Offset: 0x%" PRIx64, pcc_mr->translation_offset);
+ fwts_log_info_verbatim(fw, " Address Length: 0x%" PRIx64, pcc_mr->address_length);
if (pcc_mr->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) {
fwts_failed(fw, LOG_LEVEL_HIGH, "PCCMemoryResourceSpaceIdWrongType",
@@ -283,14 +283,14 @@ static void pcc_check_doorbell_address(
pcc_rr = (fwts_pcc_register_resource *)pcc_obj->Buffer.Pointer;
- fwts_log_info_verbatum(fw, "PCC Register Resource (Doorbell) for %s:", name);
- fwts_log_info_verbatum(fw, " Descriptor: 0x%" PRIx8, pcc_rr->descriptor);
- fwts_log_info_verbatum(fw, " Length: 0x%" PRIx8, pcc_rr->length);
- fwts_log_info_verbatum(fw, " Space ID: 0x%" PRIx8, pcc_rr->space_id);
- fwts_log_info_verbatum(fw, " Bit Width: 0x%" PRIx8, pcc_rr->bit_width);
- fwts_log_info_verbatum(fw, " Bit Offset: 0x%" PRIx8, pcc_rr->bit_offset);
- fwts_log_info_verbatum(fw, " Access Size: 0x%" PRIx8, pcc_rr->access_size);
- fwts_log_info_verbatum(fw, " Address: 0x%" PRIx64, pcc_rr->address);
+ fwts_log_info_verbatim(fw, "PCC Register Resource (Doorbell) for %s:", name);
+ fwts_log_info_verbatim(fw, " Descriptor: 0x%" PRIx8, pcc_rr->descriptor);
+ fwts_log_info_verbatim(fw, " Length: 0x%" PRIx8, pcc_rr->length);
+ fwts_log_info_verbatim(fw, " Space ID: 0x%" PRIx8, pcc_rr->space_id);
+ fwts_log_info_verbatim(fw, " Bit Width: 0x%" PRIx8, pcc_rr->bit_width);
+ fwts_log_info_verbatim(fw, " Bit Offset: 0x%" PRIx8, pcc_rr->bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size: 0x%" PRIx8, pcc_rr->access_size);
+ fwts_log_info_verbatim(fw, " Address: 0x%" PRIx64, pcc_rr->address);
if (pcc_rr->space_id != ACPI_ADR_SPACE_SYSTEM_IO) {
fwts_failed(fw, LOG_LEVEL_HIGH, "PCCRegisterResourceSpaceIdWrongType",
@@ -332,8 +332,8 @@ static void pcc_check_doorbell_preserve_mask(
return;
}
- fwts_log_info_verbatum(fw, "PCC Doorbell Preserve Mask for %s:", name);
- fwts_log_info_verbatum(fw, " Preserve Mask: 0x%" PRIx64, pcc_obj->Integer.Value);
+ fwts_log_info_verbatim(fw, "PCC Doorbell Preserve Mask for %s:", name);
+ fwts_log_info_verbatim(fw, " Preserve Mask: 0x%" PRIx64, pcc_obj->Integer.Value);
fwts_log_nl(fw);
}
@@ -352,8 +352,8 @@ static void pcc_check_doorbell_write_mask(
return;
}
- fwts_log_info_verbatum(fw, "PCC Doorbell Write Mask for %s:", name);
- fwts_log_info_verbatum(fw, " Write Mask: 0x%" PRIx64, pcc_obj->Integer.Value);
+ fwts_log_info_verbatim(fw, "PCC Doorbell Write Mask for %s:", name);
+ fwts_log_info_verbatim(fw, " Write Mask: 0x%" PRIx64, pcc_obj->Integer.Value);
fwts_log_nl(fw);
if (pcc_obj->Integer.Value == 0) {
diff --git a/src/acpi/plddump/plddump.c b/src/acpi/plddump/plddump.c
index c7972e6..bb0961f 100644
--- a/src/acpi/plddump/plddump.c
+++ b/src/acpi/plddump/plddump.c
@@ -127,78 +127,78 @@ static void plddump_buffer(
const uint32_t length)
{
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Name: %s", name);
- fwts_log_info_verbatum(fw, " Revision: %" PRIu64,
+ fwts_log_info_verbatim(fw, "Name: %s", name);
+ fwts_log_info_verbatim(fw, " Revision: %" PRIu64,
get_bits(data, 0, 7));
- fwts_log_info_verbatum(fw, " Ignore Color: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " Ignore Color: %" PRIu64 " (%s)",
get_bits(data, 7, 1),
yesno[get_bits(data, 7, 1)]);
if (!get_bits(data, 7, 1)) {
- fwts_log_info_verbatum(fw, " Red: 0x%2.2" PRIx64,
+ fwts_log_info_verbatim(fw, " Red: 0x%2.2" PRIx64,
get_bits(data, 8, 8));
- fwts_log_info_verbatum(fw, " Green: 0x%2.2" PRIx64,
+ fwts_log_info_verbatim(fw, " Green: 0x%2.2" PRIx64,
get_bits(data, 16, 8));
- fwts_log_info_verbatum(fw, " Blue: 0x%2.2" PRIx64,
+ fwts_log_info_verbatim(fw, " Blue: 0x%2.2" PRIx64,
get_bits(data, 24, 8));
}
- fwts_log_info_verbatum(fw, " Width: %" PRIu64 " mm",
+ fwts_log_info_verbatim(fw, " Width: %" PRIu64 " mm",
get_bits(data, 32, 16));
- fwts_log_info_verbatum(fw, " Height: %" PRIu64 " mm",
+ fwts_log_info_verbatim(fw, " Height: %" PRIu64 " mm",
get_bits(data, 48, 16));
- fwts_log_info_verbatum(fw, " User Visible: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " User Visible: %" PRIu64 " (%s)",
get_bits(data, 64, 1),
yesno[get_bits(data, 64, 1)]);
- fwts_log_info_verbatum(fw, " Dock: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " Dock: %" PRIu64 " (%s)",
get_bits(data, 65, 1),
yesno[get_bits(data, 65, 1)]);
- fwts_log_info_verbatum(fw, " Lid: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " Lid: %" PRIu64 " (%s)",
get_bits(data, 66, 1),
yesno[get_bits(data, 66, 1)]);
- fwts_log_info_verbatum(fw, " Panel Surface: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " Panel Surface: %" PRIu64 " (%s)",
get_bits(data, 67, 3),
panel_surface[get_bits(data, 67, 3)]);
if (get_bits(data, 67, 3) < 6) {
- fwts_log_info_verbatum(fw, " Vertical Position: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " Vertical Position: %" PRIu64 " (%s)",
get_bits(data, 70, 2),
vertical_position[get_bits(data, 70, 2)]);
- fwts_log_info_verbatum(fw, " Horizontal Position: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " Horizontal Position: %" PRIu64 " (%s)",
get_bits(data, 72, 2),
horizontal_position[get_bits(data, 72, 2)]);
}
- fwts_log_info_verbatum(fw, " Shape: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " Shape: %" PRIu64 " (%s)",
get_bits(data, 74, 4),
shape[get_bits(data, 74, 4)]);
- fwts_log_info_verbatum(fw, " Group Orientation: %" PRIu64,
+ fwts_log_info_verbatim(fw, " Group Orientation: %" PRIu64,
get_bits(data, 78, 1));
- fwts_log_info_verbatum(fw, " Group Token: %" PRIu64,
+ fwts_log_info_verbatim(fw, " Group Token: %" PRIu64,
get_bits(data, 79, 8));
- fwts_log_info_verbatum(fw, " Group Position: %" PRIu64,
+ fwts_log_info_verbatim(fw, " Group Position: %" PRIu64,
get_bits(data, 87, 8));
- fwts_log_info_verbatum(fw, " Bay: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " Bay: %" PRIu64 " (%s)",
get_bits(data, 95, 1),
yesno[get_bits(data, 95, 1)]);
- fwts_log_info_verbatum(fw, " Ejectable: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " Ejectable: %" PRIu64 " (%s)",
get_bits(data, 96, 1),
yesno[get_bits(data, 96, 1)]);
- fwts_log_info_verbatum(fw, " OSPM Ejection Rqd: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " OSPM Ejection Rqd: %" PRIu64 " (%s)",
get_bits(data, 97, 1),
yesno[get_bits(data, 97, 1)]);
- fwts_log_info_verbatum(fw, " Cabinet Number: %" PRIu64,
+ fwts_log_info_verbatim(fw, " Cabinet Number: %" PRIu64,
get_bits(data, 98, 8));
- fwts_log_info_verbatum(fw, " Card Cage Number: %" PRIu64,
+ fwts_log_info_verbatim(fw, " Card Cage Number: %" PRIu64,
get_bits(data, 106, 8));
- fwts_log_info_verbatum(fw, " Reference: %" PRIu64 " (%s)",
+ fwts_log_info_verbatim(fw, " Reference: %" PRIu64 " (%s)",
get_bits(data, 114, 1),
yesno[get_bits(data, 114, 1)]);
- fwts_log_info_verbatum(fw, " Rotation: %" PRIu64 " (%" PRIu64 " degrees)",
+ fwts_log_info_verbatim(fw, " Rotation: %" PRIu64 " (%" PRIu64 " degrees)",
get_bits(data, 115, 3),
get_bits(data, 115, 3) * 45);
- fwts_log_info_verbatum(fw, " Order: %" PRIu64,
+ fwts_log_info_verbatim(fw, " Order: %" PRIu64,
get_bits(data, 119, 5));
if (length >= 20) {
- fwts_log_info_verbatum(fw, " Vertical Offset: %" PRIu64 " mm",
+ fwts_log_info_verbatim(fw, " Vertical Offset: %" PRIu64 " mm",
get_bits(data, 128, 16));
- fwts_log_info_verbatum(fw, " Horizontal Offset: %" PRIu64 " mm",
+ fwts_log_info_verbatim(fw, " Horizontal Offset: %" PRIu64 " mm",
get_bits(data, 144, 16));
}
}
@@ -250,7 +250,7 @@ static int plddump_test1(fwts_framework *fw)
}
if (!found)
- fwts_log_info_verbatum(fw, "No _PLD objects found.");
+ fwts_log_info_verbatim(fw, "No _PLD objects found.");
return FWTS_OK;
}
diff --git a/src/acpi/s3/s3.c b/src/acpi/s3/s3.c
index b094ac7..2362a78 100644
--- a/src/acpi/s3/s3.c
+++ b/src/acpi/s3/s3.c
@@ -376,20 +376,20 @@ static int s3_scan_times(
fwts_log_info(fw, "Suspend/Resume Timings:");
if (s3_suspend_start > 0.0 && s3_suspend_finish > 0.0) {
- fwts_log_info_verbatum(fw, " Suspend: %.3f seconds.",
+ fwts_log_info_verbatim(fw, " Suspend: %.3f seconds.",
s3_suspend_finish - s3_suspend_start);
if (s3_suspend_finish - s3_suspend_start > s3_suspend_time)
(*suspend_too_long)++;
} else
- fwts_log_info_verbatum(fw, " Could not determine time to suspend.");
+ fwts_log_info_verbatim(fw, " Could not determine time to suspend.");
if (s3_resume_start > 0.0 && s3_resume_finish > 0.0) {
- fwts_log_info_verbatum(fw, " Resume: %.3f seconds.",
+ fwts_log_info_verbatim(fw, " Resume: %.3f seconds.",
s3_resume_finish - s3_resume_start);
if (s3_resume_finish - s3_resume_start > s3_resume_time)
(*resume_too_long)++;
} else
- fwts_log_info_verbatum(fw, " Could not determine time to resume.");
+ fwts_log_info_verbatim(fw, " Could not determine time to resume.");
return FWTS_OK;
}
diff --git a/src/acpi/slic/slic.c b/src/acpi/slic/slic.c
index d5f4632..65ec114 100644
--- a/src/acpi/slic/slic.c
+++ b/src/acpi/slic/slic.c
@@ -72,15 +72,15 @@ static int slic_test1(fwts_framework *fw)
}
ptr = (uint8_t *)table->data + sizeof(fwts_acpi_table_header);
- fwts_log_info_verbatum(fw, "Software Licensing Description Table");
+ fwts_log_info_verbatim(fw, "Software Licensing Description Table");
while (length < table->length) {
fwts_acpi_table_slic_header *hdr =
(fwts_acpi_table_slic_header *)ptr;
if (hdr->length < sizeof(fwts_acpi_table_slic_header))
break;
#if DUMP_SLIC
- fwts_log_info_verbatum(fw, " Type: 0x%8.8" PRIx32, hdr->type);
- fwts_log_info_verbatum(fw, " Length: 0x%8.8" PRIx32, hdr->length);
+ fwts_log_info_verbatim(fw, " Type: 0x%8.8" PRIx32, hdr->type);
+ fwts_log_info_verbatim(fw, " Length: 0x%8.8" PRIx32, hdr->length);
#endif
switch (hdr->type) {
@@ -99,15 +99,15 @@ static int slic_test1(fwts_framework *fw)
fwts_log_info(fw, "SLIC Public Key Structure has had minimal check due to proprietary nature of the table");
#if DUMP_SLIC
- fwts_log_info_verbatum(fw, " SLIC Public Key:\n");
- fwts_log_info_verbatum(fw, " Key Type: 0x%2.2" PRIx8, key->key_type);
- fwts_log_info_verbatum(fw, " Version: 0x%2.2" PRIx8, key->version);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, key->reserved);
- fwts_log_info_verbatum(fw, " Algorithm: 0x%8.8" PRIx32, key->algorithm);
- fwts_log_info_verbatum(fw, " Magic: '%c%c%c%c'",
+ fwts_log_info_verbatim(fw, " SLIC Public Key:\n");
+ fwts_log_info_verbatim(fw, " Key Type: 0x%2.2" PRIx8, key->key_type);
+ fwts_log_info_verbatim(fw, " Version: 0x%2.2" PRIx8, key->version);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, key->reserved);
+ fwts_log_info_verbatim(fw, " Algorithm: 0x%8.8" PRIx32, key->algorithm);
+ fwts_log_info_verbatim(fw, " Magic: '%c%c%c%c'",
key->magic[0], key->magic[1], key->magic[2], key->magic[3]);
- fwts_log_info_verbatum(fw, " Bit Length: 0x%8.8" PRIx32, key->bit_length);
- fwts_log_info_verbatum(fw, " Exponent: 0x%8.8" PRIx32, key->exponent);
+ fwts_log_info_verbatim(fw, " Bit Length: 0x%8.8" PRIx32, key->bit_length);
+ fwts_log_info_verbatim(fw, " Exponent: 0x%8.8" PRIx32, key->exponent);
/* For the moment, don't dump the modulus */
#endif
}
@@ -128,22 +128,22 @@ static int slic_test1(fwts_framework *fw)
#endif
fwts_log_info(fw, "SLIC Windows Marker Structure has had minimal check due to proprietary nature of the table");
#if DUMP_SLIC
- fwts_log_info_verbatum(fw, " SLIC Windows Marker:\n");
- fwts_log_info_verbatum(fw, " Version: 0x%2.2" PRIx8, marker->version);
- fwts_log_info_verbatum(fw, " OEM ID: '%6.6s'", marker->oem_id);
- fwts_log_info_verbatum(fw, " OEM Table ID: '%8.8s'", marker->oem_table_id);
- fwts_log_info_verbatum(fw, " Windows Flag: '%8.8s'", marker->windows_flag);
- fwts_log_info_verbatum(fw, " SLIC Version: 0x%4.4" PRIx32, marker->slic_version);
- fwts_log_info_verbatum(fw, " Reserved: "
+ fwts_log_info_verbatim(fw, " SLIC Windows Marker:\n");
+ fwts_log_info_verbatim(fw, " Version: 0x%2.2" PRIx8, marker->version);
+ fwts_log_info_verbatim(fw, " OEM ID: '%6.6s'", marker->oem_id);
+ fwts_log_info_verbatim(fw, " OEM Table ID: '%8.8s'", marker->oem_table_id);
+ fwts_log_info_verbatim(fw, " Windows Flag: '%8.8s'", marker->windows_flag);
+ fwts_log_info_verbatim(fw, " SLIC Version: 0x%4.4" PRIx32, marker->slic_version);
+ fwts_log_info_verbatim(fw, " Reserved: "
"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
marker->reserved[0], marker->reserved[1], marker->reserved[2], marker->reserved[3]);
- fwts_log_info_verbatum(fw, " Reserved: "
+ fwts_log_info_verbatim(fw, " Reserved: "
"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
marker->reserved[4], marker->reserved[5], marker->reserved[6], marker->reserved[7]);
- fwts_log_info_verbatum(fw, " Reserved: "
+ fwts_log_info_verbatim(fw, " Reserved: "
"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
marker->reserved[8], marker->reserved[9], marker->reserved[10], marker->reserved[11]);
- fwts_log_info_verbatum(fw, " Reserved: "
+ fwts_log_info_verbatim(fw, " Reserved: "
"0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
marker->reserved[12], marker->reserved[13], marker->reserved[14], marker->reserved[15]);
/* For the moment, don't dump the signature */
diff --git a/src/acpi/slit/slit.c b/src/acpi/slit/slit.c
index 628bbde..f748714 100644
--- a/src/acpi/slit/slit.c
+++ b/src/acpi/slit/slit.c
@@ -70,8 +70,8 @@ static int slit_test1(fwts_framework *fw)
}
n = slit->num_of_system_localities;
- fwts_log_info_verbatum(fw, "SLIT System Locality Distance Information Table:");
- fwts_log_info_verbatum(fw, " Number of Localities: 0x%" PRIx64, n);
+ fwts_log_info_verbatim(fw, "SLIT System Locality Distance Information Table:");
+ fwts_log_info_verbatim(fw, " Number of Localities: 0x%" PRIx64, n);
/*
* ACPI table length is 32 bits, so maximum matrix of entries size is
diff --git a/src/acpi/spcr/spcr.c b/src/acpi/spcr/spcr.c
index 4b81b9a..26cae54 100644
--- a/src/acpi/spcr/spcr.c
+++ b/src/acpi/spcr/spcr.c
@@ -96,7 +96,7 @@ static int spcr_test1(fwts_framework *fw)
break;
}
- fwts_log_info_verbatum(fw, "Serial Interface: %s", str);
+ fwts_log_info_verbatim(fw, "Serial Interface: %s", str);
if (reserved) {
passed = false;
fwts_failed(fw, LOG_LEVEL_HIGH,
@@ -166,7 +166,7 @@ static int spcr_test1(fwts_framework *fw)
str = "Reserved";
reserved = true;
}
- fwts_log_info_verbatum(fw, "Baud Rate: %s", str);
+ fwts_log_info_verbatim(fw, "Baud Rate: %s", str);
if (reserved) {
passed = false;
fwts_failed(fw, LOG_LEVEL_HIGH,
@@ -218,7 +218,7 @@ static int spcr_test1(fwts_framework *fw)
str = "Reserved";
reserved = true;
}
- fwts_log_info_verbatum(fw, "Terminal Type: %s", str);
+ fwts_log_info_verbatim(fw, "Terminal Type: %s", str);
if (reserved) {
passed = false;
fwts_failed(fw, LOG_LEVEL_HIGH,
diff --git a/src/acpi/spmi/spmi.c b/src/acpi/spmi/spmi.c
index 8f2e799..c7b0ee7 100644
--- a/src/acpi/spmi/spmi.c
+++ b/src/acpi/spmi/spmi.c
@@ -85,27 +85,27 @@ static int spmi_test1(fwts_framework *fw)
break;
}
- fwts_log_info_verbatum(fw, "SPMI Service Processor Management Interface Description Table:");
- fwts_log_info_verbatum(fw, " Interface Type: 0x%2.2" PRIx8 " (%s)",
+ fwts_log_info_verbatim(fw, "SPMI Service Processor Management Interface Description Table:");
+ fwts_log_info_verbatim(fw, " Interface Type: 0x%2.2" PRIx8 " (%s)",
spmi->interface_type, interface_type);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, spmi->reserved1);
- fwts_log_info_verbatum(fw, " Specification Revision: 0x%2.2" PRIx8, spmi->specification_revision);
- fwts_log_info_verbatum(fw, " Interrupt Type: 0x%2.2" PRIx8, spmi->interrupt_type);
- fwts_log_info_verbatum(fw, " GPE: 0x%2.2" PRIx8, spmi->gpe);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, spmi->reserved2);
- fwts_log_info_verbatum(fw, " PCI Device Flag: 0x%2.2" PRIx8, spmi->pci_device_flag);
- fwts_log_info_verbatum(fw, " Global System Interrupt 0x%8.8" PRIx32, spmi->global_system_interrupt);
- fwts_log_info_verbatum(fw, " Base Address:");
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, spmi->base_address.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, spmi->base_address.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, spmi->base_address.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, spmi->base_address.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, spmi->base_address.address);
- fwts_log_info_verbatum(fw, " PCI Segment Group: 0x%2.2" PRIx8, spmi->pci_segment_group_number);
- fwts_log_info_verbatum(fw, " PCI Bus: 0x%2.2" PRIx8, spmi->pci_bus_number);
- fwts_log_info_verbatum(fw, " PCI Device: 0x%2.2" PRIx8, spmi->pci_device_number);
- fwts_log_info_verbatum(fw, " PCI Function: 0x%2.2" PRIx8, spmi->pci_function_number);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8, spmi->reserved3);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, spmi->reserved1);
+ fwts_log_info_verbatim(fw, " Specification Revision: 0x%2.2" PRIx8, spmi->specification_revision);
+ fwts_log_info_verbatim(fw, " Interrupt Type: 0x%2.2" PRIx8, spmi->interrupt_type);
+ fwts_log_info_verbatim(fw, " GPE: 0x%2.2" PRIx8, spmi->gpe);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, spmi->reserved2);
+ fwts_log_info_verbatim(fw, " PCI Device Flag: 0x%2.2" PRIx8, spmi->pci_device_flag);
+ fwts_log_info_verbatim(fw, " Global System Interrupt 0x%8.8" PRIx32, spmi->global_system_interrupt);
+ fwts_log_info_verbatim(fw, " Base Address:");
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, spmi->base_address.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, spmi->base_address.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, spmi->base_address.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, spmi->base_address.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, spmi->base_address.address);
+ fwts_log_info_verbatim(fw, " PCI Segment Group: 0x%2.2" PRIx8, spmi->pci_segment_group_number);
+ fwts_log_info_verbatim(fw, " PCI Bus: 0x%2.2" PRIx8, spmi->pci_bus_number);
+ fwts_log_info_verbatim(fw, " PCI Device: 0x%2.2" PRIx8, spmi->pci_device_number);
+ fwts_log_info_verbatim(fw, " PCI Function: 0x%2.2" PRIx8, spmi->pci_function_number);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8, spmi->reserved3);
fwts_log_nl(fw);
if (spmi->interface_type < 1 || spmi->interface_type > 4) {
diff --git a/src/acpi/srat/srat.c b/src/acpi/srat/srat.c
index 9eb314a..a0f2ac0 100644
--- a/src/acpi/srat/srat.c
+++ b/src/acpi/srat/srat.c
@@ -74,17 +74,17 @@ static void srat_check_local_apic_sapic_affinity(
goto done;
}
- fwts_log_info_verbatum(fw, "SRAT Local APIC/SAPIC Affinity Structure:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, affinity->type);
- fwts_log_info_verbatum(fw, " Length: 0x%2.2" PRIx8, affinity->length);
- fwts_log_info_verbatum(fw, " Proximity Domain: [7:0] 0x%2.2" PRIx8, affinity->proximity_domain_0);
- fwts_log_info_verbatum(fw, " APIC ID: 0x%2.2" PRIx8, affinity->apic_id);
- fwts_log_info_verbatum(fw, " Flags: 0x%8.8" PRIx32, affinity->flags);
- fwts_log_info_verbatum(fw, " Local SAPIC EID: 0x%2.2" PRIx8, affinity->local_sapic_eid);
- fwts_log_info_verbatum(fw, " Proximity Domain: [8:15] 0x%2.2" PRIx8, affinity->proximity_domain_1);
- fwts_log_info_verbatum(fw, " Proximity Domain: [16:23] 0x%2.2" PRIx8, affinity->proximity_domain_2);
- fwts_log_info_verbatum(fw, " Proximity Domain: [23:31] 0x%2.2" PRIx8, affinity->proximity_domain_3);
- fwts_log_info_verbatum(fw, " Clock Domain 0x%8.8" PRIx32, affinity->clock_domain);
+ fwts_log_info_verbatim(fw, "SRAT Local APIC/SAPIC Affinity Structure:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, affinity->type);
+ fwts_log_info_verbatim(fw, " Length: 0x%2.2" PRIx8, affinity->length);
+ fwts_log_info_verbatim(fw, " Proximity Domain: [7:0] 0x%2.2" PRIx8, affinity->proximity_domain_0);
+ fwts_log_info_verbatim(fw, " APIC ID: 0x%2.2" PRIx8, affinity->apic_id);
+ fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx32, affinity->flags);
+ fwts_log_info_verbatim(fw, " Local SAPIC EID: 0x%2.2" PRIx8, affinity->local_sapic_eid);
+ fwts_log_info_verbatim(fw, " Proximity Domain: [8:15] 0x%2.2" PRIx8, affinity->proximity_domain_1);
+ fwts_log_info_verbatim(fw, " Proximity Domain: [16:23] 0x%2.2" PRIx8, affinity->proximity_domain_2);
+ fwts_log_info_verbatim(fw, " Proximity Domain: [23:31] 0x%2.2" PRIx8, affinity->proximity_domain_3);
+ fwts_log_info_verbatim(fw, " Clock Domain 0x%8.8" PRIx32, affinity->clock_domain);
fwts_log_nl(fw);
if (affinity->flags & ~0x1UL) {
@@ -139,18 +139,18 @@ static void srat_check_memory_affinity(
goto done;
}
- fwts_log_info_verbatum(fw, "SRAT Memory Affinity Structure:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, affinity->type);
- fwts_log_info_verbatum(fw, " Length: 0x%2.2" PRIx8, affinity->length);
- fwts_log_info_verbatum(fw, " Proximity Domain: 0x%8.8" PRIx32, affinity->proximity_domain);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, affinity->reserved1);
- fwts_log_info_verbatum(fw, " Base Address: 0x%8.8" PRIx32 "%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, "SRAT Memory Affinity Structure:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, affinity->type);
+ fwts_log_info_verbatim(fw, " Length: 0x%2.2" PRIx8, affinity->length);
+ fwts_log_info_verbatim(fw, " Proximity Domain: 0x%8.8" PRIx32, affinity->proximity_domain);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, affinity->reserved1);
+ fwts_log_info_verbatim(fw, " Base Address: 0x%8.8" PRIx32 "%8.8" PRIx32,
affinity->base_addr_hi, affinity->base_addr_lo);
- fwts_log_info_verbatum(fw, " Length: 0x%8.8" PRIx32 "%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Length: 0x%8.8" PRIx32 "%8.8" PRIx32,
affinity->length_hi, affinity->length_lo);
- fwts_log_info_verbatum(fw, " Reserved: 0x%8.8" PRIx32, affinity->reserved2);
- fwts_log_info_verbatum(fw, " Flags: 0x%8.8" PRIx32, affinity->flags);
- fwts_log_info_verbatum(fw, " Reserved: 0x%16.16" PRIx64, affinity->reserved3);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%8.8" PRIx32, affinity->reserved2);
+ fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx32, affinity->flags);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%16.16" PRIx64, affinity->reserved3);
fwts_log_nl(fw);
if (affinity->flags & ~0x7UL) {
@@ -195,15 +195,15 @@ static void srat_check_local_x2apic_affinity(
goto done;
}
- fwts_log_info_verbatum(fw, "SRAT Local x2APIC Affinity Structure:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, affinity->type);
- fwts_log_info_verbatum(fw, " Length: 0x%2.2" PRIx8, affinity->length);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, affinity->reserved1);
- fwts_log_info_verbatum(fw, " Proximity Domain: 0x%4.4" PRIx16, affinity->proximity_domain);
- fwts_log_info_verbatum(fw, " X2APIC ID: 0x%8.8" PRIx32, affinity->x2apic_id);
- fwts_log_info_verbatum(fw, " Flags: 0x%8.8" PRIx32, affinity->flags);
- fwts_log_info_verbatum(fw, " Clock Domain 0x%8.8" PRIx32, affinity->clock_domain);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, affinity->reserved2);
+ fwts_log_info_verbatim(fw, "SRAT Local x2APIC Affinity Structure:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, affinity->type);
+ fwts_log_info_verbatim(fw, " Length: 0x%2.2" PRIx8, affinity->length);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, affinity->reserved1);
+ fwts_log_info_verbatim(fw, " Proximity Domain: 0x%4.4" PRIx16, affinity->proximity_domain);
+ fwts_log_info_verbatim(fw, " X2APIC ID: 0x%8.8" PRIx32, affinity->x2apic_id);
+ fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx32, affinity->flags);
+ fwts_log_info_verbatim(fw, " Clock Domain 0x%8.8" PRIx32, affinity->clock_domain);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, affinity->reserved2);
fwts_log_nl(fw);
/* Spec states 1st reserved field MUST be zero */
@@ -263,13 +263,13 @@ static void srat_check_gicc_affinity(
goto done;
}
- fwts_log_info_verbatum(fw, "SRAT GICC Affinity Structure:");
- fwts_log_info_verbatum(fw, " Type: 0x%2.2" PRIx8, affinity->type);
- fwts_log_info_verbatum(fw, " Length: 0x%2.2" PRIx8, affinity->length);
- fwts_log_info_verbatum(fw, " Proximity Domain: 0x%4.4" PRIx32, affinity->proximity_domain);
- fwts_log_info_verbatum(fw, " ACPI Processor UID: 0x%8.8" PRIx32, affinity->acpi_processor_uid);
- fwts_log_info_verbatum(fw, " Flags: 0x%8.8" PRIx32, affinity->flags);
- fwts_log_info_verbatum(fw, " Clock Domain 0x%8.8" PRIx32, affinity->clock_domain);
+ fwts_log_info_verbatim(fw, "SRAT GICC Affinity Structure:");
+ fwts_log_info_verbatim(fw, " Type: 0x%2.2" PRIx8, affinity->type);
+ fwts_log_info_verbatim(fw, " Length: 0x%2.2" PRIx8, affinity->length);
+ fwts_log_info_verbatim(fw, " Proximity Domain: 0x%4.4" PRIx32, affinity->proximity_domain);
+ fwts_log_info_verbatim(fw, " ACPI Processor UID: 0x%8.8" PRIx32, affinity->acpi_processor_uid);
+ fwts_log_info_verbatim(fw, " Flags: 0x%8.8" PRIx32, affinity->flags);
+ fwts_log_info_verbatim(fw, " Clock Domain 0x%8.8" PRIx32, affinity->clock_domain);
fwts_log_nl(fw);
if (affinity->flags & ~0x1UL) {
diff --git a/src/acpi/stao/stao.c b/src/acpi/stao/stao.c
index e6ede15..1461ba6 100644
--- a/src/acpi/stao/stao.c
+++ b/src/acpi/stao/stao.c
@@ -104,8 +104,8 @@ static int stao_test1(fwts_framework *fw)
}
/* Now we have got some sane data, dump the STAO */
- fwts_log_info_verbatum(fw, "STAO Status Override Table:");
- fwts_log_info_verbatum(fw, " UART: 0x%2.2" PRIx8, stao->uart);
+ fwts_log_info_verbatim(fw, "STAO Status Override Table:");
+ fwts_log_info_verbatim(fw, " UART: 0x%2.2" PRIx8, stao->uart);
ptr = (char *)stao->namelist;
end = (char *)table->data + stao->header.length;
@@ -116,7 +116,7 @@ static int stao_test1(fwts_framework *fw)
if (!stao_acpi_string(fw, ptr, end, &passed, &len))
break;
- fwts_log_info_verbatum(fw, " ACPI String: '%s'", ptr);
+ fwts_log_info_verbatim(fw, " ACPI String: '%s'", ptr);
strings++;
/* String length + null byte */
ptr += len + 1;
diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c
index e8a997d..42074fc 100644
--- a/src/acpi/syntaxcheck/syntaxcheck.c
+++ b/src/acpi/syntaxcheck/syntaxcheck.c
@@ -307,7 +307,7 @@ static void syntaxcheck_dump_code(fwts_framework *fw,
int i = 0;
fwts_list_link *item;
- fwts_log_info_verbatum(fw, "Line | AML source\n");
+ fwts_log_info_verbatim(fw, "Line | AML source\n");
fwts_log_underline(fw->results, '-');
fwts_list_foreach(item, iasl_disassembly) {
@@ -315,11 +315,11 @@ static void syntaxcheck_dump_code(fwts_framework *fw,
if (i >= error_line + (howmany / 2))
break;
if (i > error_line - (howmany / 2)) {
- fwts_log_info_verbatum(fw, "%5.5d| %s\n", i,
+ fwts_log_info_verbatim(fw, "%5.5d| %s\n", i,
fwts_text_list_text(item));
if (i == error_line) {
- fwts_log_info_verbatum(fw, " | %*.*s", carat_offset, carat_offset, "^");
- fwts_log_info_verbatum(fw, " | %s %d: %s\n",
+ fwts_log_info_verbatim(fw, " | %*.*s", carat_offset, carat_offset, "^");
+ fwts_log_info_verbatim(fw, " | %s %d: %s\n",
syntaxcheck_error_level(error_code), error_code, error_message);
}
}
diff --git a/src/acpi/tcpa/tcpa.c b/src/acpi/tcpa/tcpa.c
index e5e3bce..d77a534 100644
--- a/src/acpi/tcpa/tcpa.c
+++ b/src/acpi/tcpa/tcpa.c
@@ -61,10 +61,10 @@ static int tcpa_client_test(fwts_framework *fw, fwts_acpi_table_tcpa *tcpa)
tcpa->header.revision);
}
- fwts_log_info_verbatum(fw, "TCPA Table:");
- fwts_log_info_verbatum(fw, " Platform Class: 0x%4.4" PRIx16, tcpa->platform_class);
- fwts_log_info_verbatum(fw, " Log Area Minimum Length: 0x%8.8" PRIx32, tcpa->client.log_zone_length);
- fwts_log_info_verbatum(fw, " Log Area Start Address: 0x%16.16" PRIx64, tcpa->client.log_zone_addr);
+ fwts_log_info_verbatim(fw, "TCPA Table:");
+ fwts_log_info_verbatim(fw, " Platform Class: 0x%4.4" PRIx16, tcpa->platform_class);
+ fwts_log_info_verbatim(fw, " Log Area Minimum Length: 0x%8.8" PRIx32, tcpa->client.log_zone_length);
+ fwts_log_info_verbatim(fw, " Log Area Start Address: 0x%16.16" PRIx64, tcpa->client.log_zone_addr);
return passed;
}
@@ -94,34 +94,34 @@ static int tcpa_server_test(fwts_framework *fw, fwts_acpi_table_tcpa *tcpa)
reserved2 = tcpa->server.reserved2[0] + (tcpa->server.reserved2[1] << 4) + (tcpa->server.reserved2[2] << 8);
- fwts_log_info_verbatum(fw, "TCPA Table:");
- fwts_log_info_verbatum(fw, " Platform Class: 0x%4.4" PRIx16, tcpa->platform_class);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx16, tcpa->server.reserved);
- fwts_log_info_verbatum(fw, " Log Area Minimum Length: 0x%16.16" PRIx64, tcpa->server.log_zone_length);
- fwts_log_info_verbatum(fw, " Log Area Start Address: 0x%16.16" PRIx64, tcpa->server.log_zone_addr);
- fwts_log_info_verbatum(fw, " Specification Revision: 0x%4.4" PRIx16, tcpa->server.spec_revision);
- fwts_log_info_verbatum(fw, " Device Flags: 0x%2.2" PRIx16, tcpa->server.device_flag);
- fwts_log_info_verbatum(fw, " Interrupt Flags: 0x%2.2" PRIx16, tcpa->server.interrupt_flag);
- fwts_log_info_verbatum(fw, " GPE: 0x%2.2" PRIx16, tcpa->server.gpe);
- fwts_log_info_verbatum(fw, " Reserved: 0x%8.8" PRIx32, reserved2);
- fwts_log_info_verbatum(fw, " Global System Interrupt: 0x%8.8" PRIx32, tcpa->server.global_sys_interrupt);
- fwts_log_info_verbatum(fw, " Base Address:");
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, tcpa->server.base_addr.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, tcpa->server.base_addr.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, tcpa->server.base_addr.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, tcpa->server.base_addr.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, tcpa->server.base_addr.address);
- fwts_log_info_verbatum(fw, " Reserved: 0x%8.8" PRIx32, tcpa->server.reserved3);
- fwts_log_info_verbatum(fw, " Configuration Address:");
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, tcpa->server.config_addr.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, tcpa->server.config_addr.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, tcpa->server.config_addr.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, tcpa->server.config_addr.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, tcpa->server.config_addr.address);
- fwts_log_info_verbatum(fw, " PCI Segment Group: 0x%2.2" PRIx8, tcpa->server.pci_seg_number);
- fwts_log_info_verbatum(fw, " PCI Bus: 0x%2.2" PRIx8, tcpa->server.pci_bus_number);
- fwts_log_info_verbatum(fw, " PCI Device: 0x%2.2" PRIx8, tcpa->server.pci_dev_number);
- fwts_log_info_verbatum(fw, " PCI Function: 0x%2.2" PRIx8, tcpa->server.pci_func_number);
+ fwts_log_info_verbatim(fw, "TCPA Table:");
+ fwts_log_info_verbatim(fw, " Platform Class: 0x%4.4" PRIx16, tcpa->platform_class);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx16, tcpa->server.reserved);
+ fwts_log_info_verbatim(fw, " Log Area Minimum Length: 0x%16.16" PRIx64, tcpa->server.log_zone_length);
+ fwts_log_info_verbatim(fw, " Log Area Start Address: 0x%16.16" PRIx64, tcpa->server.log_zone_addr);
+ fwts_log_info_verbatim(fw, " Specification Revision: 0x%4.4" PRIx16, tcpa->server.spec_revision);
+ fwts_log_info_verbatim(fw, " Device Flags: 0x%2.2" PRIx16, tcpa->server.device_flag);
+ fwts_log_info_verbatim(fw, " Interrupt Flags: 0x%2.2" PRIx16, tcpa->server.interrupt_flag);
+ fwts_log_info_verbatim(fw, " GPE: 0x%2.2" PRIx16, tcpa->server.gpe);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%8.8" PRIx32, reserved2);
+ fwts_log_info_verbatim(fw, " Global System Interrupt: 0x%8.8" PRIx32, tcpa->server.global_sys_interrupt);
+ fwts_log_info_verbatim(fw, " Base Address:");
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, tcpa->server.base_addr.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, tcpa->server.base_addr.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, tcpa->server.base_addr.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, tcpa->server.base_addr.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, tcpa->server.base_addr.address);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%8.8" PRIx32, tcpa->server.reserved3);
+ fwts_log_info_verbatim(fw, " Configuration Address:");
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, tcpa->server.config_addr.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, tcpa->server.config_addr.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, tcpa->server.config_addr.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, tcpa->server.config_addr.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, tcpa->server.config_addr.address);
+ fwts_log_info_verbatim(fw, " PCI Segment Group: 0x%2.2" PRIx8, tcpa->server.pci_seg_number);
+ fwts_log_info_verbatim(fw, " PCI Bus: 0x%2.2" PRIx8, tcpa->server.pci_bus_number);
+ fwts_log_info_verbatim(fw, " PCI Device: 0x%2.2" PRIx8, tcpa->server.pci_dev_number);
+ fwts_log_info_verbatim(fw, " PCI Function: 0x%2.2" PRIx8, tcpa->server.pci_func_number);
if (tcpa->server.reserved != 0) {
passed = false;
diff --git a/src/acpi/tpm2/tpm2.c b/src/acpi/tpm2/tpm2.c
index babbc62..f4efd83 100644
--- a/src/acpi/tpm2/tpm2.c
+++ b/src/acpi/tpm2/tpm2.c
@@ -48,11 +48,11 @@ static int tpm2_test1(fwts_framework *fw)
fwts_acpi_table_tpm2 *tpm2 = (fwts_acpi_table_tpm2*) table->data;
bool passed = true;
- fwts_log_info_verbatum(fw, "TPM2 Table:");
- fwts_log_info_verbatum(fw, " Platform Class: 0x%4.4" PRIx16, tpm2->platform_class);
- fwts_log_info_verbatum(fw, " Reserved: 0x%4.4" PRIx32, tpm2->reserved);
- fwts_log_info_verbatum(fw, " Address of Control Area: 0x%16.16" PRIx64, tpm2->address_of_control_area);
- fwts_log_info_verbatum(fw, " Start Method: 0x%8.8" PRIx32, tpm2->start_method);
+ fwts_log_info_verbatim(fw, "TPM2 Table:");
+ fwts_log_info_verbatim(fw, " Platform Class: 0x%4.4" PRIx16, tpm2->platform_class);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%4.4" PRIx32, tpm2->reserved);
+ fwts_log_info_verbatim(fw, " Address of Control Area: 0x%16.16" PRIx64, tpm2->address_of_control_area);
+ fwts_log_info_verbatim(fw, " Start Method: 0x%8.8" PRIx32, tpm2->start_method);
if (tpm2->platform_class != 0 && tpm2->platform_class != 1) {
passed = false;
diff --git a/src/acpi/uefi/uefi.c b/src/acpi/uefi/uefi.c
index 287b072..cf1b046 100644
--- a/src/acpi/uefi/uefi.c
+++ b/src/acpi/uefi/uefi.c
@@ -75,9 +75,9 @@ static int uefi_test1(fwts_framework *fw)
fwts_guid_buf_to_str(uefi->uuid, guid, sizeof(guid));
- fwts_log_info_verbatum(fw, "UEFI ACPI Data Table:");
- fwts_log_info_verbatum(fw, " Identifier: %s", guid);
- fwts_log_info_verbatum(fw, " DataOffset: 0x%4.4" PRIx16, uefi->dataoffset);
+ fwts_log_info_verbatim(fw, "UEFI ACPI Data Table:");
+ fwts_log_info_verbatim(fw, " Identifier: %s", guid);
+ fwts_log_info_verbatim(fw, " DataOffset: 0x%4.4" PRIx16, uefi->dataoffset);
/* Sanity check the dataoffset */
if (uefi->dataoffset > table->length) {
@@ -103,16 +103,16 @@ static int uefi_test1(fwts_framework *fw)
, uefi_smmcomm->boot.dataoffset);
}
- fwts_log_info_verbatum(fw, " SW SMI Number: 0x%8.8" PRIx32, uefi_smmcomm->sw_smi_number);
- fwts_log_info_verbatum(fw, " Buffer Ptr Address: 0x%16.16" PRIx64, uefi_smmcomm->buf_ptr_addr);
+ fwts_log_info_verbatim(fw, " SW SMI Number: 0x%8.8" PRIx32, uefi_smmcomm->sw_smi_number);
+ fwts_log_info_verbatim(fw, " Buffer Ptr Address: 0x%16.16" PRIx64, uefi_smmcomm->buf_ptr_addr);
} else {
/* dump the remaining data */
- fwts_log_info_verbatum(fw, " Data:");
+ fwts_log_info_verbatim(fw, " Data:");
for (i = 0; i < (table->length - uefi->dataoffset) ; i += 16) {
int left = table->length - uefi->dataoffset -i;
char buffer[128];
fwts_dump_raw_data(buffer,sizeof(buffer), uefi->data + i, i, left > 16 ? 16 : left);
- fwts_log_info_verbatum(fw, "%s", buffer);
+ fwts_log_info_verbatim(fw, "%s", buffer);
}
}
diff --git a/src/acpi/waet/waet.c b/src/acpi/waet/waet.c
index 25a4bbc..37b898a 100644
--- a/src/acpi/waet/waet.c
+++ b/src/acpi/waet/waet.c
@@ -67,10 +67,10 @@ static int waet_test1(fwts_framework *fw)
goto done;
}
- fwts_log_info_verbatum(fw, "WAET Table:");
- fwts_log_info_verbatum(fw, " Emulated Device Flags: 0x%8.8" PRIx32, waet->flags);
- fwts_log_info_verbatum(fw, " Bit [0] RTC Good: %1" PRIu32, waet->flags & 1);
- fwts_log_info_verbatum(fw, " Bit [1] PM Timer Good: %1" PRIu32, (waet->flags >> 1) & 1);
+ fwts_log_info_verbatim(fw, "WAET Table:");
+ fwts_log_info_verbatim(fw, " Emulated Device Flags: 0x%8.8" PRIx32, waet->flags);
+ fwts_log_info_verbatim(fw, " Bit [0] RTC Good: %1" PRIu32, waet->flags & 1);
+ fwts_log_info_verbatim(fw, " Bit [1] PM Timer Good: %1" PRIu32, (waet->flags >> 1) & 1);
fwts_log_nl(fw);
if (waet->flags & ~3) {
diff --git a/src/acpi/wdat/wdat.c b/src/acpi/wdat/wdat.c
index f81c982..2b35fff 100644
--- a/src/acpi/wdat/wdat.c
+++ b/src/acpi/wdat/wdat.c
@@ -76,21 +76,21 @@ static int wdat_test1(fwts_framework *fw)
/* Now we have got some sane data, dump the WDAT */
#if ACPI_DUMP
- fwts_log_info_verbatum(fw, "WDAT Microsoft Watchdog Action Table:");
- fwts_log_info_verbatum(fw, " Watchdog Header Length: 0x%8.8" PRIx32, wdat->watchdog_header_length);
- fwts_log_info_verbatum(fw, " PCI Segment: 0x%4.4" PRIx16, wdat->pci_segment);
- fwts_log_info_verbatum(fw, " PCI Bus Number: 0x%2.2" PRIx8, wdat->pci_bus_number);
- fwts_log_info_verbatum(fw, " PCI Device Number: 0x%2.2" PRIx8, wdat->pci_device_number);
- fwts_log_info_verbatum(fw, " PCI Function Number: 0x%2.2" PRIx8, wdat->pci_function_number);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, "WDAT Microsoft Watchdog Action Table:");
+ fwts_log_info_verbatim(fw, " Watchdog Header Length: 0x%8.8" PRIx32, wdat->watchdog_header_length);
+ fwts_log_info_verbatim(fw, " PCI Segment: 0x%4.4" PRIx16, wdat->pci_segment);
+ fwts_log_info_verbatim(fw, " PCI Bus Number: 0x%2.2" PRIx8, wdat->pci_bus_number);
+ fwts_log_info_verbatim(fw, " PCI Device Number: 0x%2.2" PRIx8, wdat->pci_device_number);
+ fwts_log_info_verbatim(fw, " PCI Function Number: 0x%2.2" PRIx8, wdat->pci_function_number);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
wdat->reserved1[0], wdat->reserved1[1], wdat->reserved1[2]);
- fwts_log_info_verbatum(fw, " Timer Period: 0x%4.4" PRIx32, wdat->timer_period);
- fwts_log_info_verbatum(fw, " Maximum Count: 0x%4.4" PRIx32, wdat->maximum_count);
- fwts_log_info_verbatum(fw, " Minimum Count: 0x%4.4" PRIx32, wdat->minimum_count);
- fwts_log_info_verbatum(fw, " Watchdog Flags: 0x%4.4" PRIx32, wdat->watchdog_flags);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Timer Period: 0x%4.4" PRIx32, wdat->timer_period);
+ fwts_log_info_verbatim(fw, " Maximum Count: 0x%4.4" PRIx32, wdat->maximum_count);
+ fwts_log_info_verbatim(fw, " Minimum Count: 0x%4.4" PRIx32, wdat->minimum_count);
+ fwts_log_info_verbatim(fw, " Watchdog Flags: 0x%4.4" PRIx32, wdat->watchdog_flags);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8 " 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
wdat->reserved2[0], wdat->reserved2[1], wdat->reserved2[2]);
- fwts_log_info_verbatum(fw, " Watchdog Entries 0x%4.4" PRIx32, wdat->number_of_entries);
+ fwts_log_info_verbatim(fw, " Watchdog Entries 0x%4.4" PRIx32, wdat->number_of_entries);
#endif
if (wdat->reserved1[0] | wdat->reserved1[1] | wdat->reserved1[2] |
@@ -144,19 +144,19 @@ static int wdat_test1(fwts_framework *fw)
for (i = 0; i < wdat->number_of_entries; i++) {
const fwts_acpi_table_wdat_instr_entries *entry = &wdat->entries[i];
#if ACPI_DUMP
- fwts_log_info_verbatum(fw, "Watchdog Instruction Entry %" PRIu32, i + 1);
- fwts_log_info_verbatum(fw, " Watchdog Action: 0x%2.2" PRIx8, entry->watchdog_action);
- fwts_log_info_verbatum(fw, " Instruction Flags: 0x%2.2" PRIx8, entry->instruction_flags);
- fwts_log_info_verbatum(fw, " Reserved: 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, "Watchdog Instruction Entry %" PRIu32, i + 1);
+ fwts_log_info_verbatim(fw, " Watchdog Action: 0x%2.2" PRIx8, entry->watchdog_action);
+ fwts_log_info_verbatim(fw, " Instruction Flags: 0x%2.2" PRIx8, entry->instruction_flags);
+ fwts_log_info_verbatim(fw, " Reserved: 0x%2.2" PRIx8 " 0x%2.2" PRIx8,
entry->reserved[0], entry->reserved[1]);
- fwts_log_info_verbatum(fw, " Address Space ID: 0x%2.2" PRIx8, entry->register_region.address_space_id);
- fwts_log_info_verbatum(fw, " Register Bit Width 0x%2.2" PRIx8, entry->register_region.register_bit_width);
- fwts_log_info_verbatum(fw, " Register Bit Offset 0x%2.2" PRIx8, entry->register_region.register_bit_offset);
- fwts_log_info_verbatum(fw, " Access Size 0x%2.2" PRIx8, entry->register_region.access_width);
- fwts_log_info_verbatum(fw, " Address 0x%16.16" PRIx64, entry->register_region.address);
- fwts_log_info_verbatum(fw, " Value: 0x%8.8" PRIx32, entry->value);
- fwts_log_info_verbatum(fw, " Mask: 0x%8.8" PRIx32, entry->mask);
+ fwts_log_info_verbatim(fw, " Address Space ID: 0x%2.2" PRIx8, entry->register_region.address_space_id);
+ fwts_log_info_verbatim(fw, " Register Bit Width 0x%2.2" PRIx8, entry->register_region.register_bit_width);
+ fwts_log_info_verbatim(fw, " Register Bit Offset 0x%2.2" PRIx8, entry->register_region.register_bit_offset);
+ fwts_log_info_verbatim(fw, " Access Size 0x%2.2" PRIx8, entry->register_region.access_width);
+ fwts_log_info_verbatim(fw, " Address 0x%16.16" PRIx64, entry->register_region.address);
+ fwts_log_info_verbatim(fw, " Value: 0x%8.8" PRIx32, entry->value);
+ fwts_log_info_verbatim(fw, " Mask: 0x%8.8" PRIx32, entry->mask);
#endif
switch (entry->watchdog_action) {
diff --git a/src/acpi/wmi/wmi.c b/src/acpi/wmi/wmi.c
index 5018023..64fc757 100644
--- a/src/acpi/wmi/wmi.c
+++ b/src/acpi/wmi/wmi.c
@@ -260,11 +260,11 @@ static void wmi_no_known_driver(
*/
static void wmi_dump_object(fwts_framework *fw, const fwts_wdg_info *info)
{
- fwts_log_info_verbatum(fw, " Flags : 0x%2.2" PRIx8 " (%s)",
+ fwts_log_info_verbatim(fw, " Flags : 0x%2.2" PRIx8 " (%s)",
info->flags, wmi_wdg_flags_to_text(info->flags));
- fwts_log_info_verbatum(fw, " Object ID : %c%c",
+ fwts_log_info_verbatim(fw, " Object ID : %c%c",
info->id.obj_id[0], info->id.obj_id[1]);
- fwts_log_info_verbatum(fw, " Instance : 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Instance : 0x%2.2" PRIx8,
info->instance);
}
@@ -278,7 +278,7 @@ static void wmi_known_driver(
{
/* If we recognise the GUID then we may as well report this info */
if (known) {
- fwts_log_info_verbatum(fw, " Driver : %s (%s)",
+ fwts_log_info_verbatim(fw, " Driver : %s (%s)",
known->driver, known->vendor);
}
}
@@ -305,26 +305,26 @@ static void wmi_parse_wdg_data(
fwts_guid_buf_to_str(guid, guid_str, sizeof(guid_str));
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "%s (%zd of %zd)",
+ fwts_log_info_verbatim(fw, "%s (%zd of %zd)",
name, i + 1, size / sizeof(fwts_wdg_info));
- fwts_log_info_verbatum(fw, " GUID: %s", guid_str);
+ fwts_log_info_verbatim(fw, " GUID: %s", guid_str);
known = wmi_find_guid(guid_str);
if (info->flags & FWTS_WMI_METHOD) {
- fwts_log_info_verbatum(fw, " WMI Method:");
+ fwts_log_info_verbatim(fw, " WMI Method:");
wmi_dump_object(fw, info);
wmi_known_driver(fw, known);
wmi_method_exist_count(fw, info, guid_str);
} else if (info->flags & FWTS_WMI_EVENT) {
events = true;
- fwts_log_info_verbatum(fw, " WMI Event:");
- fwts_log_info_verbatum(fw, " Flags : 0x%2.2" PRIx8 " (%s)",
+ fwts_log_info_verbatim(fw, " WMI Event:");
+ fwts_log_info_verbatim(fw, " Flags : 0x%2.2" PRIx8 " (%s)",
info->flags, wmi_wdg_flags_to_text(info->flags));
- fwts_log_info_verbatum(fw, " Notification ID: 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Notification ID: 0x%2.2" PRIx8,
info->id.notify.notify_id);
- fwts_log_info_verbatum(fw, " Reserved : 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Reserved : 0x%2.2" PRIx8,
info->id.notify.reserved);
- fwts_log_info_verbatum(fw, " Instance : 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Instance : 0x%2.2" PRIx8,
info->instance);
wmi_known_driver(fw, known);
@@ -334,7 +334,7 @@ static void wmi_parse_wdg_data(
all_events_known = false;
}
} else {
- fwts_log_info_verbatum(fw, " WMI Object:");
+ fwts_log_info_verbatim(fw, " WMI Object:");
wmi_dump_object(fw, info);
wmi_known_driver(fw, known);
}
diff --git a/src/acpi/xenv/xenv.c b/src/acpi/xenv/xenv.c
index 7358cbc..0dec075 100644
--- a/src/acpi/xenv/xenv.c
+++ b/src/acpi/xenv/xenv.c
@@ -65,11 +65,11 @@ static int xenv_test1(fwts_framework *fw)
xenv->header.revision);
}
- fwts_log_info_verbatum(fw, "XENV Table:");
- fwts_log_info_verbatum(fw, " GNT Start Address: 0x%16.16" PRIx64, xenv->gnt_start);
- fwts_log_info_verbatum(fw, " GNT Size: 0x%16.16" PRIx64, xenv->gnt_size);
- fwts_log_info_verbatum(fw, " Evtchn Intr: 0x%8.8" PRIx32, xenv->evtchn_intr);
- fwts_log_info_verbatum(fw, " Evtchn Intr Flags: 0x%2.2" PRIx8, xenv->evtchn_intr_flags);
+ fwts_log_info_verbatim(fw, "XENV Table:");
+ fwts_log_info_verbatim(fw, " GNT Start Address: 0x%16.16" PRIx64, xenv->gnt_start);
+ fwts_log_info_verbatim(fw, " GNT Size: 0x%16.16" PRIx64, xenv->gnt_size);
+ fwts_log_info_verbatim(fw, " Evtchn Intr: 0x%8.8" PRIx32, xenv->evtchn_intr);
+ fwts_log_info_verbatim(fw, " Evtchn Intr Flags: 0x%2.2" PRIx8, xenv->evtchn_intr_flags);
if (xenv->evtchn_intr_flags & ~3) {
passed = false;
diff --git a/src/bios/bios32/bios32.c b/src/bios/bios32/bios32.c
index 89cce86..429bad7 100644
--- a/src/bios/bios32/bios32.c
+++ b/src/bios/bios32/bios32.c
@@ -75,15 +75,15 @@ static int bios32_test1(fwts_framework *fw)
fwts_log_info(fw,
"Found BIOS32 Service Directory at 0x%8.8x",
BIOS32_SD_REGION_START+i);
- fwts_log_info_verbatum(fw, " Signature : %4.4s",
+ fwts_log_info_verbatim(fw, " Signature : %4.4s",
bios32->signature);
- fwts_log_info_verbatum(fw, " Entry Point: 0x%8.8" PRIx32,
+ fwts_log_info_verbatim(fw, " Entry Point: 0x%8.8" PRIx32,
bios32->entry_point);
- fwts_log_info_verbatum(fw, " Revsion : 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Revsion : 0x%2.2" PRIx8,
bios32->revision_level);
- fwts_log_info_verbatum(fw, " Length : 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Length : 0x%2.2" PRIx8,
bios32->length);
- fwts_log_info_verbatum(fw, " Checksum : 0x%2.2" PRIx8,
+ fwts_log_info_verbatim(fw, " Checksum : 0x%2.2" PRIx8,
bios32->checksum);
fwts_log_nl(fw);
diff --git a/src/bios/bios_info/bios_info.c b/src/bios/bios_info/bios_info.c
index 6abf346..cc6480e 100644
--- a/src/bios/bios_info/bios_info.c
+++ b/src/bios/bios_info/bios_info.c
@@ -61,7 +61,7 @@ static int bios_info_test1(fwts_framework *fw)
bios_info[i].dmi_field);
if ((data = fwts_get(path)) != NULL) {
fwts_chop_newline(data);
- fwts_log_info_verbatum(fw, "%-18.18s: %s",
+ fwts_log_info_verbatim(fw, "%-18.18s: %s",
bios_info[i].label, data);
free(data);
}
diff --git a/src/bios/ebdadump/ebdadump.c b/src/bios/ebdadump/ebdadump.c
index 6e17a55..fbabfd8 100644
--- a/src/bios/ebdadump/ebdadump.c
+++ b/src/bios/ebdadump/ebdadump.c
@@ -33,7 +33,7 @@ static void ebdadump_data(fwts_framework *fw,
for (i=0; i<length; i+=16) {
fwts_dump_raw_data(buffer, sizeof buffer, data+i, offset+i, 16);
- fwts_log_info_verbatum(fw, "%s", buffer);
+ fwts_log_info_verbatim(fw, "%s", buffer);
}
}
diff --git a/src/bios/hdaaudio/hdaaudio.c b/src/bios/hdaaudio/hdaaudio.c
index 4fab5ab..8aa5ce9 100644
--- a/src/bios/hdaaudio/hdaaudio.c
+++ b/src/bios/hdaaudio/hdaaudio.c
@@ -66,12 +66,12 @@ static void hda_audio_dump_pins(fwts_framework *fw, const char *config,
fwts_log_info(fw, "%s:", config);
- fwts_log_info_verbatum(fw, " Pin Setting");
+ fwts_log_info_verbatim(fw, " Pin Setting");
fwts_list_foreach(item, settings) {
hda_audio_pin_setting *pin_setting =
fwts_list_data(hda_audio_pin_setting *, item);
- fwts_log_info_verbatum(fw, " 0x%4.4hx 0x%8.8x",
+ fwts_log_info_verbatim(fw, " 0x%4.4hx 0x%8.8x",
pin_setting->pin, pin_setting->setting);
}
} else
@@ -89,7 +89,7 @@ static void hda_audio_dev_info(fwts_framework *fw, const char *label,
if ((info = fwts_get(fullpath)) != NULL) {
fwts_chop_newline(info);
if (*info)
- fwts_log_info_verbatum(fw, "%-15.15s: %s", label, info);
+ fwts_log_info_verbatim(fw, "%-15.15s: %s", label, info);
free(info);
}
}
diff --git a/src/bios/mtrr/mtrr.c b/src/bios/mtrr/mtrr.c
index 120b943..3682ea1 100644
--- a/src/bios/mtrr/mtrr.c
+++ b/src/bios/mtrr/mtrr.c
@@ -422,16 +422,16 @@ static void do_mtrr_resource(fwts_framework *fw)
{
fwts_list_link *item;
- fwts_log_info_verbatum(fw,"MTRR overview");
- fwts_log_info_verbatum(fw,"-------------");
+ fwts_log_info_verbatim(fw,"MTRR overview");
+ fwts_log_info_verbatim(fw,"-------------");
fwts_list_foreach(item, mtrr_list) {
struct mtrr_entry *entry = fwts_list_data(struct mtrr_entry *, item);
if (entry->type & DISABLED)
- fwts_log_info_verbatum(fw, "Reg %hhu: disabled", entry->reg);
+ fwts_log_info_verbatim(fw, "Reg %hhu: disabled", entry->reg);
else
- fwts_log_info_verbatum(fw,
+ fwts_log_info_verbatim(fw,
"Reg %hhu: 0x%16.16" PRIx64 " - 0x%16.16" PRIx64 " (%6" PRId64 " %cB) %s",
entry->reg,
entry->start,
diff --git a/src/bios/multiproc/mpdump.c b/src/bios/multiproc/mpdump.c
index dd5d95a..605e49c 100644
--- a/src/bios/multiproc/mpdump.c
+++ b/src/bios/multiproc/mpdump.c
@@ -68,15 +68,15 @@ static const char *mpdump_yes_no[] = {
static void mpdump_dump_header(fwts_framework *fw, fwts_mp_config_table_header *header, uint32_t phys_addr)
{
- fwts_log_info_verbatum(fw,"MultiProcessor Header: (@0x%8.8x)", phys_addr);
- fwts_log_info_verbatum(fw," Signature: %4.4s\n", header->signature);
- fwts_log_info_verbatum(fw," Table Length: 0x%x bytes\n", header->base_table_length);
- fwts_log_info_verbatum(fw," Spec Revision: %d (1.%d)\n", header->spec_rev, header->spec_rev);
- fwts_log_info_verbatum(fw," OEM ID: %8.8s\n", header->oem_id);
- fwts_log_info_verbatum(fw," Product ID: %12.12s\n", header->product_id);
- fwts_log_info_verbatum(fw," Entry Count: 0x%x\n", header->entry_count);
- fwts_log_info_verbatum(fw," LAPIC Address: 0x%8.8x\n", header->lapic_address);
- fwts_log_info_verbatum(fw," Extended Length: 0x%x bytes\n", header->extended_table_length);
+ fwts_log_info_verbatim(fw,"MultiProcessor Header: (@0x%8.8x)", phys_addr);
+ fwts_log_info_verbatim(fw," Signature: %4.4s\n", header->signature);
+ fwts_log_info_verbatim(fw," Table Length: 0x%x bytes\n", header->base_table_length);
+ fwts_log_info_verbatim(fw," Spec Revision: %d (1.%d)\n", header->spec_rev, header->spec_rev);
+ fwts_log_info_verbatim(fw," OEM ID: %8.8s\n", header->oem_id);
+ fwts_log_info_verbatim(fw," Product ID: %12.12s\n", header->product_id);
+ fwts_log_info_verbatim(fw," Entry Count: 0x%x\n", header->entry_count);
+ fwts_log_info_verbatim(fw," LAPIC Address: 0x%8.8x\n", header->lapic_address);
+ fwts_log_info_verbatim(fw," Extended Length: 0x%x bytes\n", header->extended_table_length);
fwts_log_nl(fw);
}
@@ -84,31 +84,31 @@ static void mpdump_dump_cpu_entry(fwts_framework *fw, void *data, uint32_t phys_
{
fwts_mp_processor_entry *cpu_entry = (fwts_mp_processor_entry *)data;
- fwts_log_info_verbatum(fw, "CPU Entry: (@0x%8.8x)", phys_addr);
- fwts_log_info_verbatum(fw, " Local APIC ID: 0x%2.2x", cpu_entry->local_apic_id);
- fwts_log_info_verbatum(fw, " Local APIC Version: 0x%2.2x", cpu_entry->local_apic_version);
- fwts_log_info_verbatum(fw, " CPU Flags: 0x%2.2x", cpu_entry->cpu_flags);
- fwts_log_info_verbatum(fw, " Usable: %1.1d (%s)",
- cpu_entry->cpu_flags & 1,
+ fwts_log_info_verbatim(fw, "CPU Entry: (@0x%8.8x)", phys_addr);
+ fwts_log_info_verbatim(fw, " Local APIC ID: 0x%2.2x", cpu_entry->local_apic_id);
+ fwts_log_info_verbatim(fw, " Local APIC Version: 0x%2.2x", cpu_entry->local_apic_version);
+ fwts_log_info_verbatim(fw, " CPU Flags: 0x%2.2x", cpu_entry->cpu_flags);
+ fwts_log_info_verbatim(fw, " Usable: %1.1d (%s)",
+ cpu_entry->cpu_flags & 1,
mpdump_yes_no[cpu_entry->cpu_flags & 1]);
- fwts_log_info_verbatum(fw, " Bootstrap CPU: %1.1d (%s)",
+ fwts_log_info_verbatim(fw, " Bootstrap CPU: %1.1d (%s)",
(cpu_entry->cpu_flags >> 1) & 1,
mpdump_yes_no[(cpu_entry->cpu_flags >> 1) & 1]);
- fwts_log_info_verbatum(fw, " CPU Signature:");
- fwts_log_info_verbatum(fw, " Stepping: 0x%2.2x", cpu_entry->cpu_signature & 0xf);
- fwts_log_info_verbatum(fw, " Model: 0x%2.2x", (cpu_entry->cpu_signature >> 4) & 0xf);
- fwts_log_info_verbatum(fw, " Family: 0x%2.2x", (cpu_entry->cpu_signature >> 8) & 0xf);
- fwts_log_info_verbatum(fw, " Feature Flags:");
- fwts_log_info_verbatum(fw, " FPU present: %1.1d (%s)",
+ fwts_log_info_verbatim(fw, " CPU Signature:");
+ fwts_log_info_verbatim(fw, " Stepping: 0x%2.2x", cpu_entry->cpu_signature & 0xf);
+ fwts_log_info_verbatim(fw, " Model: 0x%2.2x", (cpu_entry->cpu_signature >> 4) & 0xf);
+ fwts_log_info_verbatim(fw, " Family: 0x%2.2x", (cpu_entry->cpu_signature >> 8) & 0xf);
+ fwts_log_info_verbatim(fw, " Feature Flags:");
+ fwts_log_info_verbatim(fw, " FPU present: %1.1d (%s)",
(cpu_entry->feature_flags) & 1,
mpdump_yes_no[(cpu_entry->feature_flags) & 1]);
- fwts_log_info_verbatum(fw, " MCE: %1.1d (%s)",
+ fwts_log_info_verbatim(fw, " MCE: %1.1d (%s)",
(cpu_entry->feature_flags >> 7) & 1,
mpdump_yes_no[(cpu_entry->feature_flags >> 7) & 1]);
- fwts_log_info_verbatum(fw, " CPMPXCHG8B: %1.1d (%s)",
+ fwts_log_info_verbatim(fw, " CPMPXCHG8B: %1.1d (%s)",
(cpu_entry->feature_flags >> 8) & 1,
mpdump_yes_no[(cpu_entry->feature_flags >> 8) & 1]);
- fwts_log_info_verbatum(fw, " APIC enabled: %1.1d (%s)",
+ fwts_log_info_verbatim(fw, " APIC enabled: %1.1d (%s)",
(cpu_entry->feature_flags >> 9) & 1,
mpdump_yes_no[(cpu_entry->feature_flags >> 9) & 1]);
fwts_log_nl(fw);
@@ -118,9 +118,9 @@ static void mpdump_dump_bus_entry(fwts_framework *fw, void *data, uint32_t phys_
{
fwts_mp_bus_entry *bus_entry = (fwts_mp_bus_entry *)data;
- fwts_log_info_verbatum(fw, "Bus Entry: (@0x%8.8x)", phys_addr);
- fwts_log_info_verbatum(fw, " Bus ID: 0x%2.2x", bus_entry->bus_id);
- fwts_log_info_verbatum(fw, " Bus Type: %6.6s", bus_entry->bus_type);
+ fwts_log_info_verbatim(fw, "Bus Entry: (@0x%8.8x)", phys_addr);
+ fwts_log_info_verbatim(fw, " Bus ID: 0x%2.2x", bus_entry->bus_id);
+ fwts_log_info_verbatim(fw, " Bus Type: %6.6s", bus_entry->bus_type);
fwts_log_nl(fw);
}
@@ -128,11 +128,11 @@ static void mpdump_dump_io_apic_entry(fwts_framework *fw, void *data, uint32_t p
{
fwts_mp_io_apic_entry *io_apic_entry = (fwts_mp_io_apic_entry *)data;
- fwts_log_info_verbatum(fw, "IO APIC Entry: (@0x%8.8x)", phys_addr);
- fwts_log_info_verbatum(fw, " IO APIC ID: 0x%2.2x", io_apic_entry->id);
- fwts_log_info_verbatum(fw, " IO APIC Version: 0x%2.2x", io_apic_entry->version);
- fwts_log_info_verbatum(fw, " Flags: 0x%2.2x", io_apic_entry->flags);
- fwts_log_info_verbatum(fw, " Address: 0x%8.8x", io_apic_entry->address);
+ fwts_log_info_verbatim(fw, "IO APIC Entry: (@0x%8.8x)", phys_addr);
+ fwts_log_info_verbatim(fw, " IO APIC ID: 0x%2.2x", io_apic_entry->id);
+ fwts_log_info_verbatim(fw, " IO APIC Version: 0x%2.2x", io_apic_entry->version);
+ fwts_log_info_verbatim(fw, " Flags: 0x%2.2x", io_apic_entry->flags);
+ fwts_log_info_verbatim(fw, " Address: 0x%8.8x", io_apic_entry->address);
fwts_log_nl(fw);
}
@@ -140,18 +140,18 @@ static void mpdump_dump_io_interrupt_entry(fwts_framework *fw, void *data, uint3
{
fwts_mp_io_interrupt_entry *io_interrupt_entry = (fwts_mp_io_interrupt_entry *)data;
- fwts_log_info_verbatum(fw, "IO Interrupt Assignment Entry: (@0x%8.8x)", phys_addr);
- fwts_log_info_verbatum(fw, " Interrupt Type: 0x%2.2x (%s)", io_interrupt_entry->type,
+ fwts_log_info_verbatim(fw, "IO Interrupt Assignment Entry: (@0x%8.8x)", phys_addr);
+ fwts_log_info_verbatim(fw, " Interrupt Type: 0x%2.2x (%s)", io_interrupt_entry->type,
io_interrupt_entry->type < 4 ? mpdump_inttype[io_interrupt_entry->type] : "Unknown");
- fwts_log_info_verbatum(fw, " Flags: 0x%4.4x", io_interrupt_entry->flags);
- fwts_log_info_verbatum(fw, " PO (Polarity) %1.1d (%s)", io_interrupt_entry->flags & 2,
+ fwts_log_info_verbatim(fw, " Flags: 0x%4.4x", io_interrupt_entry->flags);
+ fwts_log_info_verbatim(fw, " PO (Polarity) %1.1d (%s)", io_interrupt_entry->flags & 2,
mpdump_po[io_interrupt_entry->flags & 2]);
- fwts_log_info_verbatum(fw, " EL (Trigger) %1.1d (%s)", (io_interrupt_entry->flags >> 2) & 2,
+ fwts_log_info_verbatim(fw, " EL (Trigger) %1.1d (%s)", (io_interrupt_entry->flags >> 2) & 2,
mpdump_el[(io_interrupt_entry->flags >> 2) & 2]);
- fwts_log_info_verbatum(fw, " Src Bus ID: 0x%2.2x", io_interrupt_entry->source_bus_id);
- fwts_log_info_verbatum(fw, " Src Bus IRQ 0x%2.2x", io_interrupt_entry->source_bus_irq);
- fwts_log_info_verbatum(fw, " Dst I/O APIC: 0x%2.2x", io_interrupt_entry->destination_io_apic_id);
- fwts_log_info_verbatum(fw, " Dst I/O APIC INTIN: 0x%2.2x", io_interrupt_entry->destination_io_apic_intin);
+ fwts_log_info_verbatim(fw, " Src Bus ID: 0x%2.2x", io_interrupt_entry->source_bus_id);
+ fwts_log_info_verbatim(fw, " Src Bus IRQ 0x%2.2x", io_interrupt_entry->source_bus_irq);
+ fwts_log_info_verbatim(fw, " Dst I/O APIC: 0x%2.2x", io_interrupt_entry->destination_io_apic_id);
+ fwts_log_info_verbatim(fw, " Dst I/O APIC INTIN: 0x%2.2x", io_interrupt_entry->destination_io_apic_intin);
fwts_log_nl(fw);
}
@@ -159,18 +159,18 @@ static void mpdump_dump_local_interrupt_entry(fwts_framework *fw, void *data, ui
{
fwts_mp_local_interrupt_entry *local_interrupt_entry = (fwts_mp_local_interrupt_entry *)data;
- fwts_log_info_verbatum(fw, "Local Interrupt Assignement Entry: (@0x%8.8x)", phys_addr);
- fwts_log_info_verbatum(fw, " Interrupt Type: 0x%2.2x (%s)", local_interrupt_entry->type,
+ fwts_log_info_verbatim(fw, "Local Interrupt Assignement Entry: (@0x%8.8x)", phys_addr);
+ fwts_log_info_verbatim(fw, " Interrupt Type: 0x%2.2x (%s)", local_interrupt_entry->type,
local_interrupt_entry->type < 4 ? mpdump_inttype[local_interrupt_entry->type] : "Unknown");
- fwts_log_info_verbatum(fw, " Flags: 0x%4.4x", local_interrupt_entry->flags);
- fwts_log_info_verbatum(fw, " PO (Polarity) %1.1d (%s)", local_interrupt_entry->flags & 2,
+ fwts_log_info_verbatim(fw, " Flags: 0x%4.4x", local_interrupt_entry->flags);
+ fwts_log_info_verbatim(fw, " PO (Polarity) %1.1d (%s)", local_interrupt_entry->flags & 2,
mpdump_po[local_interrupt_entry->flags & 2]);
- fwts_log_info_verbatum(fw, " EL (Trigger) %1.1d (%s)", (local_interrupt_entry->flags >> 2) & 2,
+ fwts_log_info_verbatim(fw, " EL (Trigger) %1.1d (%s)", (local_interrupt_entry->flags >> 2) & 2,
mpdump_el[(local_interrupt_entry->flags >> 2) & 2]);
- fwts_log_info_verbatum(fw, " Src Bus ID: 0x%2.2x", local_interrupt_entry->source_bus_id);
- fwts_log_info_verbatum(fw, " Src Bus IRQ 0x%2.2x", local_interrupt_entry->source_bus_irq);
- fwts_log_info_verbatum(fw, " Dst I/O APIC: 0x%2.2x", local_interrupt_entry->destination_local_apic_id);
- fwts_log_info_verbatum(fw, " Dst I/O APIC INTIN: 0x%2.2x", local_interrupt_entry->destination_local_apic_intin);
+ fwts_log_info_verbatim(fw, " Src Bus ID: 0x%2.2x", local_interrupt_entry->source_bus_id);
+ fwts_log_info_verbatim(fw, " Src Bus IRQ 0x%2.2x", local_interrupt_entry->source_bus_irq);
+ fwts_log_info_verbatim(fw, " Dst I/O APIC: 0x%2.2x", local_interrupt_entry->destination_local_apic_id);
+ fwts_log_info_verbatim(fw, " Dst I/O APIC INTIN: 0x%2.2x", local_interrupt_entry->destination_local_apic_intin);
fwts_log_nl(fw);
}
@@ -178,15 +178,15 @@ static void mpdump_dump_sys_addr_entry(fwts_framework *fw, void *data, uint32_t
{
fwts_mp_system_address_space_entry *sys_addr_entry = (fwts_mp_system_address_space_entry *)data;
- fwts_log_info_verbatum(fw, "System Address Space Mapping Entry: (@0x%8.8x)", phys_addr);
- fwts_log_info_verbatum(fw, " Bus ID: 0x%2.2x", sys_addr_entry->bus_id);
- fwts_log_info_verbatum(fw, " Address Type: 0x%2.2x (%s)", sys_addr_entry->address_type,
+ fwts_log_info_verbatim(fw, "System Address Space Mapping Entry: (@0x%8.8x)", phys_addr);
+ fwts_log_info_verbatim(fw, " Bus ID: 0x%2.2x", sys_addr_entry->bus_id);
+ fwts_log_info_verbatim(fw, " Address Type: 0x%2.2x (%s)", sys_addr_entry->address_type,
sys_addr_entry->address_type < 3 ? mpdump_sys_addr_type[sys_addr_entry->address_type] : "Unknown");
- fwts_log_info_verbatum(fw, " Address Start: 0x%16.16llx",
+ fwts_log_info_verbatim(fw, " Address Start: 0x%16.16llx",
(unsigned long long)sys_addr_entry->address_base);
- fwts_log_info_verbatum(fw, " Address End: 0x%16.16llx",
+ fwts_log_info_verbatim(fw, " Address End: 0x%16.16llx",
(unsigned long long)sys_addr_entry->address_base + sys_addr_entry->address_length);
- fwts_log_info_verbatum(fw, " Address Length 0x%16.16llx",
+ fwts_log_info_verbatim(fw, " Address Length 0x%16.16llx",
(unsigned long long)sys_addr_entry->address_length);
fwts_log_nl(fw);
}
@@ -195,10 +195,10 @@ static void mpdump_dump_bus_hierarchy_entry(fwts_framework *fw, void *data, uint
{
fwts_mp_bus_hierarchy_entry *bus_hierarchy_entry = (fwts_mp_bus_hierarchy_entry*)data;
- fwts_log_info_verbatum(fw, "Bus Hierarchy Descriptor Entry: (@0x%8.8x)", phys_addr);
- fwts_log_info_verbatum(fw, " Bus ID: 0x%2.2x", bus_hierarchy_entry->bus_id);
- fwts_log_info_verbatum(fw, " Bus Information: 0x%1.1x", bus_hierarchy_entry->bus_info & 0xf);
- fwts_log_info_verbatum(fw, " Parent Bus: 0x%8.8x", bus_hierarchy_entry->parent_bus);
+ fwts_log_info_verbatim(fw, "Bus Hierarchy Descriptor Entry: (@0x%8.8x)", phys_addr);
+ fwts_log_info_verbatim(fw, " Bus ID: 0x%2.2x", bus_hierarchy_entry->bus_id);
+ fwts_log_info_verbatim(fw, " Bus Information: 0x%1.1x", bus_hierarchy_entry->bus_info & 0xf);
+ fwts_log_info_verbatim(fw, " Parent Bus: 0x%8.8x", bus_hierarchy_entry->parent_bus);
fwts_log_nl(fw);
}
@@ -206,17 +206,17 @@ static void multproc_dump_compat_bus_address_space_entry(fwts_framework *fw, voi
{
fwts_mp_compat_bus_address_space_entry *compat_bus_entry = (fwts_mp_compat_bus_address_space_entry*)data;
- fwts_log_info_verbatum(fw, "Compatible Bus Hierarchy Descriptor Entry: (@0x%8.8x)", phys_addr);
- fwts_log_info_verbatum(fw, " Bus ID: 0x%2.2x", compat_bus_entry->bus_id);
- fwts_log_info_verbatum(fw, " Address Mod: 0x%2.2x", compat_bus_entry->address_mod);
- fwts_log_info_verbatum(fw, " Predefine Range: 0x%8.8x", compat_bus_entry->range_list);
+ fwts_log_info_verbatim(fw, "Compatible Bus Hierarchy Descriptor Entry: (@0x%8.8x)", phys_addr);
+ fwts_log_info_verbatim(fw, " Bus ID: 0x%2.2x", compat_bus_entry->bus_id);
+ fwts_log_info_verbatim(fw, " Address Mod: 0x%2.2x", compat_bus_entry->address_mod);
+ fwts_log_info_verbatim(fw, " Predefine Range: 0x%8.8x", compat_bus_entry->range_list);
fwts_log_nl(fw);
}
static fwts_mp_data mp_data;
static int mpdump_init(fwts_framework *fw)
-{
+{
if (fwts_mp_data_get(&mp_data) != FWTS_OK) {
fwts_log_error(fw, "Failed to get _MP_ data from firmware.");
return FWTS_SKIP;
@@ -245,18 +245,18 @@ static void mpdump_dump_bus(fwts_framework *fw)
fwts_list sorted;
fwts_list_init(&sorted);
-
+
fwts_list_foreach(entry, &mp_data.entries) {
uint8_t *data = fwts_list_data(uint8_t *, entry);
if (*data == FWTS_MP_BUS_ENTRY)
fwts_list_add_ordered(&sorted, data, mpdump_compare_bus);
}
- fwts_log_info_verbatum(fw, "Bus:");
- fwts_log_info_verbatum(fw, " ID Type");
+ fwts_log_info_verbatim(fw, "Bus:");
+ fwts_log_info_verbatim(fw, " ID Type");
fwts_list_foreach(entry, &sorted) {
fwts_mp_bus_entry *bus_entry = fwts_list_data(fwts_mp_bus_entry *, entry);
- fwts_log_info_verbatum(fw, " %3d %6.6s",
+ fwts_log_info_verbatim(fw, " %3d %6.6s",
bus_entry->bus_id, bus_entry->bus_type);
}
fwts_log_nl(fw);
@@ -268,7 +268,7 @@ static int mpdump_compare_io_irq(void *data1, void *data2)
fwts_mp_io_interrupt_entry *entry1 = (fwts_mp_io_interrupt_entry*)data1;
fwts_mp_io_interrupt_entry *entry2 = (fwts_mp_io_interrupt_entry*)data2;
- return (entry1->source_bus_irq + (entry1->source_bus_id * 256)) -
+ return (entry1->source_bus_irq + (entry1->source_bus_id * 256)) -
(entry2->source_bus_irq + (entry2->source_bus_id * 256));
}
@@ -310,7 +310,7 @@ static char *mpdump_dst_io_apic(uint8_t apic)
static uint8_t mpdump_get_apic_id(void *data)
{
uint8_t *which = (uint8_t*)data;
-
+
if (*which == FWTS_MP_CPU_ENTRY) {
fwts_mp_processor_entry *cpu_entry = (fwts_mp_processor_entry *)data;
return cpu_entry->local_apic_id;
@@ -336,19 +336,19 @@ static void mpdump_dump_apics(fwts_framework *fw)
fwts_list sorted;
fwts_list_init(&sorted);
-
+
fwts_list_foreach(entry, &mp_data.entries) {
uint8_t *data = fwts_list_data(uint8_t *, entry);
if ((*data == FWTS_MP_CPU_ENTRY) || (*data == FWTS_MP_IO_APIC_ENTRY))
fwts_list_add_ordered(&sorted, data, mpdump_compare_apic_id);
}
-
- fwts_log_info_verbatum(fw, "APIC IDs:");
- fwts_log_info_verbatum(fw, " ID Type");
+
+ fwts_log_info_verbatim(fw, "APIC IDs:");
+ fwts_log_info_verbatim(fw, " ID Type");
fwts_list_foreach(entry, &sorted) {
uint8_t *data = fwts_list_data(uint8_t *, entry);
- fwts_log_info_verbatum(fw, " %3d %s APIC",
+ fwts_log_info_verbatim(fw, " %3d %s APIC",
mpdump_get_apic_id(data),
(*data == FWTS_MP_CPU_ENTRY) ? "CPU Local" : "I/O");
}
@@ -368,16 +368,16 @@ static void mpdump_dump_irq_table(fwts_framework *fw)
fwts_list_add_ordered(&sorted, data, mpdump_compare_io_irq);
}
- fwts_log_info_verbatum(fw, "IO Interrupts:");
- fwts_log_info_verbatum(fw, " Src Bus Src Bus Src Bus Dst I/O Dst I/O Type Polarity Trigger");
- fwts_log_info_verbatum(fw, " ID Type IRQ APIC APIC INTIN");
+ fwts_log_info_verbatim(fw, "IO Interrupts:");
+ fwts_log_info_verbatim(fw, " Src Bus Src Bus Src Bus Dst I/O Dst I/O Type Polarity Trigger");
+ fwts_log_info_verbatim(fw, " ID Type IRQ APIC APIC INTIN");
fwts_list_foreach(entry, &sorted) {
- fwts_mp_io_interrupt_entry *io_interrupt_entry =
+ fwts_mp_io_interrupt_entry *io_interrupt_entry =
fwts_list_data(fwts_mp_io_interrupt_entry *, entry);
- fwts_log_info_verbatum(fw, " %3d %-6.6s %3d %3.3s %3d %-6.6s %-7.7s %-7.7s",
+ fwts_log_info_verbatim(fw, " %3d %-6.6s %3d %3.3s %3d %-6.6s %-7.7s %-7.7s",
io_interrupt_entry->source_bus_id,
mpdump_find_bus_name(io_interrupt_entry->source_bus_id),
- io_interrupt_entry->source_bus_irq,
+ io_interrupt_entry->source_bus_irq,
mpdump_dst_io_apic(io_interrupt_entry->destination_io_apic_id),
io_interrupt_entry->destination_io_apic_intin,
io_interrupt_entry->type < 4 ? mpdump_inttype[io_interrupt_entry->type] : "Unknown",
@@ -394,16 +394,16 @@ static void mpdump_dump_irq_table(fwts_framework *fw)
fwts_list_add_ordered(&sorted, data, mpdump_compare_local_irq);
}
- fwts_log_info_verbatum(fw, "Local Interrupts:");
- fwts_log_info_verbatum(fw, " Src Bus Src Bus Src Bus Dst I/O Dst I/O Type Polarity Trigger");
- fwts_log_info_verbatum(fw, " ID Type IRQ APIC APIC INTIN");
+ fwts_log_info_verbatim(fw, "Local Interrupts:");
+ fwts_log_info_verbatim(fw, " Src Bus Src Bus Src Bus Dst I/O Dst I/O Type Polarity Trigger");
+ fwts_log_info_verbatim(fw, " ID Type IRQ APIC APIC INTIN");
fwts_list_foreach(entry, &sorted) {
- fwts_mp_local_interrupt_entry *local_interrupt_entry =
+ fwts_mp_local_interrupt_entry *local_interrupt_entry =
fwts_list_data(fwts_mp_local_interrupt_entry *, entry);
- fwts_log_info_verbatum(fw, " %3d %-6.6s %3d %3.3s %3d %-6.6s %-7.7s %-7.7s",
+ fwts_log_info_verbatim(fw, " %3d %-6.6s %3d %3.3s %3d %-6.6s %-7.7s %-7.7s",
local_interrupt_entry->source_bus_id,
mpdump_find_bus_name(local_interrupt_entry->source_bus_id),
- local_interrupt_entry->source_bus_irq,
+ local_interrupt_entry->source_bus_irq,
mpdump_dst_io_apic(local_interrupt_entry->destination_local_apic_id),
local_interrupt_entry->destination_local_apic_intin,
local_interrupt_entry->type < 4 ? mpdump_inttype[local_interrupt_entry->type] : "Unknown",
@@ -411,8 +411,8 @@ static void mpdump_dump_irq_table(fwts_framework *fw)
mpdump_el_short[(local_interrupt_entry->flags >> 2) & 2]);
}
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Key: Con - Conforms to bus spec, Hi - Active High, Lo - Active Lo");
- fwts_log_info_verbatum(fw, " Rsv - Reserved, Lvl - Level Triggered, Edg - Edge Triggered");
+ fwts_log_info_verbatim(fw, "Key: Con - Conforms to bus spec, Hi - Active High, Lo - Active Lo");
+ fwts_log_info_verbatim(fw, " Rsv - Reserved, Lvl - Level Triggered, Edg - Edge Triggered");
fwts_log_nl(fw);
fwts_list_free_items(&sorted, NULL);
}
@@ -420,9 +420,9 @@ static void mpdump_dump_irq_table(fwts_framework *fw)
static int mpdump_compare_system_address_space(void *data1, void *data2)
{
int64_t diff;
- fwts_mp_system_address_space_entry *sys_addr_entry1 =
+ fwts_mp_system_address_space_entry *sys_addr_entry1 =
(fwts_mp_system_address_space_entry *)data1;
- fwts_mp_system_address_space_entry *sys_addr_entry2 =
+ fwts_mp_system_address_space_entry *sys_addr_entry2 =
(fwts_mp_system_address_space_entry *)data2;
diff = sys_addr_entry1->address_base - sys_addr_entry2->address_base;
@@ -448,17 +448,17 @@ static void mpdump_dump_system_address_table(fwts_framework *fw)
fwts_list_add_ordered(&sorted, data, mpdump_compare_system_address_space);
}
- fwts_log_info_verbatum(fw, "System Address Table:");
- fwts_log_info_verbatum(fw, " Start Address End Address Bus ID Type");
+ fwts_log_info_verbatim(fw, "System Address Table:");
+ fwts_log_info_verbatim(fw, " Start Address End Address Bus ID Type");
fwts_list_foreach(entry, &sorted) {
fwts_mp_system_address_space_entry *sys_addr_entry =
fwts_list_data(fwts_mp_system_address_space_entry *, entry);
- fwts_log_info_verbatum(fw, " %16.16llx - %16.16llx %3d %s",
+ fwts_log_info_verbatim(fw, " %16.16llx - %16.16llx %3d %s",
(unsigned long long)sys_addr_entry->address_base,
(unsigned long long)sys_addr_entry->address_base +
sys_addr_entry->address_length,
sys_addr_entry->bus_id,
- sys_addr_entry->address_type < 3 ?
+ sys_addr_entry->address_type < 3 ?
mpdump_sys_addr_type[sys_addr_entry->address_type] : "Unknown");
}
@@ -472,7 +472,7 @@ static int mpdump_test1(fwts_framework *fw)
fwts_infoonly(fw);
mpdump_dump_header(fw, mp_data.header, mp_data.phys_addr);
-
+
fwts_list_foreach(entry, &mp_data.entries) {
uint8_t *data = fwts_list_data(uint8_t *, entry);
uint32_t phys_addr = mp_data.phys_addr + ((void *)data - (void *)mp_data.header);
diff --git a/src/bios/pciirq/pciirq.c b/src/bios/pciirq/pciirq.c
index f283d5c..920f1fd 100644
--- a/src/bios/pciirq/pciirq.c
+++ b/src/bios/pciirq/pciirq.c
@@ -129,37 +129,37 @@ static int pciirq_test1(fwts_framework *fw)
fwts_log_nl(fw);
fwts_log_info(fw, "Found PCI IRQ Routing Table at 0x%8.8x", PCIIRQ_REGION_START+i);
- fwts_log_info_verbatum(fw, " Signature : %4.4s",
+ fwts_log_info_verbatim(fw, " Signature : %4.4s",
pciirq->signature);
- fwts_log_info_verbatum(fw, " Version : 0x%4.4x (%u.%u)",
+ fwts_log_info_verbatim(fw, " Version : 0x%4.4x (%u.%u)",
pciirq->version,
pciirq->version >> 8,
pciirq->version & 0xff);
- fwts_log_info_verbatum(fw, " Table Size : 0x%4.4x bytes (%d slot entries)",
+ fwts_log_info_verbatim(fw, " Table Size : 0x%4.4x bytes (%d slot entries)",
pciirq->table_size, (pciirq->table_size - 32) / 16);
- fwts_log_info_verbatum(fw, " PCI Router ID : %02x:%02x.%1x",
+ fwts_log_info_verbatim(fw, " PCI Router ID : %02x:%02x.%1x",
pciirq->routers_bus,
pciirq->routers_devfunc >> 3,
pciirq->routers_devfunc & 0x7);
- fwts_log_info_verbatum(fw, " PCI Exclusive IRQs : 0x%4.4x (%s)",
+ fwts_log_info_verbatim(fw, " PCI Exclusive IRQs : 0x%4.4x (%s)",
pciirq->exclusive_irqs,
pciirq_irq_bitmap(pciirq->exclusive_irqs));
- fwts_log_info_verbatum(fw, " Compatible PCI Router : %4.4x:%4.4x",
+ fwts_log_info_verbatim(fw, " Compatible PCI Router : %4.4x:%4.4x",
pciirq->compatible_pci_router & 0xffff,
pciirq->compatible_pci_router >> 16);
- fwts_log_info_verbatum(fw, " Miniport Data : 0x%8.8x%s",
+ fwts_log_info_verbatim(fw, " Miniport Data : 0x%8.8x%s",
pciirq->miniport_data,
pciirq->miniport_data ? "" : " (none)");
- fwts_log_info_verbatum(fw, " Reserved : %s",
+ fwts_log_info_verbatim(fw, " Reserved : %s",
pciirq_reserved(pciirq->reserved));
- fwts_log_info_verbatum(fw, " Checksum : 0x%2.2x",
+ fwts_log_info_verbatim(fw, " Checksum : 0x%2.2x",
pciirq->checksum);
fwts_log_nl(fw);
/*
* Dump table
*/
- fwts_log_info_verbatum(fw, "Bus:Dev Slot INTA# INTB# INTC# INTD#");
+ fwts_log_info_verbatim(fw, "Bus:Dev Slot INTA# INTB# INTC# INTD#");
for (slot = pciirq->slots, j = 0; j < slot_count; j++, slot++) {
char buffer[80];
char *ptr = buffer;
@@ -175,7 +175,7 @@ static int pciirq_test1(fwts_framework *fw)
else
ptr += snprintf(ptr, sizeof(buffer) - (ptr - buffer), " ");
}
- fwts_log_info_verbatum(fw, "%s", buffer);
+ fwts_log_info_verbatim(fw, "%s", buffer);
}
fwts_log_nl(fw);
diff --git a/src/bios/pnp/pnp.c b/src/bios/pnp/pnp.c
index 4cc80ba..634cc4f 100644
--- a/src/bios/pnp/pnp.c
+++ b/src/bios/pnp/pnp.c
@@ -97,27 +97,27 @@ static int pnp_test1(fwts_framework *fw)
if ((memcmp(pnp->signature, PNP_SIGNATURE, 4) == 0) &&
(fwts_checksum(mem+i, sizeof(pnp_header)) == 0)) {
fwts_log_info(fw, "Found PnP Installation Check structure at 0x%8.8x", PNP_REGION_START+i);
- fwts_log_info_verbatum(fw, " Signature : %4.4s",
+ fwts_log_info_verbatim(fw, " Signature : %4.4s",
pnp->signature);
- fwts_log_info_verbatum(fw, " Version : 0x%2.2x (%d.%d)",
+ fwts_log_info_verbatim(fw, " Version : 0x%2.2x (%d.%d)",
pnp->version, pnp->version >> 4, pnp->version & 0xf);
- fwts_log_info_verbatum(fw, " Length : 0x%4.4x bytes",
+ fwts_log_info_verbatim(fw, " Length : 0x%4.4x bytes",
pnp->length);
- fwts_log_info_verbatum(fw, " Control Field : 0x%4.4x (%s)",
+ fwts_log_info_verbatim(fw, " Control Field : 0x%4.4x (%s)",
pnp->control_field, pnp_control_field[pnp->control_field & 0x3]);
- fwts_log_info_verbatum(fw, " Event Notification Flag Address : 0x%8.8x%s",
+ fwts_log_info_verbatim(fw, " Event Notification Flag Address : 0x%8.8x%s",
pnp->event_notification_addr,
pnp->event_notification_addr ? "" : " (undefined)");
- fwts_log_info_verbatum(fw, " Real Mode 16 bit Code Address : 0x%4.4x:%4.4x",
+ fwts_log_info_verbatim(fw, " Real Mode 16 bit Code Address : 0x%4.4x:%4.4x",
pnp->RM_code_segment_addr, pnp->RM_offset_entry);
- fwts_log_info_verbatum(fw, " Real Mode 16 bit Data Address : 0x%4.4x:%4.4x",
+ fwts_log_info_verbatim(fw, " Real Mode 16 bit Data Address : 0x%4.4x:%4.4x",
pnp->RM_data_addr, 0);
- fwts_log_info_verbatum(fw, " 16 bit Protected Mode Code Address : 0x%8.8x",
+ fwts_log_info_verbatim(fw, " 16 bit Protected Mode Code Address : 0x%8.8x",
pnp->PM_code_segment_addr + pnp->PM_offset_entry);
- fwts_log_info_verbatum(fw, " 16 bit Protected Mode Data Address : 0x%8.8x",
+ fwts_log_info_verbatim(fw, " 16 bit Protected Mode Data Address : 0x%8.8x",
pnp->PM_data_addr);
- fwts_log_info_verbatum(fw, " OEM Device Identifier : 0x%8.8x%s",
+ fwts_log_info_verbatim(fw, " OEM Device Identifier : 0x%8.8x%s",
pnp->OEM_device_ID, oem_device_id(pnp->OEM_device_ID));
fwts_log_nl(fw);
found++;
diff --git a/src/bios/romdump/romdump.c b/src/bios/romdump/romdump.c
index 4c97715..7b24d8d 100644
--- a/src/bios/romdump/romdump.c
+++ b/src/bios/romdump/romdump.c
@@ -37,7 +37,7 @@ static void romdump_data(fwts_framework *fw, uint8_t *data,
for (i=0; i<length; i+=16) {
fwts_dump_raw_data(buffer, sizeof(buffer), data+i, offset+i, 16);
- fwts_log_info_verbatum(fw, "%s", buffer);
+ fwts_log_info_verbatim(fw, "%s", buffer);
}
}
diff --git a/src/cmos/cmosdump/cmosdump.c b/src/cmos/cmosdump/cmosdump.c
index 1d5324b..7f92772 100644
--- a/src/cmos/cmosdump/cmosdump.c
+++ b/src/cmos/cmosdump/cmosdump.c
@@ -126,186 +126,186 @@ static int cmosdump_test1(fwts_framework *fw)
}
}
- fwts_log_info_verbatum(fw, "CMOS Memory Dump:");
+ fwts_log_info_verbatim(fw, "CMOS Memory Dump:");
for (i = 0; i < (int)sizeof(data); i += 16) {
char buffer[128];
fwts_dump_raw_data(buffer, sizeof(buffer), data + i, i, 16);
- fwts_log_info_verbatum(fw, "%s", buffer);
+ fwts_log_info_verbatim(fw, "%s", buffer);
}
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "RTC Current Time: (CMOS 0x00..0x09)");
- fwts_log_info_verbatum(fw, " RTC seconds: %2.2x", data[0]);
- fwts_log_info_verbatum(fw, " RTC minutes: %2.2x", data[2]);
- fwts_log_info_verbatum(fw, " RTC hours: %2.2x", data[4]);
- fwts_log_info_verbatum(fw, " RTC day of week: %2.2x", data[6]);
- fwts_log_info_verbatum(fw, " RTC date day: %2.2x", data[7]);
- fwts_log_info_verbatum(fw, " RTC date month: %2.2x", data[8]);
- fwts_log_info_verbatum(fw, " RTC date year: %2.2x", data[9]);
+ fwts_log_info_verbatim(fw, "RTC Current Time: (CMOS 0x00..0x09)");
+ fwts_log_info_verbatim(fw, " RTC seconds: %2.2x", data[0]);
+ fwts_log_info_verbatim(fw, " RTC minutes: %2.2x", data[2]);
+ fwts_log_info_verbatim(fw, " RTC hours: %2.2x", data[4]);
+ fwts_log_info_verbatim(fw, " RTC day of week: %2.2x", data[6]);
+ fwts_log_info_verbatim(fw, " RTC date day: %2.2x", data[7]);
+ fwts_log_info_verbatim(fw, " RTC date month: %2.2x", data[8]);
+ fwts_log_info_verbatim(fw, " RTC date year: %2.2x", data[9]);
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "RTC Alarm:");
- fwts_log_info_verbatum(fw, " RTC seconds: %2.2x", data[1]);
- fwts_log_info_verbatum(fw, " RTC minutes: %2.2x", data[3]);
- fwts_log_info_verbatum(fw, " RTC hours: %2.2x", data[5]);
+ fwts_log_info_verbatim(fw, "RTC Alarm:");
+ fwts_log_info_verbatim(fw, " RTC seconds: %2.2x", data[1]);
+ fwts_log_info_verbatim(fw, " RTC minutes: %2.2x", data[3]);
+ fwts_log_info_verbatim(fw, " RTC hours: %2.2x", data[5]);
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Status Register A: (CMOS 0x0a): 0x%2.2x",
+ fwts_log_info_verbatim(fw, "Status Register A: (CMOS 0x0a): 0x%2.2x",
data[10]);
- fwts_log_info_verbatum(fw, " Rate freq: %1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Rate freq: %1.1x (%s)",
data[10] & 0xf, rate_selection[data[10] & 0xf]);
- fwts_log_info_verbatum(fw, " Timer freq divider: %1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Timer freq divider: %1.1x (%s)",
(data[10] >> 4) & 0x7, divider[(data[10] >> 4) & 0x7]);
- fwts_log_info_verbatum(fw, " Update in progress: %1.1x",
+ fwts_log_info_verbatim(fw, " Update in progress: %1.1x",
(data[10] >> 7) & 1);
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Status Register B: (CMOS 0x0b): 0x%2.2x",
+ fwts_log_info_verbatim(fw, "Status Register B: (CMOS 0x0b): 0x%2.2x",
data[11]);
- fwts_log_info_verbatum(fw, " Daylight savings: %1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Daylight savings: %1.1x (%s)",
data[11] & 1,
(data[11] & 1) ? "Enabled" : "Disabled");
- fwts_log_info_verbatum(fw, " 24 Hour Clock: %1.1x (%s)",
+ fwts_log_info_verbatim(fw, " 24 Hour Clock: %1.1x (%s)",
(data[11] >> 1) & 1,
((data[11] >> 1) & 1) ? "24 Hour" : "12 Hour");
- fwts_log_info_verbatum(fw, " Data Mode (DM): %1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Data Mode (DM): %1.1x (%s)",
(data[11] >> 2) & 1,
((data[11] >> 2) & 1) ? "Binary" : "BCD");
- fwts_log_info_verbatum(fw, " Square Wave: %1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Square Wave: %1.1x (%s)",
(data[11] >> 3) & 1,
((data[11] >> 3) & 1) ? "Enabled" : "Disabled");
- fwts_log_info_verbatum(fw, " Update ended IRQ: %1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Update ended IRQ: %1.1x (%s)",
(data[11] >> 4) & 1,
((data[11] >> 4) & 1) ? "Enabled" : "Disabled");
- fwts_log_info_verbatum(fw, " Alarm IRQ: %1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Alarm IRQ: %1.1x (%s)",
(data[11] >> 5) & 1,
((data[11] >> 5) & 1) ? "Enabled" : "Disabled");
- fwts_log_info_verbatum(fw, " Periodic IRQ: %1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Periodic IRQ: %1.1x (%s)",
(data[11] >> 6) & 1,
((data[11] >> 6) & 1) ? "Enabled" : "Disabled");
- fwts_log_info_verbatum(fw, " Clock update cycle: %1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Clock update cycle: %1.1x (%s)",
(data[11] >> 7) & 1,
((data[11] >> 7) & 1) ? "Abort update in progress" : "Update normally");
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Status Register C: (CMOS 0x0c): 0x%2.2x",
+ fwts_log_info_verbatim(fw, "Status Register C: (CMOS 0x0c): 0x%2.2x",
data[12]);
- fwts_log_info_verbatum(fw, " UF flag: 0x%1.1x",
+ fwts_log_info_verbatim(fw, " UF flag: 0x%1.1x",
(data[12] >> 4) & 1);
- fwts_log_info_verbatum(fw, " AF flag: 0x%1.1x",
+ fwts_log_info_verbatim(fw, " AF flag: 0x%1.1x",
(data[12] >> 5) & 1);
- fwts_log_info_verbatum(fw, " PF flag: 0x%1.1x",
+ fwts_log_info_verbatim(fw, " PF flag: 0x%1.1x",
(data[12] >> 6) & 1);
- fwts_log_info_verbatum(fw, " IRQF flag: 0x%1.1x",
+ fwts_log_info_verbatim(fw, " IRQF flag: 0x%1.1x",
(data[12] >> 7) & 1);
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Status Register D: (CMOS 0x0d): 0x%2.2x",
+ fwts_log_info_verbatim(fw, "Status Register D: (CMOS 0x0d): 0x%2.2x",
data[13]);
- fwts_log_info_verbatum(fw, " Valid CMOS RAM flag: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Valid CMOS RAM flag: 0x%1.1x (%s)",
(data[13] >> 7) & 1,
((data[13] >> 7) & 1) ? "Battery Good": "Battery Dead");
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Diagnostic Status: (CMOS 0x0e): 0x%2.2x",
+ fwts_log_info_verbatim(fw, "Diagnostic Status: (CMOS 0x0e): 0x%2.2x",
data[14]);
- fwts_log_info_verbatum(fw, " CMOS time status: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " CMOS time status: 0x%1.1x (%s)",
(data[14] >> 2) & 1,
((data[14] >> 2) & 1) ? "Invalid": "Valid");
- fwts_log_info_verbatum(fw, " Fixed disk init: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Fixed disk init: 0x%1.1x (%s)",
(data[14] >> 3) & 1,
((data[14] >> 3) & 1) ? "Bad": "Good");
- fwts_log_info_verbatum(fw, " Memory size check: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Memory size check: 0x%1.1x (%s)",
(data[14] >> 4) & 1,
((data[14] >> 4) & 1) ? "Bad": "Good");
- fwts_log_info_verbatum(fw, " Config info status: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Config info status: 0x%1.1x (%s)",
(data[14] >> 5) & 1,
((data[14] >> 5) & 1) ? "Invalid": "Valid");
- fwts_log_info_verbatum(fw, " CMOS checksum status: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " CMOS checksum status: 0x%1.1x (%s)",
(data[14] >> 6) & 1,
((data[14] >> 6) & 1) ? "Bad": "Good");
- fwts_log_info_verbatum(fw, " CMOS power loss: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " CMOS power loss: 0x%1.1x (%s)",
(data[14] >> 7) & 1,
((data[14] >> 7) & 1) ? "Lost power": "Not lost power");
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "CMOS Shutdown Status: (CMOS 0x0f): 0x%2.2x (%s)",
+ fwts_log_info_verbatim(fw, "CMOS Shutdown Status: (CMOS 0x0f): 0x%2.2x (%s)",
data[15],
data[15] < 0xb ? cmos_shutdown_status[data[15]] : "Perform power-on reset");
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Floppy Disk Type: (CMOS 0x10): 0x%2.2x",
+ fwts_log_info_verbatim(fw, "Floppy Disk Type: (CMOS 0x10): 0x%2.2x",
data[16]);
- fwts_log_info_verbatum(fw, " Drive 0: %s",
+ fwts_log_info_verbatim(fw, " Drive 0: %s",
floppy_disk[((data[16] >> 4) & 0xf)]);
- fwts_log_info_verbatum(fw, " Drive 1: %s",
+ fwts_log_info_verbatim(fw, " Drive 1: %s",
floppy_disk[((data[16] >> 0) & 0xf)]);
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Hard Disk Type: (CMOS 0x12, Obsolete): 0x%2.2x", data[18]);
- fwts_log_info_verbatum(fw, " Drive 0: %s",
+ fwts_log_info_verbatim(fw, "Hard Disk Type: (CMOS 0x12, Obsolete): 0x%2.2x", data[18]);
+ fwts_log_info_verbatim(fw, " Drive 0: %s",
hard_disk[((data[18] >> 4) & 0xf)]);
- fwts_log_info_verbatum(fw, " Drive 1: %s",
+ fwts_log_info_verbatim(fw, " Drive 1: %s",
hard_disk[((data[18] >> 0) & 0xf)]);
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Installed H/W: (CMOS 0x14): 0x%2.2x",
+ fwts_log_info_verbatim(fw, "Installed H/W: (CMOS 0x14): 0x%2.2x",
data[20]);
- fwts_log_info_verbatum(fw, " Maths Coprocessor: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Maths Coprocessor: 0x%1.1x (%s)",
(data[20] >> 1) & 1,
((data[20] >> 1) & 1) ? "Installed": "Not Installed");
- fwts_log_info_verbatum(fw, " Keyboard: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Keyboard: 0x%1.1x (%s)",
(data[20] >> 2) & 1,
((data[20] >> 2) & 1) ? "Installed": "Not Installed");
- fwts_log_info_verbatum(fw, " Display Adaptor: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Display Adaptor: 0x%1.1x (%s)",
(data[20] >> 3) & 1,
((data[20] >> 3) & 1) ? "Installed": "Not Installed");
- fwts_log_info_verbatum(fw, " Primary Display: 0x%1.1x (%s)",
+ fwts_log_info_verbatim(fw, " Primary Display: 0x%1.1x (%s)",
(data[20] >> 4) & 3,
primary_display[(data[20] >> 4) & 3]);
if (data[20] & 1) {
int drives = (data[20] >> 6) & 3;
- fwts_log_info_verbatum(fw, " Floppy Drives: 0x%2.2x (%d drive%s)",
+ fwts_log_info_verbatim(fw, " Floppy Drives: 0x%2.2x (%d drive%s)",
drives, drives + 1, drives > 0 ? "s" : "");
} else {
- fwts_log_info_verbatum(fw, " Floppy Drives: None.");
+ fwts_log_info_verbatim(fw, " Floppy Drives: None.");
}
fwts_log_nl(fw);
tmp = ((data[22] << 8) | (data[21]));
- fwts_log_info_verbatum(fw, "Base Mem: (CMOS 0x16):");
- fwts_log_info_verbatum(fw, " 0x%2.2x%2.2x (%luK)",
+ fwts_log_info_verbatim(fw, "Base Mem: (CMOS 0x16):");
+ fwts_log_info_verbatim(fw, " 0x%2.2x%2.2x (%luK)",
data[22], data[21], tmp);
fwts_log_nl(fw);
tmp = ((data[24] << 8) | (data[25]));
- fwts_log_info_verbatum(fw, "Extended Mem: (CMOS 0x18):");
- fwts_log_info_verbatum(fw, " 0x%2.2x%2.2x (%luK) %s",
+ fwts_log_info_verbatim(fw, "Extended Mem: (CMOS 0x18):");
+ fwts_log_info_verbatim(fw, " 0x%2.2x%2.2x (%luK) %s",
data[24], data[23], tmp,
tmp > (16 * 1024) ? "[untrustworthy]" : "");
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Hard Disk Extended Types (CMOS 0x19, 0x1a):");
- fwts_log_info_verbatum(fw, " Hard Disk 0: 0x%2.2x",
+ fwts_log_info_verbatim(fw, "Hard Disk Extended Types (CMOS 0x19, 0x1a):");
+ fwts_log_info_verbatim(fw, " Hard Disk 0: 0x%2.2x",
data[25]);
- fwts_log_info_verbatum(fw, " Hard Disk 1: 0x%2.2x",
+ fwts_log_info_verbatim(fw, " Hard Disk 1: 0x%2.2x",
data[26]);
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "CMOS Checksum:(CMOS 0x2e):0x%2.2x%2.2x",
+ fwts_log_info_verbatim(fw, "CMOS Checksum:(CMOS 0x2e):0x%2.2x%2.2x",
data[47], data[46]);
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Extended Mem: (CMOS 0x30):0x%2.2x%2.2x",
+ fwts_log_info_verbatim(fw, "Extended Mem: (CMOS 0x30):0x%2.2x%2.2x",
data[49], data[48]);
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "Century Date: (CMOS 0x32):%2.2x", data[50]);
+ fwts_log_info_verbatim(fw, "Century Date: (CMOS 0x32):%2.2x", data[50]);
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "POST Information Flag (CMOS 0x33):");
- fwts_log_info_verbatum(fw, " POST cache test: 0x%1.1x %s",
+ fwts_log_info_verbatim(fw, "POST Information Flag (CMOS 0x33):");
+ fwts_log_info_verbatim(fw, " POST cache test: 0x%1.1x %s",
(data[51] >> 0) & 1, ((data[51] >> 0) & 1) ? "Failed" : "Passed");
- fwts_log_info_verbatum(fw, " BIOS size: 0x%1.1x %s",
+ fwts_log_info_verbatim(fw, " BIOS size: 0x%1.1x %s",
(data[51] >> 7) & 1, ((data[51] >> 7) & 1) ? "128KB" : "64KB");
fwts_log_nl(fw);
diff --git a/src/cpu/cpufreq/cpufreq.c b/src/cpu/cpufreq/cpufreq.c
index bdcadca..7216364 100644
--- a/src/cpu/cpufreq/cpufreq.c
+++ b/src/cpu/cpufreq/cpufreq.c
@@ -303,9 +303,9 @@ static int test_one_cpu_performance(fwts_framework *fw, struct cpu *cpu,
fwts_log_info(fw, "CPU %d: %i CPU frequency steps supported.",
cpu->idx, cpu->n_freqs);
- fwts_log_info_verbatum(fw,
+ fwts_log_info_verbatim(fw,
" Frequency | Relative Speed | Cycles | Bogo loops");
- fwts_log_info_verbatum(fw,
+ fwts_log_info_verbatim(fw,
"-----------+----------------+------------+-----------");
for (i = 0; i < cpu->n_freqs; i++) {
char *turbo = "";
@@ -316,7 +316,7 @@ static int test_one_cpu_performance(fwts_framework *fw, struct cpu *cpu,
#endif
uint64_t perf = fwts_cpu_benchmark_best_result(
&cpu->freqs[i].perf);
- fwts_log_info_verbatum(fw,
+ fwts_log_info_verbatim(fw,
"%10s | %5.1f %% "
"| %10" PRIu64 " | %9" PRIu64 "%s",
hz_to_human(cpu->freqs[i].Hz),
diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c
index 2080061..bd0485a 100644
--- a/src/dmi/dmicheck/dmicheck.c
+++ b/src/dmi/dmicheck/dmicheck.c
@@ -415,47 +415,47 @@ static void dmi_table_free(void* table)
static void dmi_dump_entry(fwts_framework *fw, fwts_smbios_entry *entry, fwts_smbios_type type)
{
if (type == FWTS_SMBIOS) {
- fwts_log_info_verbatum(fw, "SMBIOS Entry Point Structure:");
- fwts_log_info_verbatum(fw, " Anchor String : %4.4s", entry->signature);
- fwts_log_info_verbatum(fw, " Checksum : 0x%2.2x", entry->checksum);
- fwts_log_info_verbatum(fw, " Entry Point Length : 0x%2.2x", entry->length);
- fwts_log_info_verbatum(fw, " Major Version : 0x%2.2x", entry->major_version);
- fwts_log_info_verbatum(fw, " Minor Version : 0x%2.2x", entry->minor_version);
- fwts_log_info_verbatum(fw, " Maximum Struct Size : 0x%2.2x", entry->max_struct_size);
- fwts_log_info_verbatum(fw, " Entry Point Revision : 0x%2.2x", entry->revision);
- fwts_log_info_verbatum(fw, " Formatted Area : 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x",
+ fwts_log_info_verbatim(fw, "SMBIOS Entry Point Structure:");
+ fwts_log_info_verbatim(fw, " Anchor String : %4.4s", entry->signature);
+ fwts_log_info_verbatim(fw, " Checksum : 0x%2.2x", entry->checksum);
+ fwts_log_info_verbatim(fw, " Entry Point Length : 0x%2.2x", entry->length);
+ fwts_log_info_verbatim(fw, " Major Version : 0x%2.2x", entry->major_version);
+ fwts_log_info_verbatim(fw, " Minor Version : 0x%2.2x", entry->minor_version);
+ fwts_log_info_verbatim(fw, " Maximum Struct Size : 0x%2.2x", entry->max_struct_size);
+ fwts_log_info_verbatim(fw, " Entry Point Revision : 0x%2.2x", entry->revision);
+ fwts_log_info_verbatim(fw, " Formatted Area : 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x",
entry->formatted_area[0], entry->formatted_area[1],
entry->formatted_area[2], entry->formatted_area[3],
entry->formatted_area[4]);
}
if (type == FWTS_SMBIOS_DMI_LEGACY)
- fwts_log_info_verbatum(fw, "Legacy DMI Entry Point Structure:");
+ fwts_log_info_verbatim(fw, "Legacy DMI Entry Point Structure:");
/* Common to SMBIOS and SMBIOS_DMI_LEGACY */
- fwts_log_info_verbatum(fw, " Intermediate Anchor : %5.5s", (char *)entry->anchor_string);
- fwts_log_info_verbatum(fw, " Intermediate Checksum : 0x%2.2x", entry->intermediate_checksum);
- fwts_log_info_verbatum(fw, " Structure Table Length : 0x%4.4x", entry->struct_table_length);
- fwts_log_info_verbatum(fw, " Structure Table Address: 0x%8.8x", entry->struct_table_address);
- fwts_log_info_verbatum(fw, " # of SMBIOS Structures : 0x%4.4x", entry->number_smbios_structures);
- fwts_log_info_verbatum(fw, " SMBIOS BCD Revision : %2.2x", entry->smbios_bcd_revision);
+ fwts_log_info_verbatim(fw, " Intermediate Anchor : %5.5s", (char *)entry->anchor_string);
+ fwts_log_info_verbatim(fw, " Intermediate Checksum : 0x%2.2x", entry->intermediate_checksum);
+ fwts_log_info_verbatim(fw, " Structure Table Length : 0x%4.4x", entry->struct_table_length);
+ fwts_log_info_verbatim(fw, " Structure Table Address: 0x%8.8x", entry->struct_table_address);
+ fwts_log_info_verbatim(fw, " # of SMBIOS Structures : 0x%4.4x", entry->number_smbios_structures);
+ fwts_log_info_verbatim(fw, " SMBIOS BCD Revision : %2.2x", entry->smbios_bcd_revision);
if (entry->smbios_bcd_revision == 0)
- fwts_log_info_verbatum(fw, " BCD Revision 00 indicates compliance with specification stated in Major/Minor Version.");
+ fwts_log_info_verbatim(fw, " BCD Revision 00 indicates compliance with specification stated in Major/Minor Version.");
}
static void dmi_dump_entry30(fwts_framework *fw, fwts_smbios30_entry *entry)
{
- fwts_log_info_verbatum(fw, "SMBIOS30 Entry Point Structure:");
- fwts_log_info_verbatum(fw, " Anchor String : %5.5s", entry->signature);
- fwts_log_info_verbatum(fw, " Checksum : 0x%2.2" PRIx8, entry->checksum);
- fwts_log_info_verbatum(fw, " Entry Point Length : 0x%2.2" PRIx8, entry->length);
- fwts_log_info_verbatum(fw, " Major Version : 0x%2.2" PRIx8, entry->major_version);
- fwts_log_info_verbatum(fw, " Minor Version : 0x%2.2" PRIx8, entry->minor_version);
- fwts_log_info_verbatum(fw, " Docrev : 0x%2.2" PRIx8, entry->docrev);
- fwts_log_info_verbatum(fw, " Entry Point Revision : 0x%2.2" PRIx8, entry->revision);
- fwts_log_info_verbatum(fw, " Reserved : 0x%2.2" PRIx8, entry->reserved);
- fwts_log_info_verbatum(fw, " Table maximum size : 0x%8.8" PRIx32, entry->struct_table_max_size);
- fwts_log_info_verbatum(fw, " Table address : 0x%16.16" PRIx64, entry->struct_table_address);
+ fwts_log_info_verbatim(fw, "SMBIOS30 Entry Point Structure:");
+ fwts_log_info_verbatim(fw, " Anchor String : %5.5s", entry->signature);
+ fwts_log_info_verbatim(fw, " Checksum : 0x%2.2" PRIx8, entry->checksum);
+ fwts_log_info_verbatim(fw, " Entry Point Length : 0x%2.2" PRIx8, entry->length);
+ fwts_log_info_verbatim(fw, " Major Version : 0x%2.2" PRIx8, entry->major_version);
+ fwts_log_info_verbatim(fw, " Minor Version : 0x%2.2" PRIx8, entry->minor_version);
+ fwts_log_info_verbatim(fw, " Docrev : 0x%2.2" PRIx8, entry->docrev);
+ fwts_log_info_verbatim(fw, " Entry Point Revision : 0x%2.2" PRIx8, entry->revision);
+ fwts_log_info_verbatim(fw, " Reserved : 0x%2.2" PRIx8, entry->reserved);
+ fwts_log_info_verbatim(fw, " Table maximum size : 0x%8.8" PRIx32, entry->struct_table_max_size);
+ fwts_log_info_verbatim(fw, " Table address : 0x%16.16" PRIx64, entry->struct_table_address);
}
diff --git a/src/lib/include/fwts_log.h b/src/lib/include/fwts_log.h
index 847a391..bd5d759 100644
--- a/src/lib/include/fwts_log.h
+++ b/src/lib/include/fwts_log.h
@@ -157,25 +157,25 @@ static inline int fwts_log_type_count(fwts_log_type type)
#define fwts_log_warning(fw, fmt, args...) \
fwts_log_printf(fw, LOG_WARNING, LOG_LEVEL_NONE, "", "", "", fmt, ## args)
-#define fwts_log_warning_verbatum(fw, fmt, args...) \
+#define fwts_log_warning_verbatim(fw, fmt, args...) \
fwts_log_printf(fw, LOG_WARNING | LOG_VERBATUM, LOG_LEVEL_NONE, "", "", "", fmt, ## args)
#define fwts_log_error(fw, fmt, args...) \
fwts_log_printf(fw, LOG_ERROR, LOG_LEVEL_NONE, "", "", "", fmt, ## args)
-#define fwts_log_error_verbatum(fw, fmt, args...) \
+#define fwts_log_error_verbatim(fw, fmt, args...) \
fwts_log_printf(fw, LOG_ERROR | LOG_VERBATUM, LOG_LEVEL_NONE, "", "", "", fmt, ## args)
#define fwts_log_info(fw, fmt, args...) \
fwts_log_printf(fw, LOG_INFO, LOG_LEVEL_NONE, "", "", "", fmt, ## args)
-#define fwts_log_info_verbatum(fw, fmt, args...) \
+#define fwts_log_info_verbatim(fw, fmt, args...) \
fwts_log_printf(fw, LOG_INFO | LOG_VERBATUM, LOG_LEVEL_NONE, "", "", "", fmt, ## args)
#define fwts_log_summary(fw, fmt, args...) \
fwts_log_printf(fw, LOG_SUMMARY, LOG_LEVEL_NONE, "", "", "", fmt, ## args)
-#define fwts_log_summary_verbatum(fw, fmt, args...) \
+#define fwts_log_summary_verbatim(fw, fmt, args...) \
fwts_log_printf(fw, LOG_SUMMARY | LOG_VERBATUM, LOG_LEVEL_NONE, "", "", "", fmt, ## args)
#define fwts_log_advice(fw, fmt, args...) \
diff --git a/src/lib/src/fwts_acpi_object_eval.c b/src/lib/src/fwts_acpi_object_eval.c
index f60b97f..7a5f8be 100644
--- a/src/lib/src/fwts_acpi_object_eval.c
+++ b/src/lib/src/fwts_acpi_object_eval.c
@@ -360,19 +360,19 @@ static void fwts_acpi_object_dump_recursive(
switch (obj->Type) {
case ACPI_TYPE_INTEGER:
- fwts_log_info_verbatum(fw, "%*s%sINTEGER: 0x%8.8llx", depth * 2, "",
+ fwts_log_info_verbatim(fw, "%*s%sINTEGER: 0x%8.8llx", depth * 2, "",
index_buf, (unsigned long long)obj->Integer.Value);
break;
case ACPI_TYPE_STRING:
- fwts_log_info_verbatum(fw, "%*s%sSTRING: %s", depth * 2, "",
+ fwts_log_info_verbatim(fw, "%*s%sSTRING: %s", depth * 2, "",
index_buf, obj->String.Pointer);
break;
case ACPI_TYPE_BUFFER:
- fwts_log_info_verbatum(fw, "%*s%sBUFFER: (%d bytes)", depth * 2, "",
+ fwts_log_info_verbatim(fw, "%*s%sBUFFER: (%d bytes)", depth * 2, "",
index_buf, obj->Buffer.Length);
break;
case ACPI_TYPE_PACKAGE:
- fwts_log_info_verbatum(fw, "%*s%sPackage has %d elements:",depth * 2, "",
+ fwts_log_info_verbatim(fw, "%*s%sPackage has %d elements:",depth * 2, "",
index_buf, obj->Package.Count);
for (i = 0; i < obj->Package.Count; i++) {
ACPI_OBJECT *element = &obj->Package.Elements[i];
@@ -380,7 +380,7 @@ static void fwts_acpi_object_dump_recursive(
}
break;
default:
- fwts_log_info_verbatum(fw, "%*s%sUnknown type %d\n", depth * 2, "",
+ fwts_log_info_verbatim(fw, "%*s%sUnknown type %d\n", depth * 2, "",
index_buf, obj->Type);
break;
}
diff --git a/src/lib/src/fwts_hwinfo.c b/src/lib/src/fwts_hwinfo.c
index e8f7c05..8af2e68 100644
--- a/src/lib/src/fwts_hwinfo.c
+++ b/src/lib/src/fwts_hwinfo.c
@@ -192,11 +192,11 @@ static void fwts_hwinfo_bluetooth_dump(fwts_framework *fw, fwts_list *devices)
fwts_list_foreach(item, devices) {
fwts_bluetooth_config *bluetooth_config = fwts_list_data(fwts_bluetooth_config *, item);
- fwts_log_info_verbatum(fw, " Device: %s", bluetooth_config->name);
- fwts_log_info_verbatum(fw, " Name: %s", bluetooth_config->bt_name);
- fwts_log_info_verbatum(fw, " Address: %s", bluetooth_config->address);
- fwts_log_info_verbatum(fw, " Bus: %s", bluetooth_config->bus);
- fwts_log_info_verbatum(fw, " Type: %s", bluetooth_config->type);
+ fwts_log_info_verbatim(fw, " Device: %s", bluetooth_config->name);
+ fwts_log_info_verbatim(fw, " Name: %s", bluetooth_config->bt_name);
+ fwts_log_info_verbatim(fw, " Address: %s", bluetooth_config->address);
+ fwts_log_info_verbatim(fw, " Bus: %s", bluetooth_config->bus);
+ fwts_log_info_verbatim(fw, " Type: %s", bluetooth_config->type);
fwts_log_nl(fw);
}
}
@@ -309,9 +309,9 @@ static void fwts_hwinfo_input_dump(fwts_framework *fw, fwts_list *devices)
fwts_list_foreach(item, devices) {
fwts_input_config *input_config = fwts_list_data(fwts_input_config *, item);
- fwts_log_info_verbatum(fw, " Device: %s", input_config->name);
- fwts_log_info_verbatum(fw, " Device Name: %s", input_config->dev_name);
- fwts_log_info_verbatum(fw, " Phy: %s", input_config->phys);
+ fwts_log_info_verbatim(fw, " Device: %s", input_config->name);
+ fwts_log_info_verbatim(fw, " Device Name: %s", input_config->dev_name);
+ fwts_log_info_verbatim(fw, " Phy: %s", input_config->phys);
fwts_log_nl(fw);
}
}
@@ -442,9 +442,9 @@ static void fwts_hwinfo_net_dump(fwts_framework *fw, fwts_list *devices)
fwts_list_foreach(item, devices) {
fwts_net_config *net_config = fwts_list_data(fwts_net_config *, item);
- fwts_log_info_verbatum(fw, " Device: %s", net_config->name);
- fwts_log_info_verbatum(fw, " Address: %s", net_config->addr);
- fwts_log_info_verbatum(fw, " H/W Address: %s", net_config->hw_addr);
+ fwts_log_info_verbatim(fw, " Device: %s", net_config->name);
+ fwts_log_info_verbatim(fw, " Address: %s", net_config->addr);
+ fwts_log_info_verbatim(fw, " H/W Address: %s", net_config->hw_addr);
fwts_log_nl(fw);
}
}
@@ -535,7 +535,7 @@ static void fwts_hwinfo_pci_dump(fwts_framework *fw, fwts_list *configs)
ssize_t n;
fwts_pci_config *pci_config = fwts_list_data(fwts_pci_config *, item);
- fwts_log_info_verbatum(fw, " PCI: %s, VID: %2.2" PRIx8 ":%2.2" PRIx8
+ fwts_log_info_verbatim(fw, " PCI: %s, VID: %2.2" PRIx8 ":%2.2" PRIx8
", Class: %2.2" PRIx8 ":%2.2" PRIx8 " (%s)",
pci_config->name,
pci_config->config[FWTS_PCI_CONFIG_VENDOR_ID],
@@ -544,7 +544,7 @@ static void fwts_hwinfo_pci_dump(fwts_framework *fw, fwts_list *configs)
pci_config->config[FWTS_PCI_CONFIG_SUBCLASS],
fwts_pci_description(pci_config->config[FWTS_PCI_CONFIG_CLASS_CODE],
pci_config->config[FWTS_PCI_CONFIG_SUBCLASS]));
- fwts_log_info_verbatum(fw, " Config:");
+ fwts_log_info_verbatim(fw, " Config:");
/* and do a raw hex dump of the config space */
for (n = 0; n < pci_config->config_len; n += 16) {
@@ -553,7 +553,7 @@ static void fwts_hwinfo_pci_dump(fwts_framework *fw, fwts_list *configs)
fwts_dump_raw_data(buffer, sizeof(buffer), pci_config->config + n,
n, left > 16 ? 16 : left);
- fwts_log_info_verbatum(fw, " %s", buffer);
+ fwts_log_info_verbatim(fw, " %s", buffer);
}
fwts_log_nl(fw);
}
diff --git a/src/lib/src/fwts_memorymap.c b/src/lib/src/fwts_memorymap.c
index 83b2b7d..7579231 100644
--- a/src/lib/src/fwts_memorymap.c
+++ b/src/lib/src/fwts_memorymap.c
@@ -202,7 +202,7 @@ static void fwts_memory_map_dump_info(void *data, void *private)
fwts_memory_map_entry *entry = (fwts_memory_map_entry *)data;
fwts_framework *fw = (fwts_framework *)private;
- fwts_log_info_verbatum(fw, "0x%16.16" PRIx64 " - 0x%16.16" PRIx64 " %s",
+ fwts_log_info_verbatim(fw, "0x%16.16" PRIx64 " - 0x%16.16" PRIx64 " %s",
entry->start_address, entry->end_address,
fwts_memory_map_type_to_str(entry->type));
}
@@ -213,8 +213,8 @@ static void fwts_memory_map_dump_info(void *data, void *private)
*/
void fwts_memory_map_table_dump(fwts_framework *fw, fwts_list *memory_map_list)
{
- fwts_log_info_verbatum(fw, "Memory Map Layout");
- fwts_log_info_verbatum(fw, "-----------------");
+ fwts_log_info_verbatim(fw, "Memory Map Layout");
+ fwts_log_info_verbatim(fw, "-----------------");
fwts_list_iterate(memory_map_list, fwts_memory_map_dump_info, fw);
}
diff --git a/src/lib/src/fwts_oops.c b/src/lib/src/fwts_oops.c
index 41cec8d..5c46f91 100644
--- a/src/lib/src/fwts_oops.c
+++ b/src/lib/src/fwts_oops.c
@@ -100,7 +100,7 @@ static void fwts_klog_stack_dump(
if (dumpstack) {
while (bug_item != NULL && bug_item != item) {
- fwts_log_info_verbatum(fw, " %s",
+ fwts_log_info_verbatim(fw, " %s",
fwts_klog_remove_timestamp(fwts_list_data(char *, bug_item)));
bug_item = bug_item->next;
}
diff --git a/src/lib/src/fwts_summary.c b/src/lib/src/fwts_summary.c
index fc2b345..b6b1a5c 100644
--- a/src/lib/src/fwts_summary.c
+++ b/src/lib/src/fwts_summary.c
@@ -218,7 +218,7 @@ int fwts_summary_report(fwts_framework *fw, fwts_list *test_list)
summary_item->test,
summary_item->text);
else
- fwts_log_summary_verbatum(fw, " %s: %s",
+ fwts_log_summary_verbatim(fw, " %s: %s",
summary_item->test,
summary_item->text);
}
@@ -239,8 +239,8 @@ int fwts_summary_report(fwts_framework *fw, fwts_list *test_list)
fwts_list_foreach(item, test_list)
fwts_list_add_ordered(sorted, fwts_list_data(fwts_framework_test *,item), fwts_framework_compare_test_name);
- fwts_log_summary_verbatum(fw, "Test |Pass |Fail |Abort|Warn |Skip |Info |");
- fwts_log_summary_verbatum(fw, "---------------+-----+-----+-----+-----+-----+-----+");
+ fwts_log_summary_verbatim(fw, "Test |Pass |Fail |Abort|Warn |Skip |Info |");
+ fwts_log_summary_verbatim(fw, "---------------+-----+-----+-----+-----+-----+-----+");
fwts_list_foreach(item, sorted) {
fwts_framework_test *test = fwts_list_data(fwts_framework_test*,item);
if (test->was_run) {
@@ -258,15 +258,15 @@ int fwts_summary_report(fwts_framework *fw, fwts_list *test_list)
fwts_summary_format_field(skipped, sizeof(skipped), test->results.skipped);
fwts_summary_format_field(infoonly, sizeof(infoonly), test->results.infoonly);
- fwts_log_summary_verbatum(fw, "%-15.15s|%5.5s|%5.5s|%5.5s|%5.5s|%5.5s|%5.5s|",
+ fwts_log_summary_verbatim(fw, "%-15.15s|%5.5s|%5.5s|%5.5s|%5.5s|%5.5s|%5.5s|",
test->name, passed, failed, aborted, warning, skipped, infoonly);
}
}
- fwts_log_summary_verbatum(fw, "---------------+-----+-----+-----+-----+-----+-----+");
- fwts_log_summary_verbatum(fw, "Total: |%5d|%5d|%5d|%5d|%5d|%5d|",
+ fwts_log_summary_verbatim(fw, "---------------+-----+-----+-----+-----+-----+-----+");
+ fwts_log_summary_verbatim(fw, "Total: |%5d|%5d|%5d|%5d|%5d|%5d|",
fw->total.passed, fw->total.failed, fw->total.aborted,
fw->total.warning, fw->total.skipped, fw->total.infoonly);
- fwts_log_summary_verbatum(fw, "---------------+-----+-----+-----+-----+-----+-----+");
+ fwts_log_summary_verbatim(fw, "---------------+-----+-----+-----+-----+-----+-----+");
fwts_list_free(sorted, NULL);
}
return FWTS_OK;
diff --git a/src/uefi/esrtdump/esrtdump.c b/src/uefi/esrtdump/esrtdump.c
index db8a39f..49a7c18 100644
--- a/src/uefi/esrtdump/esrtdump.c
+++ b/src/uefi/esrtdump/esrtdump.c
@@ -57,13 +57,13 @@ static int get_entries_info(fwts_framework *fw)
int count = -1;
fwts_log_nl(fw);
- fwts_log_info_verbatum(fw, "%s", entry->d_name);
+ fwts_log_info_verbatim(fw, "%s", entry->d_name);
snprintf(path, sizeof(path), FWTS_ESRT_DIR_PATH "/%s/fw_class", entry->d_name);
if ((str = fwts_get(path)) == NULL) {
fwts_log_error(fw, "Failed to get FwClass");
} else {
- fwts_log_info_verbatum(fw, " FwClass: %s", str);
+ fwts_log_info_verbatim(fw, " FwClass: %s", str);
free(str);
}
@@ -88,14 +88,14 @@ static int get_entries_info(fwts_framework *fw)
str_info = "";
break;
}
- fwts_log_info_verbatum(fw, " FwType: %d %s", count, str_info);
+ fwts_log_info_verbatim(fw, " FwType: %d %s", count, str_info);
}
snprintf(path, sizeof(path), FWTS_ESRT_DIR_PATH "/%s/fw_version", entry->d_name);
if ((str = fwts_get(path)) == NULL) {
fwts_log_error(fw, "Failed to get FwVersion");
} else {
- fwts_log_info_verbatum(fw, " FwVersion: %s", str);
+ fwts_log_info_verbatim(fw, " FwVersion: %s", str);
free(str);
}
@@ -103,7 +103,7 @@ static int get_entries_info(fwts_framework *fw)
if ((str = fwts_get(path)) == NULL) {
fwts_log_error(fw, "Failed to get LowestSupportedFwVersion");
} else {
- fwts_log_info_verbatum(fw, " LowestSupportedFwVersion: %s", str);
+ fwts_log_info_verbatim(fw, " LowestSupportedFwVersion: %s", str);
free(str);
}
@@ -111,7 +111,7 @@ static int get_entries_info(fwts_framework *fw)
if ((str = fwts_get(path)) == NULL) {
fwts_log_error(fw, "Failed to get CapsuleFlags");
} else {
- fwts_log_info_verbatum(fw, " CapsuleFlags: %s", str);
+ fwts_log_info_verbatim(fw, " CapsuleFlags: %s", str);
free(str);
}
@@ -119,7 +119,7 @@ static int get_entries_info(fwts_framework *fw)
if ((str = fwts_get(path)) == NULL) {
fwts_log_error(fw, "Failed to get LastAttemptVersion");
} else {
- fwts_log_info_verbatum(fw, " LastAttemptVersion: %s", str);
+ fwts_log_info_verbatim(fw, " LastAttemptVersion: %s", str);
free(str);
}
@@ -156,7 +156,7 @@ static int get_entries_info(fwts_framework *fw)
str_info = "";
break;
}
- fwts_log_info_verbatum(fw, " LastAttemptStatus: %d %s", count, str_info);
+ fwts_log_info_verbatim(fw, " LastAttemptStatus: %d %s", count, str_info);
}
}
} while (entry);
@@ -172,21 +172,21 @@ static int esrtdump_test1(fwts_framework *fw)
if ((str = fwts_get(FWTS_ESRT_RES_COUNT_PATH)) == NULL)
fwts_log_error(fw, "Failed to get FwResourceCount");
else {
- fwts_log_info_verbatum(fw, " FwResourceCount: %s", str);
+ fwts_log_info_verbatim(fw, " FwResourceCount: %s", str);
free(str);
}
if ((str = fwts_get(FWTS_ESRT_RES_COUNT_MAX_PATH)) == NULL)
fwts_log_error(fw, "Failed to get FwResourceCountMax");
else {
- fwts_log_info_verbatum(fw, " FwResourceCountMax: %s", str);
+ fwts_log_info_verbatim(fw, " FwResourceCountMax: %s", str);
free(str);
}
if ((str = fwts_get(FWTS_ESRT_RES_VERSION_PATH)) == NULL)
fwts_log_error(fw, "Failed to get FwResourceVersion");
else {
- fwts_log_info_verbatum(fw, " FwResourceVersion: %s", str);
+ fwts_log_info_verbatim(fw, " FwResourceVersion: %s", str);
free(str);
}
diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c
index 730898f..69abaa5 100644
--- a/src/uefi/securebootcert/securebootcert.c
+++ b/src/uefi/securebootcert/securebootcert.c
@@ -125,7 +125,7 @@ static void securebootcert_secure_boot(fwts_framework *fw, fwts_uefi_var *var, c
}
if (value == 1)
securebooted = true;
- fwts_log_info_verbatum(fw, " Value: 0x%2.2x%s.", value, mode);
+ fwts_log_info_verbatim(fw, " Value: 0x%2.2x%s.", value, mode);
fwts_passed(fw, "Secure boot relative variable %s check passed.", varname);
}
}
@@ -166,7 +166,7 @@ static void securebootcert_setup_mode(fwts_framework *fw, fwts_uefi_var *var, ch
"The secure boot variable %s data invalid.", varname);
return;
}
- fwts_log_info_verbatum(fw, " Value: 0x%2.2" PRIx8 "%s.", value, mode);
+ fwts_log_info_verbatim(fw, " Value: 0x%2.2" PRIx8 "%s.", value, mode);
fwts_passed(fw, "Secure boot relative variable %s check passed.", varname);
}
}
@@ -245,7 +245,7 @@ static void securebootcert_data_base(fwts_framework *fw, fwts_uefi_var *var, cha
return;
}
- fwts_log_info_verbatum(fw, "Check Microsoft UEFI CA certificate presence in %s", varname);
+ fwts_log_info_verbatim(fw, "Check Microsoft UEFI CA certificate presence in %s", varname);
if (check_sigdb_presence(var->data, var->datalen, ms_uefi_ca_2011_key, ms_uefi_ca_2011_key_len))
fwts_passed(fw, "MS UEFI CA 2011 key check passed.");
else {
@@ -291,11 +291,11 @@ static void securebootcert_key_ex_key(fwts_framework *fw, fwts_uefi_var *var, ch
}
fwts_release_free(release);
- fwts_log_info_verbatum(fw, "Check Ubuntu master CA certificate presence in %s", varname);
+ fwts_log_info_verbatim(fw, "Check Ubuntu master CA certificate presence in %s", varname);
if (check_sigdb_presence(var->data, var->datalen, ubuntu_key, ubuntu_key_len))
fwts_passed(fw, "Ubuntu UEFI CA 2011 key check passed.");
else {
- fwts_log_info_verbatum(fw, "No Ubuntu master CA certificate presence in %s", varname);
+ fwts_log_info_verbatim(fw, "No Ubuntu master CA certificate presence in %s", varname);
fwts_infoonly(fw);
}
}
@@ -318,10 +318,10 @@ static void securebootcert_var(fwts_framework *fw, fwts_uefi_var *var)
for (info = securebootcert_info_table; info->description != NULL; info++) {
if (strcmp(varname, info->description) == 0) {
- fwts_log_info_verbatum(fw, "The %s variable check.", varname);
+ fwts_log_info_verbatim(fw, "The %s variable check.", varname);
fwts_guid_buf_to_str(var->guid, guid_str, sizeof(guid_str));
- fwts_log_info_verbatum(fw, " GUID: %s", guid_str);
- fwts_log_info_verbatum(fw, " Attr: 0x%x (%s).", var->attributes,
+ fwts_log_info_verbatim(fw, " GUID: %s", guid_str);
+ fwts_log_info_verbatim(fw, " Attr: 0x%x (%s).", var->attributes,
fwts_uefi_attribute_info(var->attributes));
info->func(fw, var, varname);
fwts_log_nl(fw);
diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c
index 33db051..2ab3b21 100644
--- a/src/uefi/uefibootpath/uefibootpath.c
+++ b/src/uefi/uefibootpath/uefibootpath.c
@@ -64,7 +64,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d
}
break;
default:
- fwts_log_info_verbatum(fw, "Unknown subtype of End of Hardware Device Path.");
+ fwts_log_info_verbatim(fw, "Unknown subtype of End of Hardware Device Path.");
break;
}
break;
@@ -140,7 +140,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d
}
break;
default:
- fwts_log_info_verbatum(fw, "Unknown subtype of Hardware Device Path.");
+ fwts_log_info_verbatim(fw, "Unknown subtype of Hardware Device Path.");
break;
}
break;
@@ -204,7 +204,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d
}
break;
default:
- fwts_log_info_verbatum(fw, "Unknown subtype of ACPI Device Path.");
+ fwts_log_info_verbatim(fw, "Unknown subtype of ACPI Device Path.");
break;
}
break;
@@ -613,7 +613,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d
}
break;
default:
- fwts_log_info_verbatum(fw, "Unknown subtype of Messaging Device Path.");
+ fwts_log_info_verbatim(fw, "Unknown subtype of Messaging Device Path.");
break;
}
break;
@@ -739,7 +739,7 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d
}
break;
default:
- fwts_log_info_verbatum(fw, "Unknown subtype of Media Device Path.");
+ fwts_log_info_verbatim(fw, "Unknown subtype of Media Device Path.");
break;
}
break;
@@ -767,12 +767,12 @@ static int uefibootpath_check_dev_path(fwts_framework *fw, fwts_uefi_dev_path *d
}
break;
default:
- fwts_log_info_verbatum(fw, "Unknown subtype of BIOS Boot Specification Device Path.");
+ fwts_log_info_verbatim(fw, "Unknown subtype of BIOS Boot Specification Device Path.");
break;
}
break;
default:
- fwts_log_info_verbatum(fw, "Unknown Type of Device Path.");
+ fwts_log_info_verbatim(fw, "Unknown Type of Device Path.");
break;
}
@@ -807,7 +807,7 @@ static int uefibootpath_info_bootdev(fwts_framework *fw, fwts_uefi_var *var)
load_option = (fwts_uefi_load_option *)var->data;
fwts_uefi_str16_to_str(tmp, sizeof(tmp), load_option->description);
len = fwts_uefi_str16len(load_option->description);
- fwts_log_info_verbatum(fw, "Info: %s\n", tmp);
+ fwts_log_info_verbatim(fw, "Info: %s\n", tmp);
if (var->datalen < (sizeof(uint16_t) * (len + 1))) {
fwts_failed(fw, LOG_LEVEL_MEDIUM,
@@ -840,7 +840,7 @@ static void uefibootpath_var(fwts_framework *fw, fwts_uefi_var *var)
&& isxdigit(varname[6]) && isxdigit(varname[7])) {
int ret;
- fwts_log_info_verbatum(fw, "Name: %s", varname);
+ fwts_log_info_verbatim(fw, "Name: %s", varname);
errors = 0;
ret = uefibootpath_info_bootdev(fw, var);
diff --git a/src/uefi/uefidump/uefidump.c b/src/uefi/uefidump/uefidump.c
index 23601f4..03529b5 100644
--- a/src/uefi/uefidump/uefidump.c
+++ b/src/uefi/uefidump/uefidump.c
@@ -39,14 +39,14 @@ static void uefidump_var_hexdump(fwts_framework *fw, fwts_uefi_var *var)
int i;
uint8_t *data = (uint8_t*)var->data;
- fwts_log_info_verbatum(fw, " Size: %zd bytes of data", var->datalen);
+ fwts_log_info_verbatim(fw, " Size: %zd bytes of data", var->datalen);
for (i = 0; i < (int)var->datalen; i+= 16) {
char buffer[128];
int left = (int)var->datalen - i;
fwts_dump_raw_data(buffer, sizeof(buffer), data + i, i, left > 16 ? 16 : left);
- fwts_log_info_verbatum(fw, " Data: %s", buffer+2);
+ fwts_log_info_verbatim(fw, " Data: %s", buffer+2);
}
}
@@ -59,7 +59,7 @@ static void uefidump_data_hexdump(fwts_framework *fw, uint8_t *data, size_t size
size_t left = size - i;
fwts_dump_raw_data(buffer, sizeof(buffer), data + i, i, left > 16 ? 16 : left);
- fwts_log_info_verbatum(fw, " Data: %s", buffer+2);
+ fwts_log_info_verbatim(fw, " Data: %s", buffer+2);
}
}
@@ -695,7 +695,7 @@ static void uefidump_info_dev_path(fwts_framework *fw, fwts_uefi_var *var)
path = uefidump_build_dev_path(NULL, (fwts_uefi_dev_path*)var->data, var->datalen);
- fwts_log_info_verbatum(fw, " Device Path: %s", path);
+ fwts_log_info_verbatim(fw, " Device Path: %s", path);
free(path);
}
@@ -703,7 +703,7 @@ static void uefidump_info_dev_path(fwts_framework *fw, fwts_uefi_var *var)
static void uefidump_info_lang(fwts_framework *fw, fwts_uefi_var *var)
{
uint8_t *data = (uint8_t*)var->data;
- fwts_log_info_verbatum(fw, " Language: %c%c%c%c", data[0], data[1], data[2], data[3]);
+ fwts_log_info_verbatim(fw, " Language: %c%c%c%c", data[0], data[1], data[2], data[3]);
}
static void uefidump_info_langcodes(fwts_framework *fw, fwts_uefi_var *var)
@@ -722,13 +722,13 @@ static void uefidump_info_langcodes(fwts_framework *fw, fwts_uefi_var *var)
}
*dst = '\0';
- fwts_log_info_verbatum(fw, " Language Codes: %s", buffer);
+ fwts_log_info_verbatim(fw, " Language Codes: %s", buffer);
}
static void uefidump_info_platform_lang(fwts_framework *fw, fwts_uefi_var *var)
{
uint8_t *data = (uint8_t*)var->data;
- fwts_log_info_verbatum(fw, " Platform Language: %c%c%c%c%c%c.", data[0], data[1], data[2], data[3], data[4], data[5]);
+ fwts_log_info_verbatim(fw, " Platform Language: %c%c%c%c%c%c.", data[0], data[1], data[2], data[3], data[4], data[5]);
}
static void uefidump_info_platform_langcodes(fwts_framework *fw, fwts_uefi_var *var)
@@ -749,7 +749,7 @@ static void uefidump_info_platform_langcodes(fwts_framework *fw, fwts_uefi_var *
}
*dst = '\0';
- fwts_log_info_verbatum(fw, " Platform Language Codes: %s", buffer);
+ fwts_log_info_verbatim(fw, " Platform Language Codes: %s", buffer);
}
static void uefidump_info_timeout(fwts_framework *fw, fwts_uefi_var *var)
@@ -757,7 +757,7 @@ static void uefidump_info_timeout(fwts_framework *fw, fwts_uefi_var *var)
if (var->datalen >= sizeof(uint16_t)) {
uint16_t *data = (uint16_t*)var->data;
- fwts_log_info_verbatum(fw, " Timeout: %" PRId16 " seconds", *data);
+ fwts_log_info_verbatim(fw, " Timeout: %" PRId16 " seconds", *data);
}
}
@@ -766,7 +766,7 @@ static void uefidump_info_bootcurrent(fwts_framework *fw, fwts_uefi_var *var)
if (var->datalen >= sizeof(uint16_t)) {
uint16_t *data = (uint16_t *)var->data;
- fwts_log_info_verbatum(fw, " BootCurrent: 0x%4.4" PRIx16, *data);
+ fwts_log_info_verbatim(fw, " BootCurrent: 0x%4.4" PRIx16, *data);
}
}
@@ -775,7 +775,7 @@ static void uefidump_info_bootnext(fwts_framework *fw, fwts_uefi_var *var)
if (var->datalen >= sizeof(uint16_t)) {
uint16_t *data = (uint16_t *)var->data;
- fwts_log_info_verbatum(fw, " BootNext: 0x%4.4" PRIx16, *data);
+ fwts_log_info_verbatim(fw, " BootNext: 0x%4.4" PRIx16, *data);
}
}
@@ -784,7 +784,7 @@ static void uefidump_info_bootoptionsupport(fwts_framework *fw, fwts_uefi_var *v
if (var->datalen >= sizeof(uint16_t)) {
uint16_t *data = (uint16_t *)var->data;
- fwts_log_info_verbatum(fw, " BootOptionSupport: 0x%4.4" PRIx16, *data);
+ fwts_log_info_verbatim(fw, " BootOptionSupport: 0x%4.4" PRIx16, *data);
}
}
@@ -799,7 +799,7 @@ static void uefidump_info_bootorder(fwts_framework *fw, fwts_uefi_var *var)
str = uefidump_vprintf(str, "0x%04" PRIx16 "%s",
*data++, i < (n - 1) ? "," : "");
}
- fwts_log_info_verbatum(fw, " Boot Order: %s", str);
+ fwts_log_info_verbatim(fw, " Boot Order: %s", str);
free(str);
}
@@ -813,11 +813,11 @@ static void uefidump_info_bootdev(fwts_framework *fw, fwts_uefi_var *var)
return;
load_option = (fwts_uefi_load_option *)var->data;
- fwts_log_info_verbatum(fw, " Active: %s\n",
+ fwts_log_info_verbatim(fw, " Active: %s\n",
(load_option->attributes & FWTS_UEFI_LOAD_OPTION_ACTIVE) ? "Yes" : "No");
fwts_uefi_str16_to_str(tmp, sizeof(tmp), load_option->description);
len = fwts_uefi_str16len(load_option->description);
- fwts_log_info_verbatum(fw, " Info: %s\n", tmp);
+ fwts_log_info_verbatim(fw, " Info: %s\n", tmp);
if (load_option->file_path_list_length != 0) {
char *path;
@@ -829,7 +829,7 @@ static void uefidump_info_bootdev(fwts_framework *fw, fwts_uefi_var *var)
path = uefidump_build_dev_path(NULL,
(fwts_uefi_dev_path *)(var->data + offset), var->datalen - offset);
- fwts_log_info_verbatum(fw, " Path: %s", path);
+ fwts_log_info_verbatim(fw, " Path: %s", path);
free(path);
}
@@ -838,7 +838,7 @@ static void uefidump_info_bootdev(fwts_framework *fw, fwts_uefi_var *var)
(sizeof(uint16_t) * (len + 1)) +
load_option->file_path_list_length;
if ((var->datalen - offset) > 0) {
- fwts_log_info_verbatum(fw, " OptionalData:");
+ fwts_log_info_verbatim(fw, " OptionalData:");
uefidump_data_hexdump(fw, var->data + offset, var->datalen - offset);
}
}
@@ -874,7 +874,7 @@ static void uefidump_info_dump_type0(fwts_framework *fw, fwts_uefi_var *var)
if (*ptr == '\n') {
*ptr++ = '\0';
len--;
- fwts_log_info_verbatum(fw, " KLog: %s", start);
+ fwts_log_info_verbatim(fw, " KLog: %s", start);
}
}
} else {
@@ -902,7 +902,7 @@ static void uefidump_info_secure_boot(fwts_framework *fw, fwts_uefi_var *var)
mode = "";
break;
}
- fwts_log_info_verbatum(fw, " Value: 0x%2.2x%s", value, mode);
+ fwts_log_info_verbatim(fw, " Value: 0x%2.2x%s", value, mode);
}
}
@@ -926,7 +926,7 @@ static void uefidump_info_setup_mode(fwts_framework *fw, fwts_uefi_var *var)
mode = "";
break;
}
- fwts_log_info_verbatum(fw, " Value: 0x%2.2" PRIx8 "%s", value, mode);
+ fwts_log_info_verbatim(fw, " Value: 0x%2.2" PRIx8 "%s", value, mode);
}
}
@@ -954,7 +954,7 @@ static void uefidump_info_morc(fwts_framework *fw, fwts_uefi_var *var)
mode = "";
break;
}
- fwts_log_info_verbatum(fw, " Value: 0x%2.2" PRIx8 "%s", value, mode);
+ fwts_log_info_verbatim(fw, " Value: 0x%2.2" PRIx8 "%s", value, mode);
}
}
@@ -970,7 +970,7 @@ static void uefidump_info_acpi_global_variable(fwts_framework *fw, fwts_uefi_var
uint64_t value;
memcpy(&value, var->data, sizeof(uint64_t));
- fwts_log_info_verbatum(fw, " ACPI Global Variable Address: 0x%16.16" PRIx64, value);
+ fwts_log_info_verbatim(fw, " ACPI Global Variable Address: 0x%16.16" PRIx64, value);
}
}
@@ -988,11 +988,11 @@ static void uefidump_info_signature_support(fwts_framework *fw, fwts_uefi_var *v
char guid_str[37];
if (var->datalen)
- fwts_log_info_verbatum(fw, " Signature GUIDs:");
+ fwts_log_info_verbatim(fw, " Signature GUIDs:");
while (data - var->data < (ptrdiff_t)var->datalen) {
fwts_guid_buf_to_str(data, guid_str, sizeof(guid_str));
- fwts_log_info_verbatum(fw, " %s", guid_str);
+ fwts_log_info_verbatim(fw, " %s", guid_str);
data += 16;
}
}
@@ -1018,7 +1018,7 @@ static void uefidump_info_hwerrrec_support(fwts_framework *fw, fwts_uefi_var *va
support = " (reserved value)";
break;
}
- fwts_log_info_verbatum(fw, " Value: 0x%4.4" PRIx16 "%s", *value, support);
+ fwts_log_info_verbatim(fw, " Value: 0x%4.4" PRIx16 "%s", *value, support);
}
}
@@ -1061,7 +1061,7 @@ static void uefidump_info_osindications_supported(fwts_framework *fw, fwts_uefi_
strcat(str, "EFI_OS_INDICATIONS_CAPSULE_RESULT_VAR_SUPPORTED");
}
- fwts_log_info_verbatum(fw, " Value: 0x%16.16" PRIx64 " (%s)", value, str);
+ fwts_log_info_verbatim(fw, " Value: 0x%16.16" PRIx64 " (%s)", value, str);
}
}
@@ -1070,7 +1070,7 @@ static void uefidump_info_vendor_keys(fwts_framework *fw, fwts_uefi_var *var)
if (var->datalen >= sizeof(uint8_t)) {
uint8_t value = (uint8_t)var->data[0];
- fwts_log_info_verbatum(fw, " Value: 0x%2.2" PRIx8, value);
+ fwts_log_info_verbatim(fw, " Value: 0x%2.2" PRIx8, value);
}
}
@@ -1084,7 +1084,7 @@ static void uefidump_info_driverorder(fwts_framework *fw, fwts_uefi_var *var)
str = uefidump_vprintf(str, "0x%04" PRIx16 "%s",
*data++, i < (n - 1) ? "," : "");
}
- fwts_log_info_verbatum(fw, " Driver Order: %s", str);
+ fwts_log_info_verbatim(fw, " Driver Order: %s", str);
free(str);
}
@@ -1098,7 +1098,7 @@ static void uefidump_info_driverdev(fwts_framework *fw, fwts_uefi_var *var)
return;
load_option = (fwts_uefi_load_option *)var->data;
- fwts_log_info_verbatum(fw, " Force Reconnect: %s\n",
+ fwts_log_info_verbatim(fw, " Force Reconnect: %s\n",
(load_option->attributes & FWTS_UEFI_LOAD_OPTION_FORCE_RECONNECT) ? "Yes" : "No");
len = fwts_uefi_str16len(load_option->description);
@@ -1106,7 +1106,7 @@ static void uefidump_info_driverdev(fwts_framework *fw, fwts_uefi_var *var)
char *tmp = malloc(len + 1);
if (tmp) {
fwts_uefi_str16_to_str(tmp, len + 1, load_option->description);
- fwts_log_info_verbatum(fw, " Info: %s\n", tmp);
+ fwts_log_info_verbatim(fw, " Info: %s\n", tmp);
free(tmp);
}
}
@@ -1120,7 +1120,7 @@ static void uefidump_info_driverdev(fwts_framework *fw, fwts_uefi_var *var)
(sizeof(uint16_t) * (len + 1));
path = uefidump_build_dev_path(NULL,
(fwts_uefi_dev_path *)(var->data + offset), var->datalen - offset);
- fwts_log_info_verbatum(fw, " Path: %s", path);
+ fwts_log_info_verbatim(fw, " Path: %s", path);
free(path);
}
@@ -1129,7 +1129,7 @@ static void uefidump_info_driverdev(fwts_framework *fw, fwts_uefi_var *var)
(sizeof(uint16_t) * (len + 1)) +
load_option->file_path_list_length;
if ((var->datalen - offset) > 0) {
- fwts_log_info_verbatum(fw, " OptionalData:");
+ fwts_log_info_verbatim(fw, " OptionalData:");
uefidump_data_hexdump(fw, var->data + offset, var->datalen - offset);
}
}
@@ -1182,17 +1182,17 @@ static void uefidump_info_keyoption(fwts_framework *fw, fwts_uefi_var *var)
}
if (*str != 0)
- fwts_log_info_verbatum(fw, " PackedValue: 0x%8.8" PRIx32 " (%s)", key_option->keydata, str);
+ fwts_log_info_verbatim(fw, " PackedValue: 0x%8.8" PRIx32 " (%s)", key_option->keydata, str);
else
- fwts_log_info_verbatum(fw, " PackedValue: 0x%8.8" PRIx32, key_option->keydata);
+ fwts_log_info_verbatim(fw, " PackedValue: 0x%8.8" PRIx32, key_option->keydata);
- fwts_log_info_verbatum(fw, " BootOptionCrc: 0x%8.8" PRIx32, key_option->bootoptioncrc);
- fwts_log_info_verbatum(fw, " BootOption: %4.4" PRIx16, key_option->bootoption);
+ fwts_log_info_verbatim(fw, " BootOptionCrc: 0x%8.8" PRIx32, key_option->bootoptioncrc);
+ fwts_log_info_verbatim(fw, " BootOption: %4.4" PRIx16, key_option->bootoption);
inputkeycount = (key_option->keydata & 0xC0000000) >> 30;
for (index = 0; index < inputkeycount; index++) {
- fwts_log_info_verbatum(fw, " ScanCode: 0x%4.4" PRIx16, inputkey[index].scancode);
- fwts_log_info_verbatum(fw, " UnicodeChar: 0x%4.4" PRIx16, inputkey[index].unicodechar);
+ fwts_log_info_verbatim(fw, " ScanCode: 0x%4.4" PRIx16, inputkey[index].scancode);
+ fwts_log_info_verbatim(fw, " UnicodeChar: 0x%4.4" PRIx16, inputkey[index].unicodechar);
}
keyoptionsize = sizeof (fwts_uefi_key_option) + inputkeycount * sizeof (fwts_uefi_input_key);
@@ -1252,28 +1252,28 @@ static void uefidump_info_signaturedatabase(fwts_framework *fw, fwts_uefi_var *v
break;
}
- fwts_log_info_verbatum(fw, " SignatureType: %s (%s)", guid_str, str);
- fwts_log_info_verbatum(fw, " SignatureListSize: 0x%" PRIx32, signature_list->signaturelistsize);
- fwts_log_info_verbatum(fw, " SignatureHeaderSize: 0x%" PRIx32, signature_list->signatureheadersize);
- fwts_log_info_verbatum(fw, " SignatureSize: 0x%" PRIx32, signature_list->signaturesize);
+ fwts_log_info_verbatim(fw, " SignatureType: %s (%s)", guid_str, str);
+ fwts_log_info_verbatim(fw, " SignatureListSize: 0x%" PRIx32, signature_list->signaturelistsize);
+ fwts_log_info_verbatim(fw, " SignatureHeaderSize: 0x%" PRIx32, signature_list->signatureheadersize);
+ fwts_log_info_verbatim(fw, " SignatureSize: 0x%" PRIx32, signature_list->signaturesize);
offset = list_start + sizeof (fwts_uefi_signature_list);
if (signature_list->signatureheadersize > 0) {
- fwts_log_info_verbatum(fw, " SignatureHeader:");
+ fwts_log_info_verbatim(fw, " SignatureHeader:");
uefidump_data_hexdump(fw, (uint8_t *)(var->data + offset), signature_list->signatureheadersize);
}
offset += signature_list->signatureheadersize;
while ((signature_list->signaturelistsize - offset + list_start) > 0) {
if ((signature_list->signaturelistsize - offset + list_start) >= signature_list->signaturesize) {
fwts_guid_buf_to_str((uint8_t *)(var->data + offset), guid_str, sizeof(guid_str));
- fwts_log_info_verbatum(fw, " SignatureOwner: %s", guid_str);
+ fwts_log_info_verbatim(fw, " SignatureOwner: %s", guid_str);
offset += sizeof(fwts_uefi_guid);
- fwts_log_info_verbatum(fw, " SignatureData:");
+ fwts_log_info_verbatim(fw, " SignatureData:");
uefidump_data_hexdump(fw, (uint8_t *)(var->data + offset), signature_list->signaturesize - sizeof(fwts_uefi_guid));
offset += signature_list->signaturesize - sizeof(fwts_uefi_guid);
} else {
/* have Signature data left, but not correspond to the SignatureSize, just dump raw data */
- fwts_log_info_verbatum(fw, " Data:");
+ fwts_log_info_verbatim(fw, " Data:");
uefidump_data_hexdump(fw, (uint8_t *)(var->data + offset), (signature_list->signaturelistsize - offset + list_start));
break;
}
@@ -1305,7 +1305,7 @@ static void uefidump_info_audit_mode(fwts_framework *fw, fwts_uefi_var *var)
mode = "";
break;
}
- fwts_log_info_verbatum(fw, " Value: 0x%2.2x%s", value, mode);
+ fwts_log_info_verbatim(fw, " Value: 0x%2.2x%s", value, mode);
}
}
@@ -1329,7 +1329,7 @@ static void uefidump_info_deployed_mode(fwts_framework *fw, fwts_uefi_var *var)
mode = "";
break;
}
- fwts_log_info_verbatum(fw, " Value: 0x%2.2x%s", value, mode);
+ fwts_log_info_verbatim(fw, " Value: 0x%2.2x%s", value, mode);
}
}
@@ -1344,11 +1344,11 @@ static void uefidump_info_osrecoverorder(fwts_framework *fw, fwts_uefi_var *var)
char guid_str[37];
if (var->datalen)
- fwts_log_info_verbatum(fw, " OSRecoveryOrder GUIDs:");
+ fwts_log_info_verbatim(fw, " OSRecoveryOrder GUIDs:");
while (data - var->data < (ptrdiff_t)var->datalen) {
fwts_guid_buf_to_str(data, guid_str, sizeof(guid_str));
- fwts_log_info_verbatum(fw, " %s", guid_str);
+ fwts_log_info_verbatim(fw, " %s", guid_str);
data += 16;
}
}
@@ -1365,7 +1365,7 @@ static void uefidump_info_syspreporder(fwts_framework *fw, fwts_uefi_var *var)
str = uefidump_vprintf(str, "0x%04" PRIx16 "%s",
*data++, i < (n - 1) ? "," : "");
}
- fwts_log_info_verbatum(fw, " SysPrep Order: %s", str);
+ fwts_log_info_verbatim(fw, " SysPrep Order: %s", str);
free(str);
}
@@ -1414,10 +1414,10 @@ static void uefidump_var(fwts_framework *fw, fwts_uefi_var *var)
fwts_uefi_get_varname(varname, sizeof(varname), var);
- fwts_log_info_verbatum(fw, "Name: %s", varname);
+ fwts_log_info_verbatim(fw, "Name: %s", varname);
fwts_guid_buf_to_str(var->guid, guid_str, sizeof(guid_str));
- fwts_log_info_verbatum(fw, " GUID: %s", guid_str);
- fwts_log_info_verbatum(fw, " Attr: 0x%x (%s)", var->attributes, fwts_uefi_attribute_info(var->attributes));
+ fwts_log_info_verbatim(fw, " GUID: %s", guid_str);
+ fwts_log_info_verbatim(fw, " Attr: 0x%x (%s)", var->attributes, fwts_uefi_attribute_info(var->attributes));
/* If we've got an appropriate per variable dump mechanism, use this */
for (info = uefidump_info_table; info->description != NULL; info++) {
diff --git a/src/uefi/uefivarinfo/uefivarinfo.c b/src/uefi/uefivarinfo/uefivarinfo.c
index 1ae97b0..005e3a1 100644
--- a/src/uefi/uefivarinfo/uefivarinfo.c
+++ b/src/uefi/uefivarinfo/uefivarinfo.c
@@ -223,14 +223,14 @@ static int uefivarinfo_test1(fwts_framework *fw)
}
}
- fwts_log_info_verbatum(fw, "UEFI NVRAM storage:");
- fwts_log_info_verbatum(fw, " Maximum storage: %8" PRIu64 " bytes", maxvarstoragesize);
- fwts_log_info_verbatum(fw, " Remaining storage: %8" PRIu64 " bytes", remvarstoragesize);
- fwts_log_info_verbatum(fw, " Maximum variable size: %8" PRIu64 " bytes", maxvariablesize);
+ fwts_log_info_verbatim(fw, "UEFI NVRAM storage:");
+ fwts_log_info_verbatim(fw, " Maximum storage: %8" PRIu64 " bytes", maxvarstoragesize);
+ fwts_log_info_verbatim(fw, " Remaining storage: %8" PRIu64 " bytes", remvarstoragesize);
+ fwts_log_info_verbatim(fw, " Maximum variable size: %8" PRIu64 " bytes", maxvariablesize);
if (do_checkvariables(fw, &usedvars, &usedvarssize, maxvariablesize) == FWTS_OK) {
- fwts_log_info_verbatum(fw, "Currently used:");
- fwts_log_info_verbatum(fw, " %" PRIu64 " variables, storage used: %" PRIu64 " bytes", usedvars, usedvarssize);
+ fwts_log_info_verbatim(fw, "Currently used:");
+ fwts_log_info_verbatim(fw, " %" PRIu64 " variables, storage used: %" PRIu64 " bytes", usedvars, usedvarssize);
}
return FWTS_OK;
--
2.8.1
More information about the fwts-devel
mailing list