Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys sys: Include files.acpica unconditionally.
details: https://anonhg.NetBSD.org/src/rev/6e310135f18d
branches: trunk
changeset: 361590:6e310135f18d
user: riastradh <riastradh%NetBSD.org@localhost>
date: Wed Feb 16 20:14:30 2022 +0000
description:
sys: Include files.acpica unconditionally.
This way acpica.h always exists unconditionally, so MI code can be
conditional on NACPICA.
It is not great to have such conditionals, but it's better to have
#include "acpica.h"
#ifdef NACPICA > 0
than to have
#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
#include "acpica.h"
#endif
#ifdef NACPICA > 0
and we can still grep for NACPICA to find places that could be
factored better.
diffstat:
sys/conf/files | 9 ++++++++-
sys/dev/acpi/files.acpi | 4 +---
2 files changed, 9 insertions(+), 4 deletions(-)
diffs (34 lines):
diff -r 0b37f7bc959f -r 6e310135f18d sys/conf/files
--- a/sys/conf/files Wed Feb 16 20:14:06 2022 +0000
+++ b/sys/conf/files Wed Feb 16 20:14:30 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1294 2022/01/17 16:33:00 thorpej Exp $
+# $NetBSD: files,v 1.1295 2022/02/16 20:14:30 riastradh Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1640,6 +1640,13 @@
include "dev/ofw/files.ofw"
include "dev/fdt/files.fdt"
+
+## ACPI -- this should be dev/acpi/files.acpi, but that currently has
+# some MD parts. Having this here allows conditionals on NACPICA in
+# acpica.h, at least.
+#
+include "dev/acpi/acpica/files.acpica"
+
#
# Name value library
#
diff -r 0b37f7bc959f -r 6e310135f18d sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi Wed Feb 16 20:14:06 2022 +0000
+++ b/sys/dev/acpi/files.acpi Wed Feb 16 20:14:30 2022 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: files.acpi,v 1.123 2022/01/09 15:05:16 jmcneill Exp $
-
-include "dev/acpi/acpica/files.acpica"
+# $NetBSD: files.acpi,v 1.124 2022/02/16 20:14:30 riastradh Exp $
defflag opt_acpi.h ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV
ACPI_DSDT_OVERRIDE ACPI_SCANPCI ACPI_BREAKPOINT
Home |
Main Index |
Thread Index |
Old Index