From 35e39fd95fda64699b638192f3bab955d0f1cf0c Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Fri, 5 Feb 2021 10:07:37 -0500 Subject: [PATCH] Improve ACPI_NFIT_CONTROL_REGION formatting. MFC after: 1 week --- usr.sbin/acpi/acpidump/acpi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index c573c02b7f92..2753fb26bdd9 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1659,20 +1659,20 @@ acpi_print_nfit(ACPI_NFIT_HEADER *nfit) printf("\tRegionIndex=%u\n", (u_int)ctlreg->RegionIndex); printf("\tVendorId=0x%04x\n", (u_int)ctlreg->VendorId); printf("\tDeviceId=0x%04x\n", (u_int)ctlreg->DeviceId); - printf("\tRevisionId=%u\n", (u_int)ctlreg->RevisionId); + printf("\tRevisionId=0x%02x\n", (u_int)ctlreg->RevisionId); printf("\tSubsystemVendorId=0x%04x\n", (u_int)ctlreg->SubsystemVendorId); printf("\tSubsystemDeviceId=0x%04x\n", (u_int)ctlreg->SubsystemDeviceId); - printf("\tSubsystemRevisionId=%u\n", + printf("\tSubsystemRevisionId=0x%02x\n", (u_int)ctlreg->SubsystemRevisionId); printf("\tValidFields=0x%02x\n", (u_int)ctlreg->ValidFields); - printf("\tManufacturingLocation=%u\n", + printf("\tManufacturingLocation=0x%02x\n", (u_int)ctlreg->ManufacturingLocation); - printf("\tManufacturingDate=%u\n", - (u_int)ctlreg->ManufacturingDate); - printf("\tSerialNumber=%u\n", - (u_int)ctlreg->SerialNumber); + printf("\tManufacturingDate=%04x\n", + (u_int)be16toh(ctlreg->ManufacturingDate)); + printf("\tSerialNumber=%08X\n", + (u_int)be32toh(ctlreg->SerialNumber)); printf("\tCode=0x%04x\n", (u_int)ctlreg->Code); printf("\tWindows=%u\n", (u_int)ctlreg->Windows); printf("\tWindowSize=0x%016jx\n",