 @@ -1,25 +1,25 @@
-#	$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
 machine		evbarm aarch64
 include		"conf/std"
 include		"arch/aarch64/conf/std.aarch64"	# arch standard options
 # 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
 options 	EVBARM_BOARDTYPE="FDT"
 options 	FDT				# Flattened Device Tree support
 options 	FPU_VFP
 options 	PCI_NETBSD_CONFIGURE
 options 	__HAVE_PCI_CONF_HOOK
 # XXXNH not yet
 #options 	__HAVE_CPU_UAREA_ALLOC_IDLELWP
 #options 	MODULAR
 #options 	MODULAR_DEFAULT_AUTOLOAD

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum of By Noon Software, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -90,27 +90,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include "opt_pcifixup.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 @@ -1400,27 +1400,27 @@ acpi_enter_sleep_state(int state)
 			if (ACPI_FAILURE(rv))
 				aprint_error_dev(sc->sc_dev, "failed to "
 				    "enter S1: %s\n", AcpiFormatException(rv));
 			/*
 			 * Clear fixed events and disable all GPEs before
 			 * interrupts are enabled.
 			 */
 			AcpiClearEvent(ACPI_EVENT_PMTIMER);
 			AcpiClearEvent(ACPI_EVENT_GLOBAL);
 			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
 			acpi_md_OsEnableInterrupt();
 			rv = AcpiLeaveSleepState(state);
 		} else {
 			(void)acpi_md_sleep(state);
 			if (state == ACPI_STATE_S4)
 				AcpiEnable();

 @@ -1,14 +1,14 @@
-/* $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>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,63 +17,63 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/time.h>
 #include <sys/timetc.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_timer.h>
 #include <machine/acpi_machdep.h>
-#if !defined(ACPI_REDUCED_HARDWARE)
+#if (!ACPI_REDUCED_HARDWARE)
 static int	acpitimer_test(void);
 static struct timecounter acpi_timecounter = {
 	acpitimer_read_safe,
 ,
 x00ffffff,
 	ACPI_PM_TIMER_FREQUENCY,
 	"ACPI-Safe",
 ,
 	NULL,
 	NULL,
 };
 static bool
 acpitimer_supported(void)
+{
 	return AcpiGbl_FADT.PmTimerLength != 0;
+}
 #endif
 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;
 	if (!acpitimer_supported())
 		return -1;
 	rv = AcpiGetTimerResolution(&bits);
 	if (ACPI_FAILURE(rv))
 		return -1;
 	if (bits == 32)
 @@ -92,37 +92,37 @@ acpitimer_init(struct acpi_softc *sc)
 	aprint_debug_dev(sc->sc_dev, "%s %d-bit timer\n",
 	    acpi_timecounter.tc_name, bits);
 	return 0;
 #else
 	return -1;
 #endif
+}
 int
 acpitimer_detach(void)
+{
-#if !defined(ACPI_REDUCED_HARDWARE)
+#if (!ACPI_REDUCED_HARDWARE)
 	if (!acpitimer_supported())
 		return -1;
 	return tc_detach(&acpi_timecounter);
 #else
 	return -1;
 #endif
+}
-#if !defined(ACPI_REDUCED_HARDWARE)
+#if (!ACPI_REDUCED_HARDWARE)
 u_int
 acpitimer_read_fast(struct timecounter *tc)
+{
 	uint32_t t;
 	(void)AcpiGetTimer(&t);
 	return t;
+}
 /*
  * Some chipsets (PIIX4 variants) do not latch correctly;
  * there is a chance that a transition is hit.

 @@ -1,20 +1,20 @@
-#	$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
 define	acpiapmbus { }
 define	acpinodebus { }
 define	acpiecdtbus { }
 define	acpihpetbus { }
 define	acpiwdrtbus { }
 define	acpisdtbus { }
 define	acpigtdtbus { }
 define	acpimadtbus { }
 device	acpi: acpica, acpiapmbus, acpinodebus, acpiecdtbus, acpisdtbus, acpigtdtbus, acpimadtbus, acpihpetbus, acpiwdrtbus, sysmon_power, sysmon_taskq

 @@ -1,17 +1,17 @@
 /******************************************************************************
+ *
  * Name: acnetbsd.h - OS specific defines, etc.
- *       $Revision: 1.17 $
+ *       $Revision: 1.18 $
+ *
  *****************************************************************************/
 /*
  * Copyright (C) 2000 - 2018, Intel Corp.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions, and the following disclaimer,
  *    without modification.
 @@ -104,26 +104,30 @@
 #define ACPI_DBG_TRACK_ALLOCATIONS
 #endif
 #ifdef DEBUGGER_THREADING
 #undef DEBUGGER_THREADING
 #endif /* DEBUGGER_THREADING */
 #define DEBUGGER_THREADING 0    /* integrated with DDB */
 #include "opt_ddb.h"
 #ifdef DDB
 #define ACPI_DISASSEMBLER
 #define ACPI_DEBUGGER
 #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>
 #include <stdint.h>
 /* Not building kernel code, so use libc */
 #define ACPI_USE_STANDARD_HEADERS
 #define __cli()
 #define __sti()
 #define __cdecl
 /* XXX */