Module Name: src
Committed By: jruoho
Date: Sat Jan 30 18:35:49 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_button.c acpi_lid.c hpqlb_acpi.c spic_acpi.c
thinkpad_acpi.c
Log Message:
Add the _COMPONENT definition for ACPI_DEBUG.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/acpi_button.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/hpqlb_acpi.c \
src/sys/dev/acpi/spic_acpi.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/acpi/thinkpad_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_button.c
diff -u src/sys/dev/acpi/acpi_button.c:1.28 src/sys/dev/acpi/acpi_button.c:1.29
--- src/sys/dev/acpi/acpi_button.c:1.28 Tue Aug 25 10:34:08 2009
+++ src/sys/dev/acpi/acpi_button.c Sat Jan 30 18:35:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.28 2009/08/25 10:34:08 jmcneill Exp $ */
+/* $NetBSD: acpi_button.c,v 1.29 2010/01/30 18:35:48 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.28 2009/08/25 10:34:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.29 2010/01/30 18:35:48 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,6 +52,9 @@
#include <dev/sysmon/sysmonvar.h>
+#define _COMPONENT ACPI_BUTTON_COMPONENT
+ACPI_MODULE_NAME ("acpi_button")
+
struct acpibut_softc {
struct acpi_devnode *sc_node; /* our ACPI devnode */
struct sysmon_pswitch sc_smpsw; /* our sysmon glue */
Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.31 src/sys/dev/acpi/acpi_lid.c:1.32
--- src/sys/dev/acpi/acpi_lid.c:1.31 Fri Jan 8 20:40:41 2010
+++ src/sys/dev/acpi/acpi_lid.c Sat Jan 30 18:35:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.31 2010/01/08 20:40:41 dyoung Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.32 2010/01/30 18:35:48 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.31 2010/01/08 20:40:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.32 2010/01/30 18:35:48 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,6 +52,9 @@
#include <dev/sysmon/sysmonvar.h>
+#define _COMPONENT ACPI_LID_COMPONENT
+ACPI_MODULE_NAME ("acpi_lid")
+
struct acpilid_softc {
struct acpi_devnode *sc_node; /* our ACPI devnode */
struct sysmon_pswitch sc_smpsw; /* our sysmon glue */
Index: src/sys/dev/acpi/hpqlb_acpi.c
diff -u src/sys/dev/acpi/hpqlb_acpi.c:1.4 src/sys/dev/acpi/hpqlb_acpi.c:1.5
--- src/sys/dev/acpi/hpqlb_acpi.c:1.4 Fri Jan 8 20:40:41 2010
+++ src/sys/dev/acpi/hpqlb_acpi.c Sat Jan 30 18:35:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpqlb_acpi.c,v 1.4 2010/01/08 20:40:41 dyoung Exp $ */
+/* $NetBSD: hpqlb_acpi.c,v 1.5 2010/01/30 18:35:49 jruoho Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.4 2010/01/08 20:40:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.5 2010/01/30 18:35:49 jruoho Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -38,6 +38,7 @@
#include <sys/device.h>
#include <sys/pmf.h>
+#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <machine/pio.h>
@@ -45,6 +46,9 @@
#include <dev/wscons/wskbdvar.h>
#include <dev/isa/isareg.h>
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("hpqlb_acpi")
+
#ifdef HPQLB_DEBUG
#define DPRINTF(x) do { printf x; } while (/* CONSTCOND */0)
#else
Index: src/sys/dev/acpi/spic_acpi.c
diff -u src/sys/dev/acpi/spic_acpi.c:1.4 src/sys/dev/acpi/spic_acpi.c:1.5
--- src/sys/dev/acpi/spic_acpi.c:1.4 Sun Aug 9 19:36:28 2009
+++ src/sys/dev/acpi/spic_acpi.c Sat Jan 30 18:35:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: spic_acpi.c,v 1.4 2009/08/09 19:36:28 christos Exp $ */
+/* $NetBSD: spic_acpi.c,v 1.5 2010/01/30 18:35:49 jruoho Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.4 2009/08/09 19:36:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.5 2010/01/30 18:35:49 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,8 +43,12 @@
#include <dev/ic/spicvar.h>
#include <dev/acpi/acpica.h>
+#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("spic_acpi")
+
struct spic_acpi_softc {
struct spic_softc sc_spic; /* spic device */
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.23 src/sys/dev/acpi/thinkpad_acpi.c:1.24
--- src/sys/dev/acpi/thinkpad_acpi.c:1.23 Mon Jan 18 17:11:00 2010
+++ src/sys/dev/acpi/thinkpad_acpi.c Sat Jan 30 18:35:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.23 2010/01/18 17:11:00 jruoho Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.24 2010/01/30 18:35:49 jruoho Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.23 2010/01/18 17:11:00 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.24 2010/01/30 18:35:49 jruoho Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -40,6 +40,7 @@
#include <sys/queue.h>
#include <sys/kmem.h>
+#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/acpi_ecvar.h>
@@ -48,6 +49,9 @@
#include <machine/pio.h>
#endif
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("thinkpad_acpi")
+
#define THINKPAD_NTEMPSENSORS 8
#define THINKPAD_NFANSENSORS 1
#define THINKPAD_NSENSORS (THINKPAD_NTEMPSENSORS + THINKPAD_NFANSENSORS)
