diff options
Diffstat (limited to 'include/acpi/acexcep.h')
| -rw-r--r-- | include/acpi/acexcep.h | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h index 60d737b2d70f..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 | /* |
| @@ -95,9 +92,9 @@ | |||
| 95 | #define AE_ABORT_METHOD (acpi_status) (0x001C | AE_CODE_ENVIRONMENTAL) | 92 | #define AE_ABORT_METHOD (acpi_status) (0x001C | AE_CODE_ENVIRONMENTAL) |
| 96 | #define AE_SAME_HANDLER (acpi_status) (0x001D | AE_CODE_ENVIRONMENTAL) | 93 | #define AE_SAME_HANDLER (acpi_status) (0x001D | AE_CODE_ENVIRONMENTAL) |
| 97 | #define AE_WAKE_ONLY_GPE (acpi_status) (0x001E | AE_CODE_ENVIRONMENTAL) | 94 | #define AE_WAKE_ONLY_GPE (acpi_status) (0x001E | AE_CODE_ENVIRONMENTAL) |
| 95 | #define AE_OWNER_ID_LIMIT (acpi_status) (0x001F | AE_CODE_ENVIRONMENTAL) | ||
| 98 | 96 | ||
| 99 | #define AE_CODE_ENV_MAX 0x001E | 97 | #define AE_CODE_ENV_MAX 0x001F |
| 100 | |||
| 101 | 98 | ||
| 102 | /* | 99 | /* |
| 103 | * Programmer exceptions | 100 | * Programmer exceptions |
| @@ -114,7 +111,6 @@ | |||
| 114 | 111 | ||
| 115 | #define AE_CODE_PGM_MAX 0x0009 | 112 | #define AE_CODE_PGM_MAX 0x0009 |
| 116 | 113 | ||
| 117 | |||
| 118 | /* | 114 | /* |
| 119 | * Acpi table exceptions | 115 | * Acpi table exceptions |
| 120 | */ | 116 | */ |
| @@ -127,7 +123,6 @@ | |||
| 127 | 123 | ||
| 128 | #define AE_CODE_TBL_MAX 0x0006 | 124 | #define AE_CODE_TBL_MAX 0x0006 |
| 129 | 125 | ||
| 130 | |||
| 131 | /* | 126 | /* |
| 132 | * AML exceptions. These are caused by problems with | 127 | * AML exceptions. These are caused by problems with |
| 133 | * the actual AML byte stream | 128 | * the actual AML byte stream |
| @@ -168,7 +163,6 @@ | |||
| 168 | 163 | ||
| 169 | #define AE_CODE_AML_MAX 0x0021 | 164 | #define AE_CODE_AML_MAX 0x0021 |
| 170 | 165 | ||
| 171 | |||
| 172 | /* | 166 | /* |
| 173 | * Internal exceptions used for control | 167 | * Internal exceptions used for control |
| 174 | */ | 168 | */ |
| @@ -186,16 +180,13 @@ | |||
| 186 | 180 | ||
| 187 | #define AE_CODE_CTRL_MAX 0x000B | 181 | #define AE_CODE_CTRL_MAX 0x000B |
| 188 | 182 | ||
| 189 | |||
| 190 | #ifdef DEFINE_ACPI_GLOBALS | 183 | #ifdef DEFINE_ACPI_GLOBALS |
| 191 | 184 | ||
| 192 | |||
| 193 | /* | 185 | /* |
| 194 | * String versions of the exception codes above | 186 | * String versions of the exception codes above |
| 195 | * These strings must match the corresponding defines exactly | 187 | * These strings must match the corresponding defines exactly |
| 196 | */ | 188 | */ |
| 197 | char const *acpi_gbl_exception_names_env[] = | 189 | char const *acpi_gbl_exception_names_env[] = { |
| 198 | { | ||
| 199 | "AE_OK", | 190 | "AE_OK", |
| 200 | "AE_ERROR", | 191 | "AE_ERROR", |
| 201 | "AE_NO_ACPI_TABLES", | 192 | "AE_NO_ACPI_TABLES", |
| @@ -226,11 +217,11 @@ char const *acpi_gbl_exception_names_env[] = | |||
| 226 | "AE_LOGICAL_ADDRESS", | 217 | "AE_LOGICAL_ADDRESS", |
| 227 | "AE_ABORT_METHOD", | 218 | "AE_ABORT_METHOD", |
| 228 | "AE_SAME_HANDLER", | 219 | "AE_SAME_HANDLER", |
| 229 | "AE_WAKE_ONLY_GPE" | 220 | "AE_WAKE_ONLY_GPE", |
| 221 | "AE_OWNER_ID_LIMIT" | ||
| 230 | }; | 222 | }; |
| 231 | 223 | ||
| 232 | char const *acpi_gbl_exception_names_pgm[] = | 224 | char const *acpi_gbl_exception_names_pgm[] = { |
| 233 | { | ||
| 234 | "AE_BAD_PARAMETER", | 225 | "AE_BAD_PARAMETER", |
| 235 | "AE_BAD_CHARACTER", | 226 | "AE_BAD_CHARACTER", |
| 236 | "AE_BAD_PATHNAME", | 227 | "AE_BAD_PATHNAME", |
| @@ -242,8 +233,7 @@ char const *acpi_gbl_exception_names_pgm[] = | |||
| 242 | "AE_BAD_DECIMAL_CONSTANT" | 233 | "AE_BAD_DECIMAL_CONSTANT" |
| 243 | }; | 234 | }; |
| 244 | 235 | ||
| 245 | char const *acpi_gbl_exception_names_tbl[] = | 236 | char const *acpi_gbl_exception_names_tbl[] = { |
| 246 | { | ||
| 247 | "AE_BAD_SIGNATURE", | 237 | "AE_BAD_SIGNATURE", |
| 248 | "AE_BAD_HEADER", | 238 | "AE_BAD_HEADER", |
| 249 | "AE_BAD_CHECKSUM", | 239 | "AE_BAD_CHECKSUM", |
| @@ -252,8 +242,7 @@ char const *acpi_gbl_exception_names_tbl[] = | |||
| 252 | "AE_INVALID_TABLE_LENGTH" | 242 | "AE_INVALID_TABLE_LENGTH" |
| 253 | }; | 243 | }; |
| 254 | 244 | ||
| 255 | char const *acpi_gbl_exception_names_aml[] = | 245 | char const *acpi_gbl_exception_names_aml[] = { |
| 256 | { | ||
| 257 | "AE_AML_ERROR", | 246 | "AE_AML_ERROR", |
| 258 | "AE_AML_PARSE", | 247 | "AE_AML_PARSE", |
| 259 | "AE_AML_BAD_OPCODE", | 248 | "AE_AML_BAD_OPCODE", |
| @@ -289,8 +278,7 @@ char const *acpi_gbl_exception_names_aml[] = | |||
| 289 | "AE_AML_BAD_RESOURCE_LENGTH" | 278 | "AE_AML_BAD_RESOURCE_LENGTH" |
| 290 | }; | 279 | }; |
| 291 | 280 | ||
| 292 | char const *acpi_gbl_exception_names_ctrl[] = | 281 | char const *acpi_gbl_exception_names_ctrl[] = { |
| 293 | { | ||
| 294 | "AE_CTRL_RETURN_VALUE", | 282 | "AE_CTRL_RETURN_VALUE", |
| 295 | "AE_CTRL_PENDING", | 283 | "AE_CTRL_PENDING", |
| 296 | "AE_CTRL_TERMINATE", | 284 | "AE_CTRL_TERMINATE", |
| @@ -304,6 +292,6 @@ char const *acpi_gbl_exception_names_ctrl[] = | |||
| 304 | "AE_CTRL_SKIP" | 292 | "AE_CTRL_SKIP" |
| 305 | }; | 293 | }; |
| 306 | 294 | ||
| 307 | #endif /* ACPI GLOBALS */ | 295 | #endif /* ACPI GLOBALS */ |
| 308 | 296 | ||
| 309 | #endif /* __ACEXCEP_H__ */ | 297 | #endif /* __ACEXCEP_H__ */ |
