Wed Oct 27 14:39:27 2010 UTC ()
Make acpi(4) debug aware of ACPI_DISPLAY_COMPONENT.


(gsutre)
diff -r1.60 -r1.61 src/share/man/man4/acpi.4
diff -r1.3 -r1.4 src/sys/dev/acpi/acpi_debug.c

cvs diff -r1.60 -r1.61 src/share/man/man4/acpi.4 (expand / switch to unified diff)

--- src/share/man/man4/acpi.4 2010/10/24 08:31:49 1.60
+++ src/share/man/man4/acpi.4 2010/10/27 14:39:26 1.61
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: acpi.4,v 1.60 2010/10/24 08:31:49 jruoho Exp $ 1.\" $NetBSD: acpi.4,v 1.61 2010/10/27 14:39:26 gsutre Exp $
2.\" 2.\"
3.\" Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc. 3.\" Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc.
4.\" All rights reserved. 4.\" All rights reserved.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 14.\"
@@ -435,26 +435,27 @@ For the first two variables, the possibl @@ -435,26 +435,27 @@ For the first two variables, the possibl
435.It Li ACPI_TOOLS Ta ACPI_LV_TABLES 435.It Li ACPI_TOOLS Ta ACPI_LV_TABLES
436.It Li ACPI_EXAMPLE Ta ACPI_LV_VALUES 436.It Li ACPI_EXAMPLE Ta ACPI_LV_VALUES
437.It Li ACPI_DRIVER Ta ACPI_LV_OBJECTS 437.It Li ACPI_DRIVER Ta ACPI_LV_OBJECTS
438.It Li ACPI_ALL_COMPONENTS * Ta ACPI_LV_RESOURCES 438.It Li ACPI_ALL_COMPONENTS * Ta ACPI_LV_RESOURCES
439.It Ta ACPI_LV_USER_REQUESTS 439.It Ta ACPI_LV_USER_REQUESTS
440.It Li ACPI_BUS_COMPONENT Ta ACPI_LV_PACKAGE 440.It Li ACPI_BUS_COMPONENT Ta ACPI_LV_PACKAGE
441.It Li ACPI_ACAD_COMPONENT Ta ACPI_LV_VERBOSITY1 * 441.It Li ACPI_ACAD_COMPONENT Ta ACPI_LV_VERBOSITY1 *
442.It Li ACPI_BAT_COMPONENT Ta 442.It Li ACPI_BAT_COMPONENT Ta
443.It Li ACPI_BUTTON_COMPONENT Ta ACPI_LV_ALLOCATIONS 443.It Li ACPI_BUTTON_COMPONENT Ta ACPI_LV_ALLOCATIONS
444.It Li APCI_EC_COMPONENT Ta ACPI_LV_FUNCTIONS 444.It Li APCI_EC_COMPONENT Ta ACPI_LV_FUNCTIONS
445.It Li ACPI_LID_COMPONENT Ta ACPI_LV_OPTIMIZATIONS 445.It Li ACPI_LID_COMPONENT Ta ACPI_LV_OPTIMIZATIONS
446.It Li ACPI_RESOURCE_COMPONENT Ta ACPI_LV_VERBOSITY2 * 446.It Li ACPI_RESOURCE_COMPONENT Ta ACPI_LV_VERBOSITY2 *
447.It Li ACPI_TZ_COMPONENT Ta 447.It Li ACPI_TZ_COMPONENT Ta
 448.It Li ACPI_DISPLAY_COMPONENT Ta
448.It Li ACPI_ALL_DRIVERS * Ta ACPI_LV_MUTEX 449.It Li ACPI_ALL_DRIVERS * Ta ACPI_LV_MUTEX
449.It Ta ACPI_LV_THREADS 450.It Ta ACPI_LV_THREADS
450.It Ta ACPI_LV_IO 451.It Ta ACPI_LV_IO
451.It Ta ACPI_LV_AML_INTERRUPTS 452.It Ta ACPI_LV_AML_INTERRUPTS
452.It Li "* This is a compound" Ta ACPI_LV_VERBOSITY3 * 453.It Li "* This is a compound" Ta ACPI_LV_VERBOSITY3 *
453.It Li " constant, including" Ta 454.It Li " constant, including" Ta
454.It Li " all previous elements." Ta ACPI_LV_AML_DISASSEMBLE 455.It Li " all previous elements." Ta ACPI_LV_AML_DISASSEMBLE
455.It Ta ACPI_LV_VERBOSE_INFO 456.It Ta ACPI_LV_VERBOSE_INFO
456.It Ta ACPI_LV_FULL_TABLES 457.It Ta ACPI_LV_FULL_TABLES
457.It Ta ACPI_LV_EVENTS 458.It Ta ACPI_LV_EVENTS
458.It Ta ACPI_LV_VERBOSE * 459.It Ta ACPI_LV_VERBOSE *
459.El 460.El
460.Pp 461.Pp

