Module Name: src
Committed By: cegger
Date: Tue Aug 18 21:38:41 UTC 2009
Modified Files:
src/sys/dev/acpi: acpi.c
Log Message:
Update for API changes with new ACPICA.
Makes i386 ALL kernel build.
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/acpi/acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.128 src/sys/dev/acpi/acpi.c:1.129
--- src/sys/dev/acpi/acpi.c:1.128 Tue Aug 18 16:41:02 2009
+++ src/sys/dev/acpi/acpi.c Tue Aug 18 21:38:41 2009
@@ -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);
