diff options
author | Bob Moore <robert.moore@intel.com> | 2008-09-28 03:00:47 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:14:42 -0400 |
commit | 23d3e055beb12db2a3b91dfeee474c4d5ecc13b9 (patch) | |
tree | 9d3203bfef5e067aa1ed130d24657ca4d4f10659 /include/acpi | |
parent | 55ac9a018f83e4f42f3c6ce98a8dbda73b985935 (diff) |
ACPICA: Remove obsolete debug levels (WARN and ERROR)
Removed ACPI_DB_WARN and ACPI_DB_ERROR. These debug levels were
made obsolete by the ACPI_WARNING and ACPI_ERROR/ACPI_EXCEPTION
interfaces. Also added ACPI_DB_EVENTS to correspond with the
existing ACPI_LV_EVENTS.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acoutput.h | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index e17873defcec..09d33c7740f0 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h | |||
@@ -80,12 +80,10 @@ | |||
80 | /* | 80 | /* |
81 | * Raw debug output levels, do not use these in the DEBUG_PRINT macros | 81 | * Raw debug output levels, do not use these in the DEBUG_PRINT macros |
82 | */ | 82 | */ |
83 | #define ACPI_LV_ERROR 0x00000001 | 83 | #define ACPI_LV_INIT 0x00000001 |
84 | #define ACPI_LV_WARN 0x00000002 | 84 | #define ACPI_LV_DEBUG_OBJECT 0x00000002 |
85 | #define ACPI_LV_INIT 0x00000004 | 85 | #define ACPI_LV_INFO 0x00000004 |
86 | #define ACPI_LV_DEBUG_OBJECT 0x00000008 | 86 | #define ACPI_LV_ALL_EXCEPTIONS 0x00000007 |
87 | #define ACPI_LV_INFO 0x00000010 | ||
88 | #define ACPI_LV_ALL_EXCEPTIONS 0x0000001F | ||
89 | 87 | ||
90 | /* Trace verbosity level 1 [Standard Trace Level] */ | 88 | /* Trace verbosity level 1 [Standard Trace Level] */ |
91 | 89 | ||
@@ -127,7 +125,6 @@ | |||
127 | #define ACPI_LV_VERBOSE_INFO 0x20000000 | 125 | #define ACPI_LV_VERBOSE_INFO 0x20000000 |
128 | #define ACPI_LV_FULL_TABLES 0x40000000 | 126 | #define ACPI_LV_FULL_TABLES 0x40000000 |
129 | #define ACPI_LV_EVENTS 0x80000000 | 127 | #define ACPI_LV_EVENTS 0x80000000 |
130 | |||
131 | #define ACPI_LV_VERBOSE 0xF0000000 | 128 | #define ACPI_LV_VERBOSE 0xF0000000 |
132 | 129 | ||
133 | /* | 130 | /* |
@@ -135,21 +132,17 @@ | |||
135 | */ | 132 | */ |
136 | #define ACPI_DEBUG_LEVEL(dl) (u32) dl,ACPI_DEBUG_PARAMETERS | 133 | #define ACPI_DEBUG_LEVEL(dl) (u32) dl,ACPI_DEBUG_PARAMETERS |
137 | 134 | ||
138 | /* Exception level -- used in the global "DebugLevel" */ | 135 | /* |
139 | 136 | * Exception level -- used in the global "DebugLevel" | |
137 | * | ||
138 | * Note: For errors, use the ACPI_ERROR or ACPI_EXCEPTION interfaces. | ||
139 | * For warnings, use ACPI_WARNING. | ||
140 | */ | ||
140 | #define ACPI_DB_INIT ACPI_DEBUG_LEVEL (ACPI_LV_INIT) | 141 | #define ACPI_DB_INIT ACPI_DEBUG_LEVEL (ACPI_LV_INIT) |
141 | #define ACPI_DB_DEBUG_OBJECT ACPI_DEBUG_LEVEL (ACPI_LV_DEBUG_OBJECT) | 142 | #define ACPI_DB_DEBUG_OBJECT ACPI_DEBUG_LEVEL (ACPI_LV_DEBUG_OBJECT) |
142 | #define ACPI_DB_INFO ACPI_DEBUG_LEVEL (ACPI_LV_INFO) | 143 | #define ACPI_DB_INFO ACPI_DEBUG_LEVEL (ACPI_LV_INFO) |
143 | #define ACPI_DB_ALL_EXCEPTIONS ACPI_DEBUG_LEVEL (ACPI_LV_ALL_EXCEPTIONS) | 144 | #define ACPI_DB_ALL_EXCEPTIONS ACPI_DEBUG_LEVEL (ACPI_LV_ALL_EXCEPTIONS) |
144 | 145 | ||
145 | /* | ||
146 | * These two levels are essentially obsolete, all instances in the | ||
147 | * ACPICA core code have been replaced by ACPI_ERROR and ACPI_WARNING | ||
148 | * (Kept here because some drivers may still use them) | ||
149 | */ | ||
150 | #define ACPI_DB_ERROR ACPI_DEBUG_LEVEL (ACPI_LV_ERROR) | ||
151 | #define ACPI_DB_WARN ACPI_DEBUG_LEVEL (ACPI_LV_WARN) | ||
152 | |||
153 | /* Trace level -- also used in the global "DebugLevel" */ | 146 | /* Trace level -- also used in the global "DebugLevel" */ |
154 | 147 | ||
155 | #define ACPI_DB_INIT_NAMES ACPI_DEBUG_LEVEL (ACPI_LV_INIT_NAMES) | 148 | #define ACPI_DB_INIT_NAMES ACPI_DEBUG_LEVEL (ACPI_LV_INIT_NAMES) |
@@ -173,13 +166,14 @@ | |||
173 | #define ACPI_DB_USER_REQUESTS ACPI_DEBUG_LEVEL (ACPI_LV_USER_REQUESTS) | 166 | #define ACPI_DB_USER_REQUESTS ACPI_DEBUG_LEVEL (ACPI_LV_USER_REQUESTS) |
174 | #define ACPI_DB_PACKAGE ACPI_DEBUG_LEVEL (ACPI_LV_PACKAGE) | 167 | #define ACPI_DB_PACKAGE ACPI_DEBUG_LEVEL (ACPI_LV_PACKAGE) |
175 | #define ACPI_DB_MUTEX ACPI_DEBUG_LEVEL (ACPI_LV_MUTEX) | 168 | #define ACPI_DB_MUTEX ACPI_DEBUG_LEVEL (ACPI_LV_MUTEX) |
169 | #define ACPI_DB_EVENTS ACPI_DEBUG_LEVEL (ACPI_LV_EVENTS) | ||
176 | 170 | ||
177 | #define ACPI_DB_ALL ACPI_DEBUG_LEVEL (ACPI_LV_ALL) | 171 | #define ACPI_DB_ALL ACPI_DEBUG_LEVEL (ACPI_LV_ALL) |
178 | 172 | ||
179 | /* Defaults for debug_level, debug and normal */ | 173 | /* Defaults for debug_level, debug and normal */ |
180 | 174 | ||
181 | #define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_WARN | ACPI_LV_ERROR) | 175 | #define ACPI_DEBUG_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT) |
182 | #define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_WARN | ACPI_LV_ERROR) | 176 | #define ACPI_NORMAL_DEFAULT (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT) |
183 | #define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL) | 177 | #define ACPI_DEBUG_ALL (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL) |
184 | 178 | ||
185 | #endif /* __ACOUTPUT_H__ */ | 179 | #endif /* __ACOUTPUT_H__ */ |