 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi.c,v 1.247 2011/07/17 02:32:01 jakllsch Exp $	*/
+/*	$NetBSD: acpi.c,v 1.248 2011/08/01 11:25:59 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.247 2011/07/17 02:32:01 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.248 2011/08/01 11:25:59 jmcneill Exp $");
 #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>
 #include <sys/systm.h>
 @@ -338,26 +338,66 @@ acpi_disable(void)
 	KASSERT(acpi_active != 0);
 	if (AcpiGbl_FADT.SmiCommand != 0)
 		AcpiDisable();
+}
 int
 acpi_check(device_t parent, const char *ifattr)
+{
 	return (config_search_ia(acpi_submatch, parent, ifattr, NULL) != NULL);
+}
 int
 acpi_reset(void)
+{
 	struct acpi_softc *sc = acpi_softc;
 	ACPI_GENERIC_ADDRESS *ResetReg;
 	ACPI_PCI_ID PciId;
 	ACPI_STATUS status;
 	if (sc == NULL)
 		return ENXIO;
 	ResetReg = &AcpiGbl_FADT.ResetRegister;
 	/* Check if the reset register is supported */
 	if (!(AcpiGbl_FADT.Flags & ACPI_FADT_RESET_REGISTER) ||
 	    !ResetReg->Address) {
 		return ENOENT;
+	}
 	switch (ResetReg->SpaceId) {
 	case ACPI_ADR_SPACE_PCI_CONFIG:
 		PciId.Segment = PciId.Bus = 0;
 		PciId.Device = ACPI_GAS_PCI_DEV(ResetReg->Address);
 		PciId.Function = ACPI_GAS_PCI_FUNC(ResetReg->Address);
 		status = AcpiOsWritePciConfiguration(&PciId,
 		    ACPI_GAS_PCI_REGOFF(ResetReg->Address),
 		    AcpiGbl_FADT.ResetValue, ResetReg->BitWidth);
 		break;
 	case ACPI_ADR_SPACE_SYSTEM_IO:
 	case ACPI_ADR_SPACE_SYSTEM_MEMORY:
 		status = AcpiReset();
 		break;
 	default:
 		status = AE_TYPE;
 		break;
+	}
 	return ACPI_FAILURE(status) ? EIO : 0;
+}
 /*
  * Autoconfiguration.
  */
 static int
 acpi_match(device_t parent, cfdata_t match, void *aux)
+{
 	/*
 	 * XXX: Nada; MD code has called acpi_probe().
 	 */
 	return 1;
+}
 static int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpireg.h,v 1.11 2010/10/12 19:10:50 gsutre Exp $	*/
+/*	$NetBSD: acpireg.h,v 1.12 2011/08/01 11:25:59 jmcneill Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -51,26 +51,30 @@
 #define ACPI_OSC_QUERY		__BIT(0)
 #define ACPI_OSC_ERROR		__BIT(1)
 #define ACPI_OSC_ERROR_UUID	__BIT(2)
 #define ACPI_OSC_ERROR_REV	__BIT(3)
 #define ACPI_OSC_ERROR_MASKED	__BIT(4)
 /*
  * PCI functions.
  */
 #define	ACPI_ADR_PCI_DEV(x)	(((x) >> 16) & 0xffff)
 #define	ACPI_ADR_PCI_FUNC(x)	((x) & 0xffff)
 #define	ACPI_ADR_PCI_ALLFUNCS	0xffff
 #define	ACPI_GAS_PCI_DEV(x)	(((x) >> 32) & 0xffff)
 #define	ACPI_GAS_PCI_FUNC(x)	(((x) >> 16) & 0xffff)
 #define	ACPI_GAS_PCI_REGOFF(x)	((x) & 0xffff)
 /*
  * ACPI driver components.
  */
 #define	ACPI_BUS_COMPONENT	0x00010000
 #define	ACPI_ACAD_COMPONENT	0x00020000
 #define	ACPI_BAT_COMPONENT	0x00040000
 #define	ACPI_BUTTON_COMPONENT	0x00080000
 #define	ACPI_EC_COMPONENT	0x00100000
 #define	ACPI_LID_COMPONENT	0x00200000
 #define	ACPI_RESOURCE_COMPONENT	0x00400000
 #define	ACPI_TZ_COMPONENT	0x00800000
 #define	ACPI_DISPLAY_COMPONENT	0x01000000

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpivar.h,v 1.72 2011/06/21 03:37:21 jruoho Exp $	*/
+/*	$NetBSD: acpivar.h,v 1.73 2011/08/01 11:25:59 jmcneill Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -287,26 +287,28 @@ struct acpi_resource_parse_ops {
 	void	(*end_dep)(device_t, void *);
 };
 extern struct acpi_softc *acpi_softc;
 extern int acpi_active;
 extern const struct acpi_resource_parse_ops acpi_resource_parse_ops_default;
 extern const struct acpi_resource_parse_ops acpi_resource_parse_ops_quiet;
 int		acpi_probe(void);
 void		acpi_disable(void);
 int		acpi_check(device_t, const char *);
 int		acpi_reset(void);
 ACPI_PHYSICAL_ADDRESS	acpi_OsGetRootPointer(void);
 bool		acpi_register_notify(struct acpi_devnode *,
 				     ACPI_NOTIFY_HANDLER);
 void		acpi_deregister_notify(struct acpi_devnode *);
 ACPI_STATUS	acpi_resource_parse(device_t, ACPI_HANDLE, const char *,
 		    void *, const struct acpi_resource_parse_ops *);
 void		acpi_resource_print(device_t, struct acpi_resources *);
 void		acpi_resource_cleanup(struct acpi_resources *);
 void *		acpi_pci_link_devbyhandle(ACPI_HANDLE);
 void		acpi_pci_link_add_reference(void *, int, int, int, int);