 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi.c,v 1.276 2018/10/16 10:25:33 jmcneill Exp $	*/
+/*	$NetBSD: acpi.c,v 1.277 2018/10/16 22:29:43 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.276 2018/10/16 10:25:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.277 2018/10/16 22:29:43 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>
 @@ -514,36 +514,37 @@ acpi_attach(device_t parent, device_t se
 	    ACPI_SYSTEM_NOTIFY, acpi_notify_handler, NULL);
 	if (ACPI_FAILURE(rv))
 		goto fail;
 	rv = AcpiInstallNotifyHandler(ACPI_ROOT_OBJECT,
 	    ACPI_DEVICE_NOTIFY, acpi_notify_handler, NULL);
 	if (ACPI_FAILURE(rv))
 		goto fail;
 	acpi_active = 1;
-	/* Show SCI interrupt. */
+	if (!AcpiGbl_ReducedHardware) {
-	if (AcpiGbl_FADT.SciInterrupt != 0)
+		/* Show SCI interrupt. */
 		aprint_verbose_dev(self, "SCI interrupting at int %u\n",
 		    AcpiGbl_FADT.SciInterrupt);
-	/*
+		/*
-	 * Install fixed-event handlers.
+		 * Install fixed-event handlers.
-	 */
+		 */
-	acpi_register_fixed_button(sc, ACPI_EVENT_POWER_BUTTON);
+		acpi_register_fixed_button(sc, ACPI_EVENT_POWER_BUTTON);
-	acpi_register_fixed_button(sc, ACPI_EVENT_SLEEP_BUTTON);
+		acpi_register_fixed_button(sc, ACPI_EVENT_SLEEP_BUTTON);
+	}
 	acpitimer_init(sc);
 	acpi_config_tree(sc);
 	acpi_sleep_init(sc);
 #ifdef ACPI_DEBUG
 	acpi_debug_init();
 #endif
 	/*
 	 * Print debug information.
 	 */
 	acpi_print_verbose(sc);
 @@ -573,28 +574,30 @@ acpi_detach(device_t self, int flags)
 	rv = AcpiRemoveNotifyHandler(ACPI_ROOT_OBJECT,
 	    ACPI_DEVICE_NOTIFY, acpi_notify_handler);
 	if (ACPI_FAILURE(rv))
 		return EBUSY;
 	if ((rc = config_detach_children(self, flags)) != 0)
 		return rc;
 	if ((rc = acpitimer_detach()) != 0)
 		return rc;
-	acpi_deregister_fixed_button(sc, ACPI_EVENT_POWER_BUTTON);
+	if (!AcpiGbl_ReducedHardware) {
-	acpi_deregister_fixed_button(sc, ACPI_EVENT_SLEEP_BUTTON);
+		acpi_deregister_fixed_button(sc, ACPI_EVENT_POWER_BUTTON);
 		acpi_deregister_fixed_button(sc, ACPI_EVENT_SLEEP_BUTTON);
+	}
 	pmf_device_deregister(self);
 	acpi_softc = NULL;
 	return 0;
+}
 static void
 acpi_childdet(device_t self, device_t child)
+{
 	struct acpi_softc *sc = device_private(self);
 	struct acpi_devnode *ad;