Module Name: src
Committed By: jruoho
Date: Thu Mar 4 20:17:30 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c atk0110.c smbus_acpi.c
Log Message:
Fix ACPI_DEBUG build failures reported by Greg A. Woods.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/atk0110.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/smbus_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.152 src/sys/dev/acpi/acpi.c:1.153
--- src/sys/dev/acpi/acpi.c:1.152 Wed Mar 3 06:57:05 2010
+++ src/sys/dev/acpi/acpi.c Thu Mar 4 20:17:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.152 2010/03/03 06:57:05 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.153 2010/03/04 20:17:30 jruoho 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.152 2010/03/03 06:57:05 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.153 2010/03/04 20:17:30 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -822,8 +822,8 @@
ACPI_DEVICE_INFO *newdi;
#ifdef ACPI_DEBUG
- aprint_normal("acpi_activate_device: %s, old status=%x\n",
- (*di)->HardwareId.Value, (*di)->CurrentStatus);
+ aprint_normal("%s: %s, old status=%x\n", __func__,
+ (*di)->HardwareId.String, (*di)->CurrentStatus);
#endif
rv = acpi_allocate_resources(handle);
@@ -840,8 +840,8 @@
*di = newdi;
#ifdef ACPI_DEBUG
- aprint_normal("acpi_activate_device: %s, new status=%x\n",
- (*di)->HardwareId.Value, (*di)->CurrentStatus);
+ aprint_normal("%s: %s, new status=%x\n", __func__,
+ (*di)->HardwareId.String, (*di)->CurrentStatus);
#endif
}
#endif /* ACPI_ACTIVATE_DEV */
Index: src/sys/dev/acpi/atk0110.c
diff -u src/sys/dev/acpi/atk0110.c:1.7 src/sys/dev/acpi/atk0110.c:1.8
--- src/sys/dev/acpi/atk0110.c:1.7 Thu Mar 4 08:44:55 2010
+++ src/sys/dev/acpi/atk0110.c Thu Mar 4 20:17:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atk0110.c,v 1.7 2010/03/04 08:44:55 jruoho Exp $ */
+/* $NetBSD: atk0110.c,v 1.8 2010/03/04 20:17:30 jruoho Exp $ */
/* $OpenBSD: atk0110.c,v 1.1 2009/07/23 01:38:16 cnst Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.7 2010/03/04 08:44:55 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.8 2010/03/04 20:17:30 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -27,8 +27,8 @@
#include <dev/sysmon/sysmonvar.h>
-#include "acpi.h"
-#include "acpivar.h"
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
/*
* ASUSTeK AI Booster (ACPI ASOC ATK0110).
Index: src/sys/dev/acpi/smbus_acpi.c
diff -u src/sys/dev/acpi/smbus_acpi.c:1.6 src/sys/dev/acpi/smbus_acpi.c:1.7
--- src/sys/dev/acpi/smbus_acpi.c:1.6 Thu Mar 4 13:11:14 2010
+++ src/sys/dev/acpi/smbus_acpi.c Thu Mar 4 20:17:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: smbus_acpi.c,v 1.6 2010/03/04 13:11:14 pgoyette Exp $ */
+/* $NetBSD: smbus_acpi.c,v 1.7 2010/03/04 20:17:30 jruoho Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -36,10 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.6 2010/03/04 13:11:14 pgoyette Exp $");
-
-#define _COMPONENT ACPI_BUS_COMPONENT
-ACPI_MODULE_NAME ("smbus_acpi")
+__KERNEL_RCSID(0, "$NetBSD: smbus_acpi.c,v 1.7 2010/03/04 20:17:30 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,6 +55,9 @@
#include <dev/i2c/i2cvar.h>
+#define _COMPONENT ACPI_BUS_COMPONENT
+ACPI_MODULE_NAME ("smbus_acpi")
+
/*
* ACPI SMBus CMI protocol codes
*/
