 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_pci.c,v 1.18 2010/12/31 10:56:39 jruoho Exp $ */
+/* $NetBSD: acpi_pci.c,v 1.19 2015/04/13 18:32:50 christos Exp $ */
 /*
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christoph Egger and Gregoire Sutre.
+ *
  * 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.
 @@ -19,27 +19,27 @@
  * 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 AUTHOR 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_pci.c,v 1.18 2010/12/31 10:56:39 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.19 2015/04/13 18:32:50 christos Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/ppbreg.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 @@ -136,30 +136,30 @@ acpi_pcidev_pciroot_bus_callback(ACPI_RE
 	    (res->Type != ACPI_RESOURCE_TYPE_ADDRESS32) &&
 	    (res->Type != ACPI_RESOURCE_TYPE_ADDRESS64))
 		return AE_OK;
 	if (ACPI_FAILURE(AcpiResourceToAddress64(res, &addr64)))
 		return AE_OK;
 	if (addr64.ResourceType != ACPI_BUS_NUMBER_RANGE)
 		return AE_OK;
 	if (*bus != -1)
 		return AE_ALREADY_EXISTS;
-	if (addr64.Minimum > 0xFFFF)
+	if (addr64.Address.Minimum > 0xFFFF)
 		return AE_BAD_DATA;
-	*bus = (int32_t)addr64.Minimum;
+	*bus = (int32_t)addr64.Address.Minimum;
 	return AE_OK;
+}
 /*
  * acpi_pcidev_scan:
+ *
  *	Scan the ACPI device tree for PCI devices.  A node is detected as a
  *	PCI device if it has an ancestor that is a PCI root bridge and such
  *	that all intermediate nodes are PCI-to-PCI bridges.  Depth-first
  *	recursive implementation.
+ *
  *	PCI root bridges do not necessarily contain an _ADR, since they already

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_resource.c,v 1.35 2011/06/30 20:09:39 wiz Exp $	*/
+/*	$NetBSD: acpi_resource.c,v 1.36 2015/04/13 18:32:50 christos 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
 @@ -57,27 +57,27 @@
  * 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.
  */
 /*
  * ACPI resource parsing.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.35 2011/06/30 20:09:39 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.36 2015/04/13 18:32:50 christos Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #define	_COMPONENT	ACPI_RESOURCE_COMPONENT
 ACPI_MODULE_NAME("RESOURCE")
 static ACPI_STATUS acpi_resource_parse_callback(ACPI_RESOURCE *, void *);
 @@ -230,61 +230,61 @@ acpi_resource_parse_callback(ACPI_RESOUR
 			(*ops->start_dep)(arg->dev, arg->context,
 			    res->Data.StartDpf.CompatibilityPriority);
 		break;
 	case ACPI_RESOURCE_TYPE_END_DEPENDENT:
 		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
 				     "End dependent functions\n"));
 		if (ops->end_dep)
 			(*ops->end_dep)(arg->dev, arg->context);
 		break;
 	case ACPI_RESOURCE_TYPE_ADDRESS32:
 		/* XXX Only fixed size supported for now */
-		if (res->Data.Address32.AddressLength == 0 ||
+		if (res->Data.Address32.Address.AddressLength == 0 ||
 		    res->Data.Address32.ProducerConsumer != ACPI_CONSUMER)
 			break;
 #define ADRRESS32_FIXED2(r)						\
 	((r)->Data.Address32.MinAddressFixed == ACPI_ADDRESS_FIXED &&	\
 	 (r)->Data.Address32.MaxAddressFixed == ACPI_ADDRESS_FIXED)
 		switch (res->Data.Address32.ResourceType) {
 		case ACPI_MEMORY_RANGE:
 			if (ADRRESS32_FIXED2(res)) {
 				if (ops->memory)
 					(*ops->memory)(arg->dev, arg->context,
-					    res->Data.Address32.Minimum,
+					    res->Data.Address32.Address.Minimum,
-					    res->Data.Address32.AddressLength);
+					    res->Data.Address32.Address.AddressLength);
 			} else {
 				if (ops->memrange)
 					(*ops->memrange)(arg->dev, arg->context,
-					    res->Data.Address32.Minimum,
+					    res->Data.Address32.Address.Minimum,
-					    res->Data.Address32.Maximum,
+					    res->Data.Address32.Address.Maximum,
-					    res->Data.Address32.AddressLength,
+					    res->Data.Address32.Address.AddressLength,
-					    res->Data.Address32.Granularity);
+					    res->Data.Address32.Address.Granularity);
+			}
 			break;
 		case ACPI_IO_RANGE:
 			if (ADRRESS32_FIXED2(res)) {
 				if (ops->ioport)
 					(*ops->ioport)(arg->dev, arg->context,
-					    res->Data.Address32.Minimum,
+					    res->Data.Address32.Address.Minimum,
-					    res->Data.Address32.AddressLength);
+					    res->Data.Address32.Address.AddressLength);
 			} else {
 				if (ops->iorange)
 					(*ops->iorange)(arg->dev, arg->context,
-					    res->Data.Address32.Minimum,
+					    res->Data.Address32.Address.Minimum,
-					    res->Data.Address32.Maximum,
+					    res->Data.Address32.Address.Maximum,
-					    res->Data.Address32.AddressLength,
+					    res->Data.Address32.Address.AddressLength,
-					    res->Data.Address32.Granularity);
+					    res->Data.Address32.Address.Granularity);
+			}
 			break;
 		case ACPI_BUS_NUMBER_RANGE:
 			ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
 				      "Address32/BusNumber unimplemented\n"));
 			break;
+		}
 #undef ADRRESS32_FIXED2
 		break;
 	case ACPI_RESOURCE_TYPE_ADDRESS16:
 		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
 				     "Address16 unimplemented\n"));