cvs diff -r1.3 -r1.4 src/sys/dev/acpi/acpi_debug.c (expand / switch to unified diff)

--- src/sys/dev/acpi/acpi_debug.c 2010/06/30 07:42:36 1.3
+++ src/sys/dev/acpi/acpi_debug.c 2010/10/27 14:39:26 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: acpi_debug.c,v 1.3 2010/06/30 07:42:36 jruoho Exp $ */ 1/* $NetBSD: acpi_debug.c,v 1.4 2010/10/27 14:39:26 gsutre Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2010 Jukka Ruohonen <jruohonen@iki.fi> 4 * Copyright (c) 2010 Jukka Ruohonen <jruohonen@iki.fi>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -17,27 +17,27 @@ @@ -17,27 +17,27 @@
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
18 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 18 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 19 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 20 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: acpi_debug.c,v 1.3 2010/06/30 07:42:36 jruoho Exp $"); 30__KERNEL_RCSID(0, "$NetBSD: acpi_debug.c,v 1.4 2010/10/27 14:39:26 gsutre Exp $");
31 31
32#include <sys/param.h> 32#include <sys/param.h>
33#include <sys/sysctl.h> 33#include <sys/sysctl.h>
34 34
35#include <dev/acpi/acpireg.h> 35#include <dev/acpi/acpireg.h>
36#include <dev/acpi/acpivar.h> 36#include <dev/acpi/acpivar.h>
37 37
38#include <prop/proplib.h> 38#include <prop/proplib.h>
39 39
40#ifdef ACPI_DEBUG 40#ifdef ACPI_DEBUG
41 41
42#define _COMPONENT ACPI_UTILITIES 42#define _COMPONENT ACPI_UTILITIES
43ACPI_MODULE_NAME ("acpi_debug") 43ACPI_MODULE_NAME ("acpi_debug")
@@ -173,26 +173,27 @@ acpi_debug_create(void) @@ -173,26 +173,27 @@ acpi_debug_create(void)
173 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_ALL_COMPONENTS); 173 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_ALL_COMPONENTS);
174 174
175 /* 175 /*
176 * NetBSD specific components. 176 * NetBSD specific components.
177 */ 177 */
178 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_BUS_COMPONENT); 178 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_BUS_COMPONENT);
179 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_ACAD_COMPONENT); 179 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_ACAD_COMPONENT);
180 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_BAT_COMPONENT); 180 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_BAT_COMPONENT);
181 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_BUTTON_COMPONENT); 181 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_BUTTON_COMPONENT);
182 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_EC_COMPONENT); 182 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_EC_COMPONENT);
183 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_LID_COMPONENT); 183 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_LID_COMPONENT);
184 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_RESOURCE_COMPONENT); 184 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_RESOURCE_COMPONENT);
185 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_TZ_COMPONENT); 185 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_TZ_COMPONENT);
 186 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_DISPLAY_COMPONENT);
186 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_ALL_DRIVERS); 187 ACPI_DEBUG_ADD(acpi_debug_layer_d, ACPI_ALL_DRIVERS);
187 188
188 /* 189 /*
189 * Debug levels. 190 * Debug levels.
190 */ 191 */
191 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_INIT); 192 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_INIT);
192 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_DEBUG_OBJECT); 193 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_DEBUG_OBJECT);
193 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_INFO); 194 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_INFO);
194 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_ALL_EXCEPTIONS); 195 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_ALL_EXCEPTIONS);
195 196
196 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_INIT_NAMES); 197 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_INIT_NAMES);
197 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_PARSE); 198 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_PARSE);
198 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_LOAD); 199 ACPI_DEBUG_ADD(acpi_debug_level_d, ACPI_LV_LOAD);