[src/trunk]: src/sys Rename options ACPI_REDUCED_HARDWARE to ACPI_REDUCED_HW....

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b59ce22ca291
branches:  trunk
changeset: 445179:b59ce22ca291
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Oct 16 10:25:33 2018 +0000

description:
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.

diffstat:

 sys/arch/evbarm/conf/std.generic64                       |   4 ++--
 sys/dev/acpi/acpi.c                                      |   6 +++---
 sys/dev/acpi/acpi_timer.c                                |  12 ++++++------
 sys/dev/acpi/files.acpi                                  |   4 ++--
 sys/external/bsd/acpica/dist/include/platform/acnetbsd.h |   6 +++++-
 5 files changed, 18 insertions(+), 14 deletions(-)

diffs (138 lines):

diff -r d875d4d83495 -r b59ce22ca291 sys/arch/evbarm/conf/std.generic64
--- a/sys/arch/evbarm/conf/std.generic64        Tue Oct 16 09:23:29 2018 +0000
+++ b/sys/arch/evbarm/conf/std.generic64        Tue Oct 16 10:25:33 2018 +0000
@@ -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 @@
 # 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
diff -r d875d4d83495 -r b59ce22ca291 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Tue Oct 16 09:23:29 2018 +0000
+++ b/sys/dev/acpi/acpi.c       Tue Oct 16 10:25:33 2018 +0000
@@ -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 @@
                        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
 
diff -r d875d4d83495 -r b59ce22ca291 sys/dev/acpi/acpi_timer.c
--- a/sys/dev/acpi/acpi_timer.c Tue Oct 16 09:23:29 2018 +0000
+++ b/sys/dev/acpi/acpi_timer.c Tue Oct 16 10:25:33 2018 +0000
@@ -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 <drochner%NetBSD.org@localhost>
@@ -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 @@
 
 #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 @@
 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 @@
 int
 acpitimer_detach(void)
 {
-#if !defined(ACPI_REDUCED_HARDWARE)
+#if (!ACPI_REDUCED_HARDWARE)
        if (!acpitimer_supported())
                return -1;
 
@@ -112,7 +112,7 @@
 #endif
 }
 
-#if !defined(ACPI_REDUCED_HARDWARE)
+#if (!ACPI_REDUCED_HARDWARE)
 u_int
 acpitimer_read_fast(struct timecounter *tc)
 {
diff -r d875d4d83495 -r b59ce22ca291 sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi   Tue Oct 16 09:23:29 2018 +0000
+++ b/sys/dev/acpi/files.acpi   Tue Oct 16 10:25:33 2018 +0000
@@ -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
 
diff -r d875d4d83495 -r b59ce22ca291 sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
--- a/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h  Tue Oct 16 09:23:29 2018 +0000
+++ b/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h  Tue Oct 16 10:25:33 2018 +0000
@@ -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>