Module Name: src
Committed By: jmcneill
Date: Tue Oct 16 10:25:33 UTC 2018
Modified Files:
src/sys/arch/evbarm/conf: std.generic64
src/sys/dev/acpi: acpi.c acpi_timer.c files.acpi
src/sys/external/bsd/acpica/dist/include/platform: acnetbsd.h
Log Message:
Rename options ACPI_REDUCED_HARDWARE to ACPI_REDUCED_HW. The former is
a boolean in the acpica build, so use the latter to select the correct
value.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/std.generic64
cvs rdiff -u -r1.275 -r1.276 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/acpi/acpi_timer.c
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/std.generic64
diff -u src/sys/arch/evbarm/conf/std.generic64:1.6 src/sys/arch/evbarm/conf/std.generic64:1.7
--- src/sys/arch/evbarm/conf/std.generic64:1.6 Tue Oct 16 00:32:07 2018
+++ src/sys/arch/evbarm/conf/std.generic64 Tue Oct 16 10:25:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.generic64,v 1.6 2018/10/16 00:32:07 jmcneill Exp $
+# $NetBSD: std.generic64,v 1.7 2018/10/16 10:25:33 jmcneill Exp $
#
# generic NetBSD/evbarm64 with FDT support
@@ -9,7 +9,7 @@ include "arch/aarch64/conf/std.aarch64"
# Architecture options
options AARCH64
-options ACPI_REDUCED_HARDWARE
+options ACPI_REDUCED_HW
options ARM_GENERIC_TODR
options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
options DRAM_BLOCKS=256
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.275 src/sys/dev/acpi/acpi.c:1.276
--- src/sys/dev/acpi/acpi.c:1.275 Tue Oct 16 00:30:08 2018
+++ src/sys/dev/acpi/acpi.c Tue Oct 16 10:25:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.275 2018/10/16 00:30:08 jmcneill Exp $ */
+/* $NetBSD: acpi.c,v 1.276 2018/10/16 10:25:33 jmcneill Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.275 2018/10/16 00:30:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.276 2018/10/16 10:25:33 jmcneill Exp $");
#include "pci.h"
#include "opt_acpi.h"
@@ -1410,7 +1410,7 @@ acpi_enter_sleep_state(int state)
AcpiClearEvent(ACPI_EVENT_POWER_BUTTON);
AcpiClearEvent(ACPI_EVENT_SLEEP_BUTTON);
AcpiClearEvent(ACPI_EVENT_RTC);
-#if !defined(ACPI_REDUCED_HARDWARE)
+#if (!ACPI_REDUCED_HARDWARE)
AcpiHwDisableAllGpes();
#endif
Index: src/sys/dev/acpi/acpi_timer.c
diff -u src/sys/dev/acpi/acpi_timer.c:1.24 src/sys/dev/acpi/acpi_timer.c:1.25
--- src/sys/dev/acpi/acpi_timer.c:1.24 Tue Oct 16 00:30:08 2018
+++ src/sys/dev/acpi/acpi_timer.c Tue Oct 16 10:25:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_timer.c,v 1.24 2018/10/16 00:30:08 jmcneill Exp $ */
+/* $NetBSD: acpi_timer.c,v 1.25 2018/10/16 10:25:33 jmcneill Exp $ */
/*-
* Copyright (c) 2006 Matthias Drochner <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.24 2018/10/16 00:30:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.25 2018/10/16 10:25:33 jmcneill Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_timer.c
#include <machine/acpi_machdep.h>
-#if !defined(ACPI_REDUCED_HARDWARE)
+#if (!ACPI_REDUCED_HARDWARE)
static int acpitimer_test(void);
static struct timecounter acpi_timecounter = {
@@ -63,7 +63,7 @@ acpitimer_supported(void)
int
acpitimer_init(struct acpi_softc *sc)
{
-#if !defined(ACPI_REDUCED_HARDWARE)
+#if (!ACPI_REDUCED_HARDWARE)
ACPI_STATUS rv;
uint32_t bits;
int i, j;
@@ -102,7 +102,7 @@ acpitimer_init(struct acpi_softc *sc)
int
acpitimer_detach(void)
{
-#if !defined(ACPI_REDUCED_HARDWARE)
+#if (!ACPI_REDUCED_HARDWARE)
if (!acpitimer_supported())
return -1;
@@ -112,7 +112,7 @@ acpitimer_detach(void)
#endif
}
-#if !defined(ACPI_REDUCED_HARDWARE)
+#if (!ACPI_REDUCED_HARDWARE)
u_int
acpitimer_read_fast(struct timecounter *tc)
{
Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.105 src/sys/dev/acpi/files.acpi:1.106
--- src/sys/dev/acpi/files.acpi:1.105 Tue Oct 16 00:30:08 2018
+++ src/sys/dev/acpi/files.acpi Tue Oct 16 10:25:33 2018
@@ -1,10 +1,10 @@
-# $NetBSD: files.acpi,v 1.105 2018/10/16 00:30:08 jmcneill Exp $
+# $NetBSD: files.acpi,v 1.106 2018/10/16 10:25:33 jmcneill Exp $
include "dev/acpi/acpica/files.acpica"
defflag opt_acpi.h ACPIVERBOSE ACPI_DEBUG ACPI_ACTIVATE_DEV
ACPI_DSDT_OVERRIDE ACPI_SCANPCI ACPI_BREAKPOINT
- ACPI_REDUCED_HARDWARE ACPI__DIS_IS_BROKEN
+ ACPI_REDUCED_HW ACPI__DIS_IS_BROKEN
defparam opt_acpi.h ACPI_DSDT_FILE := "\"/dev/null\""
defparam opt_acpi.h ACPI_BLACKLIST_YEAR = 2000
Index: src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
diff -u src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.17 src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.18
--- src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.17 Sat Apr 7 15:49:51 2018
+++ src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h Tue Oct 16 10:25:33 2018
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acnetbsd.h - OS specific defines, etc.
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
*****************************************************************************/
@@ -114,6 +114,10 @@
#endif /* DDB */
#endif /* ACPI_DEBUG */
+#ifdef ACPI_REDUCED_HW
+#define ACPI_REDUCED_HARDWARE TRUE
+#endif /* ACPI_REDUCED_HW */
+
#else /* defined(_KERNEL) || defined(_STANDALONE) */
#include <ctype.h>
