Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
riastradh 2022-02-16 20:14:30 +00:00
parent d462db96df
commit 3cbfb035d0
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/conf/files
View File

@ -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/clk/files.clk"
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
#

4
sys/dev/acpi/files.acpi
View File

@ -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