[src/trunk]: src/sys/dev/acpi Update for API changes with new ACPICA.

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

details:   https://anonhg.NetBSD.org/src/rev/9f6af5ee0d88
branches:  trunk
changeset: 746730:9f6af5ee0d88
user:      cegger <cegger%NetBSD.org@localhost>
date:      Tue Aug 18 21:38:41 2009 +0000

description:
Update for API changes with new ACPICA.
Makes i386 ALL kernel build.

diffstat:

 sys/dev/acpi/acpi.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 127b1716633f -r 9f6af5ee0d88 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Tue Aug 18 21:33:29 2009 +0000
+++ b/sys/dev/acpi/acpi.c       Tue Aug 18 21:38:41 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi.c,v 1.128 2009/08/18 16:41:02 jmcneill Exp $      */
+/*     $NetBSD: acpi.c,v 1.129 2009/08/18 21:38:41 cegger Exp $        */
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.128 2009/08/18 16:41:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.129 2009/08/18 21:38:41 cegger Exp $");
 
 #include "opt_acpi.h"
 #include "opt_pcifixup.h"
@@ -816,10 +816,10 @@
        rv = acpi_allocate_resources(handle);
        if (ACPI_FAILURE(rv)) {
                aprint_error("acpi: activate failed for %s\n",
-                      (*di)->HardwareId.Value);
+                      (*di)->HardwareId.String);
        } else {
                aprint_verbose("acpi: activated %s\n",
-                   (*di)->HardwareId.Value);
+                   (*di)->HardwareId.String);
        }
 
        (void)AcpiGetObjectInfo(handle, &newdi);
@@ -914,11 +914,11 @@
 #ifdef ACPI_EXTRA_DEBUG
                        aprint_normal_dev(sc->sc_dev,
                            "HID %s found in scope %s level %d\n",
-                           ad->ad_devinfo->HardwareId.Value,
+                           ad->ad_devinfo->HardwareId.String,
                            as->as_name, ad->ad_level);
                        if (ad->ad_devinfo->Valid & ACPI_VALID_UID)
                                aprint_normal("       UID %s\n",
-                                   ad->ad_devinfo->UniqueId.Value);
+                                   ad->ad_devinfo->UniqueId.String);
                        if (ad->ad_devinfo->Valid & ACPI_VALID_ADR)
                                aprint_normal("       ADR 0x%016" PRIx64 "\n",
                                    ad->ad_devinfo->Address);