diff options
Diffstat (limited to 'include/acpi/acexcep.h')
-rw-r--r-- | include/acpi/acexcep.h | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h index 0a6f492f3c8e..4f005eb65928 100644 --- a/include/acpi/acexcep.h +++ b/include/acpi/acexcep.h | |||
@@ -44,7 +44,6 @@ | |||
44 | #ifndef __ACEXCEP_H__ | 44 | #ifndef __ACEXCEP_H__ |
45 | #define __ACEXCEP_H__ | 45 | #define __ACEXCEP_H__ |
46 | 46 | ||
47 | |||
48 | /* | 47 | /* |
49 | * Exceptions returned by external ACPI interfaces | 48 | * Exceptions returned by external ACPI interfaces |
50 | */ | 49 | */ |
@@ -55,11 +54,9 @@ | |||
55 | #define AE_CODE_CONTROL 0x4000 | 54 | #define AE_CODE_CONTROL 0x4000 |
56 | #define AE_CODE_MASK 0xF000 | 55 | #define AE_CODE_MASK 0xF000 |
57 | 56 | ||
58 | |||
59 | #define ACPI_SUCCESS(a) (!(a)) | 57 | #define ACPI_SUCCESS(a) (!(a)) |
60 | #define ACPI_FAILURE(a) (a) | 58 | #define ACPI_FAILURE(a) (a) |
61 | 59 | ||
62 | |||
63 | #define AE_OK (acpi_status) 0x0000 | 60 | #define AE_OK (acpi_status) 0x0000 |
64 | 61 | ||
65 | /* | 62 | /* |
@@ -99,7 +96,6 @@ | |||
99 | 96 | ||
100 | #define AE_CODE_ENV_MAX 0x001F | 97 | #define AE_CODE_ENV_MAX 0x001F |
101 | 98 | ||
102 | |||
103 | /* | 99 | /* |
104 | * Programmer exceptions | 100 | * Programmer exceptions |
105 | */ | 101 | */ |
@@ -115,7 +111,6 @@ | |||
115 | 111 | ||
116 | #define AE_CODE_PGM_MAX 0x0009 | 112 | #define AE_CODE_PGM_MAX 0x0009 |
117 | 113 | ||
118 | |||
119 | /* | 114 | /* |
120 | * Acpi table exceptions | 115 | * Acpi table exceptions |
121 | */ | 116 | */ |
@@ -128,7 +123,6 @@ | |||
128 | 123 | ||
129 | #define AE_CODE_TBL_MAX 0x0006 | 124 | #define AE_CODE_TBL_MAX 0x0006 |
130 | 125 | ||
131 | |||
132 | /* | 126 | /* |
133 | * AML exceptions. These are caused by problems with | 127 | * AML exceptions. These are caused by problems with |
134 | * the actual AML byte stream | 128 | * the actual AML byte stream |
@@ -169,7 +163,6 @@ | |||
169 | 163 | ||
170 | #define AE_CODE_AML_MAX 0x0021 | 164 | #define AE_CODE_AML_MAX 0x0021 |
171 | 165 | ||
172 | |||
173 | /* | 166 | /* |
174 | * Internal exceptions used for control | 167 | * Internal exceptions used for control |
175 | */ | 168 | */ |
@@ -187,16 +180,13 @@ | |||
187 | 180 | ||
188 | #define AE_CODE_CTRL_MAX 0x000B | 181 | #define AE_CODE_CTRL_MAX 0x000B |
189 | 182 | ||
190 | |||
191 | #ifdef DEFINE_ACPI_GLOBALS | 183 | #ifdef DEFINE_ACPI_GLOBALS |
192 | 184 | ||
193 | |||
194 | /* | 185 | /* |
195 | * String versions of the exception codes above | 186 | * String versions of the exception codes above |
196 | * These strings must match the corresponding defines exactly | 187 | * These strings must match the corresponding defines exactly |
197 | */ | 188 | */ |
198 | char const *acpi_gbl_exception_names_env[] = | 189 | char const *acpi_gbl_exception_names_env[] = { |
199 | { | ||
200 | "AE_OK", | 190 | "AE_OK", |
201 | "AE_ERROR", | 191 | "AE_ERROR", |
202 | "AE_NO_ACPI_TABLES", | 192 | "AE_NO_ACPI_TABLES", |
@@ -231,8 +221,7 @@ char const *acpi_gbl_exception_names_env[] = | |||
231 | "AE_OWNER_ID_LIMIT" | 221 | "AE_OWNER_ID_LIMIT" |
232 | }; | 222 | }; |
233 | 223 | ||
234 | char const *acpi_gbl_exception_names_pgm[] = | 224 | char const *acpi_gbl_exception_names_pgm[] = { |
235 | { | ||
236 | "AE_BAD_PARAMETER", | 225 | "AE_BAD_PARAMETER", |
237 | "AE_BAD_CHARACTER", | 226 | "AE_BAD_CHARACTER", |
238 | "AE_BAD_PATHNAME", | 227 | "AE_BAD_PATHNAME", |
@@ -244,8 +233,7 @@ char const *acpi_gbl_exception_names_pgm[] = | |||
244 | "AE_BAD_DECIMAL_CONSTANT" | 233 | "AE_BAD_DECIMAL_CONSTANT" |
245 | }; | 234 | }; |
246 | 235 | ||
247 | char const *acpi_gbl_exception_names_tbl[] = | 236 | char const *acpi_gbl_exception_names_tbl[] = { |
248 | { | ||
249 | "AE_BAD_SIGNATURE", | 237 | "AE_BAD_SIGNATURE", |
250 | "AE_BAD_HEADER", | 238 | "AE_BAD_HEADER", |
251 | "AE_BAD_CHECKSUM", | 239 | "AE_BAD_CHECKSUM", |
@@ -254,8 +242,7 @@ char const *acpi_gbl_exception_names_tbl[] = | |||
254 | "AE_INVALID_TABLE_LENGTH" | 242 | "AE_INVALID_TABLE_LENGTH" |
255 | }; | 243 | }; |
256 | 244 | ||
257 | char const *acpi_gbl_exception_names_aml[] = | 245 | char const *acpi_gbl_exception_names_aml[] = { |
258 | { | ||
259 | "AE_AML_ERROR", | 246 | "AE_AML_ERROR", |
260 | "AE_AML_PARSE", | 247 | "AE_AML_PARSE", |
261 | "AE_AML_BAD_OPCODE", | 248 | "AE_AML_BAD_OPCODE", |
@@ -291,8 +278,7 @@ char const *acpi_gbl_exception_names_aml[] = | |||
291 | "AE_AML_BAD_RESOURCE_LENGTH" | 278 | "AE_AML_BAD_RESOURCE_LENGTH" |
292 | }; | 279 | }; |
293 | 280 | ||
294 | char const *acpi_gbl_exception_names_ctrl[] = | 281 | char const *acpi_gbl_exception_names_ctrl[] = { |
295 | { | ||
296 | "AE_CTRL_RETURN_VALUE", | 282 | "AE_CTRL_RETURN_VALUE", |
297 | "AE_CTRL_PENDING", | 283 | "AE_CTRL_PENDING", |
298 | "AE_CTRL_TERMINATE", | 284 | "AE_CTRL_TERMINATE", |
@@ -306,6 +292,6 @@ char const *acpi_gbl_exception_names_ctrl[] = | |||
306 | "AE_CTRL_SKIP" | 292 | "AE_CTRL_SKIP" |
307 | }; | 293 | }; |
308 | 294 | ||
309 | #endif /* ACPI GLOBALS */ | 295 | #endif /* ACPI GLOBALS */ |
310 | 296 | ||
311 | #endif /* __ACEXCEP_H__ */ | 297 | #endif /* __ACEXCEP_H__ */ |