Module Name:    src
Committed By:   jmcneill
Date:           Fri Sep  3 11:59:29 UTC 2021

Modified Files:
        src/sys/external/bsd/acpica/dist/include/platform: acnetbsd.h
        src/sys/external/bsd/acpica/dist/utilities: utxferror.c

Log Message:
Suppress table loading messages if AB_QUIET or AB_SILENT flags are set.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
    src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
cvs rdiff -u -r1.1.1.14 -r1.2 \
    src/sys/external/bsd/acpica/dist/utilities/utxferror.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
diff -u src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.22 src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.23
--- src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.22	Sat Apr  3 17:45:03 2021
+++ src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h	Fri Sep  3 11:59:28 2021
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acnetbsd.h - OS specific defines, etc.
- *       $Revision: 1.22 $
+ *       $Revision: 1.23 $
  *
  *****************************************************************************/
 
@@ -65,6 +65,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/reboot.h>
 #include <sys/endian.h>
 #include <dev/acpi/acpica/acpi_func.h>
 
@@ -144,4 +145,8 @@
 #define ACPI_USE_NATIVE_DIVIDE
 #define ACPI_USE_NATIVE_MATH64
 
+/* Suppress ACPI_INFO level log messages when this is true */
+#define	ACPI_QUIET_BOOT	\
+	((boothowto & (AB_QUIET|AB_SILENT)) != 0)
+
 #endif /* __ACNETBSD_H__ */

Index: src/sys/external/bsd/acpica/dist/utilities/utxferror.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utxferror.c:1.1.1.14 src/sys/external/bsd/acpica/dist/utilities/utxferror.c:1.2
--- src/sys/external/bsd/acpica/dist/utilities/utxferror.c:1.1.1.14	Sat Apr  3 17:43:37 2021
+++ src/sys/external/bsd/acpica/dist/utilities/utxferror.c	Fri Sep  3 11:59:29 2021
@@ -206,6 +206,11 @@ AcpiInfo (
 {
     va_list                 ArgList;
 
+#if defined(ACPI_QUIET_BOOT)
+    if (ACPI_QUIET_BOOT) {
+        return;
+    }
+#endif
 
     ACPI_MSG_REDIRECT_BEGIN;
     AcpiOsPrintf (ACPI_MSG_INFO);

Reply via email to