diff options
author | Robert Moore <Robert.Moore@intel.com> | 2016-12-02 12:54:50 -0800 |
---|---|---|
committer | Robert Moore <Robert.Moore@intel.com> | 2016-12-02 12:54:50 -0800 |
commit | bee9af547cc31e365620a5ad40c88b882636ab5b (patch) | |
tree | 6bc164e589e7586b385e26bf134d9d3b6ad90bba /source/include/acexcep.h | |
parent | aa72e7745f9a801c836b7804fe041559038972b8 (diff) | |
parent | e033071cf5e989ec31e922dbc86702546de7a7d0 (diff) | |
download | acpica-bee9af547cc31e365620a5ad40c88b882636ab5b.tar.gz |
Merge branch 'master' of ssh://ssh.github.com/acpica/acpica
Diffstat (limited to 'source/include/acexcep.h')
-rw-r--r-- | source/include/acexcep.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/include/acexcep.h b/source/include/acexcep.h index c5217295d..e6d6adb9e 100644 --- a/source/include/acexcep.h +++ b/source/include/acexcep.h @@ -289,11 +289,10 @@ typedef struct acpi_exception_info #define AE_CTRL_TRANSFER EXCEP_CTL (0x0008) #define AE_CTRL_BREAK EXCEP_CTL (0x0009) #define AE_CTRL_CONTINUE EXCEP_CTL (0x000A) -#define AE_CTRL_SKIP EXCEP_CTL (0x000B) -#define AE_CTRL_PARSE_CONTINUE EXCEP_CTL (0x000C) -#define AE_CTRL_PARSE_PENDING EXCEP_CTL (0x000D) +#define AE_CTRL_PARSE_CONTINUE EXCEP_CTL (0x000B) +#define AE_CTRL_PARSE_PENDING EXCEP_CTL (0x000C) -#define AE_CODE_CTRL_MAX 0x000D +#define AE_CODE_CTRL_MAX 0x000C /* Exception strings for AcpiFormatException */ @@ -416,7 +415,6 @@ static const ACPI_EXCEPTION_INFO AcpiGbl_ExceptionNames_Ctrl[] = EXCEP_TXT ("AE_CTRL_TRANSFER", "Transfer control to called method"), EXCEP_TXT ("AE_CTRL_BREAK", "A Break has been executed"), EXCEP_TXT ("AE_CTRL_CONTINUE", "A Continue has been executed"), - EXCEP_TXT ("AE_CTRL_SKIP", "Not currently used"), EXCEP_TXT ("AE_CTRL_PARSE_CONTINUE", "Used to skip over bad opcodes"), EXCEP_TXT ("AE_CTRL_PARSE_PENDING", "Used to implement AML While loops") }; |