[src/trunk]: src/sys/dev/acpi sync with new acpica struct shuffling.

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

details:   https://anonhg.NetBSD.org/src/rev/15eb61cdfb1b
branches:  trunk
changeset: 807536:15eb61cdfb1b
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Apr 13 18:32:50 2015 +0000

description:
sync with new acpica struct shuffling.

diffstat:

 sys/dev/acpi/acpi_pci.c      |   8 ++++----
 sys/dev/acpi/acpi_resource.c |  30 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diffs (101 lines):

diff -r 303cdd5b8d91 -r 15eb61cdfb1b sys/dev/acpi/acpi_pci.c
--- a/sys/dev/acpi/acpi_pci.c   Mon Apr 13 18:00:47 2015 +0000
+++ b/sys/dev/acpi/acpi_pci.c   Mon Apr 13 18:32:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -29,7 +29,7 @@
  */
 
 #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>
@@ -146,10 +146,10 @@
        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;
 }
diff -r 303cdd5b8d91 -r 15eb61cdfb1b sys/dev/acpi/acpi_resource.c
--- a/sys/dev/acpi/acpi_resource.c      Mon Apr 13 18:00:47 2015 +0000
+++ b/sys/dev/acpi/acpi_resource.c      Mon Apr 13 18:32:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -67,7 +67,7 @@
  */
 
 #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>
@@ -240,7 +240,7 @@
 
        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)                                            \
@@ -251,30 +251,30 @@
                        if (ADRRESS32_FIXED2(res)) {
                                if (ops->memory)
                                        (*ops->memory)(arg->dev, arg->context,
-                                           res->Data.Address32.Minimum,
-                                           res->Data.Address32.AddressLength);
+                                           res->Data.Address32.Address.Minimum,
+                                           res->Data.Address32.Address.AddressLength);
                        } else {
                                if (ops->memrange)
                                        (*ops->memrange)(arg->dev, arg->context,
-                                           res->Data.Address32.Minimum,
-                                           res->Data.Address32.Maximum,
-                                           res->Data.Address32.AddressLength,
-                                           res->Data.Address32.Granularity);
+                                           res->Data.Address32.Address.Minimum,
+                                           res->Data.Address32.Address.Maximum,
+                                           res->Data.Address32.Address.AddressLength,
+                                           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.AddressLength);
+                                           res->Data.Address32.Address.Minimum,
+                                           res->Data.Address32.Address.AddressLength);
                        } else {
                                if (ops->iorange)
                                        (*ops->iorange)(arg->dev, arg->context,
-                                           res->Data.Address32.Minimum,
-                                           res->Data.Address32.Maximum,
-                                           res->Data.Address32.AddressLength,
-                                           res->Data.Address32.Granularity);
+                                           res->Data.Address32.Address.Minimum,
+                                           res->Data.Address32.Address.Maximum,
+                                           res->Data.Address32.Address.AddressLength,
+                                           res->Data.Address32.Address.Granularity);
                        }
                        break;
                case ACPI_BUS_NUMBER_RANGE: