Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/acpitools/acpidump acpidump: Do not print FACS if H...



details:   https://anonhg.NetBSD.org/src/rev/42545bf283f6
branches:  trunk
changeset: 957676:42545bf283f6
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Dec 06 18:38:58 2020 +0000

description:
acpidump: Do not print FACS if HW_REDUCED flag is set.

According to ACPI 6.3 spec, FACS is optional when HW_REDUCED is set. ACPICA
ignores the FACS completely when HW_REDUCED is set, so we need to follow
suit since it is not available through /dev/acpi as the table is not
installed.

diffstat:

 usr.sbin/acpitools/acpidump/acpi.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5f7cc313ecc3 -r 42545bf283f6 usr.sbin/acpitools/acpidump/acpi.c
--- a/usr.sbin/acpitools/acpidump/acpi.c        Sun Dec 06 18:37:04 2020 +0000
+++ b/usr.sbin/acpitools/acpidump/acpi.c        Sun Dec 06 18:38:58 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.46 2019/06/22 12:39:40 maxv Exp $ */
+/* $NetBSD: acpi.c,v 1.47 2020/12/06 18:38:58 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: acpi.c,v 1.46 2019/06/22 12:39:40 maxv Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.47 2020/12/06 18:38:58 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
@@ -836,7 +836,7 @@
        if (acpi_select_address(fadt->Facs, fadt->XFacs) == 0) {
                if ((fadt->Flags & ACPI_FADT_HW_REDUCED) == 0)
                        errx(EXIT_FAILURE, "Missing FACS and HW_REDUCED_ACPI flag not set in FADT");
-       } else {
+       } else if ((fadt->Flags & ACPI_FADT_HW_REDUCED) == 0) {
                facs = (ACPI_TABLE_FACS *)acpi_map_sdt(
                        acpi_select_address(fadt->Facs, fadt->XFacs));
                if (memcmp(facs->Signature, ACPI_SIG_FACS, 4) != 0 || facs->Length < 64)



Home | Main Index | Thread Index | Old Index