aboutsummaryrefslogtreecommitdiff
path: root/include/acpi/acexcep.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-03 01:08:52 -0500
committerLen Brown <len.brown@intel.com>2007-02-03 01:08:52 -0500
commite8bdc5a9c56c140c732246a298922c3cf3777460 (patch)
treedfdbf3a5597dfc5b29324a4dcb303839504cd88e /include/acpi/acexcep.h
parentc6f4bc211122c86de85a6c93f139319957fd1f8a (diff)
parentb0b7eaaf0c7aefd118d3ff8640fbed75a9fad9a1 (diff)
Pull acpica into test branch
Diffstat (limited to 'include/acpi/acexcep.h')
-rw-r--r--include/acpi/acexcep.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 797ca1ea521..b73f18a4878 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -178,8 +178,10 @@
#define AE_CTRL_BREAK (acpi_status) (0x0009 | AE_CODE_CONTROL)
#define AE_CTRL_CONTINUE (acpi_status) (0x000A | AE_CODE_CONTROL)
#define AE_CTRL_SKIP (acpi_status) (0x000B | AE_CODE_CONTROL)
+#define AE_CTRL_PARSE_CONTINUE (acpi_status) (0x000C | AE_CODE_CONTROL)
+#define AE_CTRL_PARSE_PENDING (acpi_status) (0x000D | AE_CODE_CONTROL)
-#define AE_CODE_CTRL_MAX 0x000B
+#define AE_CODE_CTRL_MAX 0x000D
#ifdef DEFINE_ACPI_GLOBALS
@@ -291,7 +293,9 @@ char const *acpi_gbl_exception_names_ctrl[] = {
"AE_CTRL_TRANSFER",
"AE_CTRL_BREAK",
"AE_CTRL_CONTINUE",
- "AE_CTRL_SKIP"
+ "AE_CTRL_SKIP",
+ "AE_CTRL_PARSE_CONTINUE",
+ "AE_CTRL_PARSE_PENDING"
};
#endif /* ACPI GLOBALS */