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.diff -r1.1294 -r1.1295 src/sys/conf/files
(riastradh)
--- src/sys/conf/files 2022/01/17 16:33:00 1.1294
+++ src/sys/conf/files 2022/02/16 20:14:30 1.1295
| @@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
| 1 | # $NetBSD: files,v 1.1294 2022/01/17 16:33:00 thorpej Exp $ | 1 | # $NetBSD: files,v 1.1295 2022/02/16 20:14:30 riastradh Exp $ | |
| 2 | # @(#)files.newconf 7.5 (Berkeley) 5/10/93 | 2 | # @(#)files.newconf 7.5 (Berkeley) 5/10/93 | |
| 3 | 3 | |||
| 4 | version 20171118 | 4 | version 20171118 | |
| 5 | 5 | |||
| 6 | # | 6 | # | |
| 7 | # device classes | 7 | # device classes | |
| 8 | # | 8 | # | |
| 9 | devclass disk | 9 | devclass disk | |
| 10 | devclass tape | 10 | devclass tape | |
| 11 | devclass ifnet | 11 | devclass ifnet | |
| 12 | devclass tty | 12 | devclass tty | |
| 13 | devclass audiodev | 13 | devclass audiodev | |
| 14 | devclass displaydev | 14 | devclass displaydev | |
| @@ -1630,17 +1630,24 @@ include "dev/iscsi/files.iscsi" | @@ -1630,17 +1630,24 @@ include "dev/iscsi/files.iscsi" | |||
| 1630 | include "dev/ic/files.athn" | 1630 | include "dev/ic/files.athn" | |
| 1631 | 1631 | |||
| 1632 | # | 1632 | # | |
| 1633 | # MI clk api | 1633 | # MI clk api | |
| 1634 | # | 1634 | # | |
| 1635 | include "dev/clk/files.clk" | 1635 | include "dev/clk/files.clk" | |
| 1636 | 1636 | |||
| 1637 | # | 1637 | # | |
| 1638 | # Flattened Device Tree (FDT) support | 1638 | # Flattened Device Tree (FDT) support | |
| 1639 | # | 1639 | # | |
| 1640 | include "dev/ofw/files.ofw" | 1640 | include "dev/ofw/files.ofw" | |
| 1641 | include "dev/fdt/files.fdt" | 1641 | include "dev/fdt/files.fdt" | |
| 1642 | 1642 | |||
| 1643 | ||||
| 1644 | ## ACPI -- this should be dev/acpi/files.acpi, but that currently has | |||
| 1645 | # some MD parts. Having this here allows conditionals on NACPICA in | |||
| 1646 | # acpica.h, at least. | |||
| 1647 | # | |||
| 1648 | include "dev/acpi/acpica/files.acpica" | |||
| 1649 | ||||
| 1643 | # | 1650 | # | |
| 1644 | # Name value library | 1651 | # Name value library | |
| 1645 | # | 1652 | # | |
| 1646 | include "external/bsd/libnv/conf/files.libnv" | 1653 | include "external/bsd/libnv/conf/files.libnv" |
--- src/sys/dev/acpi/files.acpi 2022/01/09 15:05:16 1.123
+++ src/sys/dev/acpi/files.acpi 2022/02/16 20:14:30 1.124
| @@ -1,16 +1,14 @@ | @@ -1,16 +1,14 @@ | |||
| 1 | # $NetBSD: files.acpi,v 1.123 2022/01/09 15:05:16 jmcneill Exp $ | 1 | # $NetBSD: files.acpi,v 1.124 2022/02/16 20:14:30 riastradh Exp $ | |
| 2 | ||||
| 3 | include "dev/acpi/acpica/files.acpica" | |||
| 4 | 2 | |||
| 5 | defflag opt_acpi.h ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV | 3 | defflag opt_acpi.h ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV | |
| 6 | ACPI_DSDT_OVERRIDE ACPI_SCANPCI ACPI_BREAKPOINT | 4 | ACPI_DSDT_OVERRIDE ACPI_SCANPCI ACPI_BREAKPOINT | |
| 7 | ACPI_REDUCED_HW ACPI__DIS_IS_BROKEN | 5 | ACPI_REDUCED_HW ACPI__DIS_IS_BROKEN | |
| 8 | defparam opt_acpi.h ACPI_DSDT_FILE := "\"/dev/null\"" | 6 | defparam opt_acpi.h ACPI_DSDT_FILE := "\"/dev/null\"" | |
| 9 | defparam opt_acpi.h ACPI_BLACKLIST_YEAR = 2000 | 7 | defparam opt_acpi.h ACPI_BLACKLIST_YEAR = 2000 | |
| 10 | 8 | |||
| 11 | define acpiapmbus { } | 9 | define acpiapmbus { } | |
| 12 | define acpinodebus { } | 10 | define acpinodebus { } | |
| 13 | define acpiecdtbus { } | 11 | define acpiecdtbus { } | |
| 14 | define acpihpetbus { } | 12 | define acpihpetbus { } | |
| 15 | define acpiwdrtbus { } | 13 | define acpiwdrtbus { } | |
| 16 | define acpisdtbus { } | 14 | define acpisdtbus { } |