diff options
Diffstat (limited to 'drivers/acpi/acpica/psopcode.c')
-rw-r--r-- | drivers/acpi/acpica/psopcode.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c index ed1d457bd5ca..e5572a78bdb8 100644 --- a/drivers/acpi/acpica/psopcode.c +++ b/drivers/acpi/acpica/psopcode.c | |||
@@ -392,10 +392,12 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = { | |||
392 | AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE), | 392 | AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE), |
393 | /* 38 */ ACPI_OP("LAnd", ARGP_LAND_OP, ARGI_LAND_OP, ACPI_TYPE_ANY, | 393 | /* 38 */ ACPI_OP("LAnd", ARGP_LAND_OP, ARGI_LAND_OP, ACPI_TYPE_ANY, |
394 | AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R, | 394 | AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R, |
395 | AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | AML_CONSTANT), | 395 | AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | |
396 | AML_CONSTANT), | ||
396 | /* 39 */ ACPI_OP("LOr", ARGP_LOR_OP, ARGI_LOR_OP, ACPI_TYPE_ANY, | 397 | /* 39 */ ACPI_OP("LOr", ARGP_LOR_OP, ARGI_LOR_OP, ACPI_TYPE_ANY, |
397 | AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R, | 398 | AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R, |
398 | AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | AML_CONSTANT), | 399 | AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | |
400 | AML_CONSTANT), | ||
399 | /* 3A */ ACPI_OP("LNot", ARGP_LNOT_OP, ARGI_LNOT_OP, ACPI_TYPE_ANY, | 401 | /* 3A */ ACPI_OP("LNot", ARGP_LNOT_OP, ARGI_LNOT_OP, ACPI_TYPE_ANY, |
400 | AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R, | 402 | AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R, |
401 | AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT), | 403 | AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT), |
@@ -495,7 +497,8 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = { | |||
495 | AML_NSNODE | AML_NAMED | AML_DEFER), | 497 | AML_NSNODE | AML_NAMED | AML_DEFER), |
496 | /* 59 */ ACPI_OP("Field", ARGP_FIELD_OP, ARGI_FIELD_OP, ACPI_TYPE_ANY, | 498 | /* 59 */ ACPI_OP("Field", ARGP_FIELD_OP, ARGI_FIELD_OP, ACPI_TYPE_ANY, |
497 | AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD, | 499 | AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD, |
498 | AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD), | 500 | AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | |
501 | AML_FIELD), | ||
499 | /* 5A */ ACPI_OP("Device", ARGP_DEVICE_OP, ARGI_DEVICE_OP, | 502 | /* 5A */ ACPI_OP("Device", ARGP_DEVICE_OP, ARGI_DEVICE_OP, |
500 | ACPI_TYPE_DEVICE, AML_CLASS_NAMED_OBJECT, | 503 | ACPI_TYPE_DEVICE, AML_CLASS_NAMED_OBJECT, |
501 | AML_TYPE_NAMED_NO_OBJ, | 504 | AML_TYPE_NAMED_NO_OBJ, |
@@ -519,12 +522,13 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = { | |||
519 | /* 5E */ ACPI_OP("IndexField", ARGP_INDEX_FIELD_OP, ARGI_INDEX_FIELD_OP, | 522 | /* 5E */ ACPI_OP("IndexField", ARGP_INDEX_FIELD_OP, ARGI_INDEX_FIELD_OP, |
520 | ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT, | 523 | ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT, |
521 | AML_TYPE_NAMED_FIELD, | 524 | AML_TYPE_NAMED_FIELD, |
522 | AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD), | 525 | AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | |
526 | AML_FIELD), | ||
523 | /* 5F */ ACPI_OP("BankField", ARGP_BANK_FIELD_OP, ARGI_BANK_FIELD_OP, | 527 | /* 5F */ ACPI_OP("BankField", ARGP_BANK_FIELD_OP, ARGI_BANK_FIELD_OP, |
524 | ACPI_TYPE_LOCAL_BANK_FIELD, AML_CLASS_NAMED_OBJECT, | 528 | ACPI_TYPE_LOCAL_BANK_FIELD, |
525 | AML_TYPE_NAMED_FIELD, | 529 | AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD, |
526 | AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD | | 530 | AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | |
527 | AML_DEFER), | 531 | AML_FIELD | AML_DEFER), |
528 | 532 | ||
529 | /* Internal opcodes that map to invalid AML opcodes */ | 533 | /* Internal opcodes that map to invalid AML opcodes */ |
530 | 534 | ||
@@ -632,7 +636,8 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = { | |||
632 | /* 7D */ ACPI_OP("[EvalSubTree]", ARGP_SCOPE_OP, ARGI_SCOPE_OP, | 636 | /* 7D */ ACPI_OP("[EvalSubTree]", ARGP_SCOPE_OP, ARGI_SCOPE_OP, |
633 | ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT, | 637 | ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT, |
634 | AML_TYPE_NAMED_NO_OBJ, | 638 | AML_TYPE_NAMED_NO_OBJ, |
635 | AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE), | 639 | AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | |
640 | AML_NSNODE), | ||
636 | 641 | ||
637 | /* ACPI 3.0 opcodes */ | 642 | /* ACPI 3.0 opcodes */ |
638 | 643 | ||