- Make ACPI use PCH. Cuts down compile time to 9 seconds on gcc.

svn path=/trunk/; revision=20747
2024-11-07 23:22:36 +00:00 · 2006-01-09 00:41:48 +00:00 · 2006-01-09 00:41:48 +00:00 · 627eebfc7b
commit 627eebfc7b
parent 9cfeba8d37
111 changed files with 219 additions and 606 deletions
--- a/reactos/drivers/bus/acpi/acpi.xml
+++ b/reactos/drivers/bus/acpi/acpi.xml
@ -134,4 +134,5 @@
 		<file>cmxface.c</file>
 	</directory>
 	<file>acpi.rc</file>
+	<pch>include/acpi.h</pch>
 </module>
--- a/reactos/drivers/bus/acpi/dispatcher/dsfield.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsfield.c
@ -24,12 +24,7 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsfield")
--- a/reactos/drivers/bus/acpi/dispatcher/dsmethod.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsmethod.c
@ -24,15 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "acdebug.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsmethod")
--- a/reactos/drivers/bus/acpi/dispatcher/dsmthdat.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsmthdat.c
@ -24,13 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsmthdat")
--- a/reactos/drivers/bus/acpi/dispatcher/dsobject.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsobject.c
@ -24,12 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsobject")
--- a/reactos/drivers/bus/acpi/dispatcher/dsopcode.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsopcode.c
@ -25,14 +25,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "actables.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsopcode")
--- a/reactos/drivers/bus/acpi/dispatcher/dsutils.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dsutils.c
@ -24,13 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acdebug.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dsutils")
--- a/reactos/drivers/bus/acpi/dispatcher/dswexec.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dswexec.c
@ -25,14 +25,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acdebug.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dswexec")
--- a/reactos/drivers/bus/acpi/dispatcher/dswload.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dswload.c
@ -24,14 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acevents.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dswload")
--- a/reactos/drivers/bus/acpi/dispatcher/dswscope.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dswscope.c
@ -24,10 +24,7 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "acdispat.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dswscope")
--- a/reactos/drivers/bus/acpi/dispatcher/dswstate.c
+++ b/reactos/drivers/bus/acpi/dispatcher/dswstate.c
@ -24,12 +24,7 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acnamesp.h"
-#include "acinterp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_DISPATCHER
 	 MODULE_NAME         ("dswstate")
--- a/reactos/drivers/bus/acpi/events/evevent.c
+++ b/reactos/drivers/bus/acpi/events/evevent.c
@ -24,11 +24,7 @@
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

-#include "acpi.h"
-#include "achware.h"
-#include "acevents.h"
-#include "acnamesp.h"
-#include "accommon.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evevent")
--- a/reactos/drivers/bus/acpi/events/evmisc.c
+++ b/reactos/drivers/bus/acpi/events/evmisc.c
@ -24,11 +24,7 @@
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

-#include "acpi.h"
-#include "acevents.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "achware.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evmisc")
--- a/reactos/drivers/bus/acpi/events/evregion.c
+++ b/reactos/drivers/bus/acpi/events/evregion.c
@ -24,11 +24,7 @@
 */


-#include "acpi.h"
-#include "acevents.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evregion")
--- a/reactos/drivers/bus/acpi/events/evrgnini.c
+++ b/reactos/drivers/bus/acpi/events/evrgnini.c
@ -24,11 +24,7 @@
 */


-#include "acpi.h"
-#include "acevents.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evrgnini")
--- a/reactos/drivers/bus/acpi/events/evsci.c
+++ b/reactos/drivers/bus/acpi/events/evsci.c
@ -24,11 +24,7 @@
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

-#include "acpi.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evsci")
--- a/reactos/drivers/bus/acpi/events/evxface.c
+++ b/reactos/drivers/bus/acpi/events/evxface.c
@ -24,12 +24,7 @@
 */


-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acinterp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evxface")
--- a/reactos/drivers/bus/acpi/events/evxfevnt.c
+++ b/reactos/drivers/bus/acpi/events/evxfevnt.c
@ -24,12 +24,7 @@
 */


-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acinterp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evxfevnt")
--- a/reactos/drivers/bus/acpi/events/evxfregn.c
+++ b/reactos/drivers/bus/acpi/events/evxfregn.c
@ -25,12 +25,7 @@
 */


-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acinterp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_EVENTS
 	 MODULE_NAME         ("evxfregn")
--- a/reactos/drivers/bus/acpi/executer/amconfig.c
+++ b/reactos/drivers/bus/acpi/executer/amconfig.c
@ -24,14 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "actables.h"
-#include "acdispat.h"
+#include <acpi.h>


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amconvrt.c
+++ b/reactos/drivers/bus/acpi/executer/amconvrt.c
@ -24,14 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acdispat.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("amconvrt")
--- a/reactos/drivers/bus/acpi/executer/amcreate.c
+++ b/reactos/drivers/bus/acpi/executer/amcreate.c
@ -24,13 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acevents.h"
-#include "acdispat.h"
+#include <acpi.h>


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amdump.c
+++ b/reactos/drivers/bus/acpi/executer/amdump.c
@ -24,11 +24,7 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "actables.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("amdump")
--- a/reactos/drivers/bus/acpi/executer/amdyadic.c
+++ b/reactos/drivers/bus/acpi/executer/amdyadic.c
@ -24,13 +24,8 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "acevents.h"
-#include "amlcode.h"
-#include "acdispat.h"
+#include <acpi.h>
+


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amfield.c
+++ b/reactos/drivers/bus/acpi/executer/amfield.c
@ -24,13 +24,8 @@
 */


-#include "acpi.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi.h>
+


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amfldio.c
+++ b/reactos/drivers/bus/acpi/executer/amfldio.c
@ -24,12 +24,7 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi.h>


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/ammisc.c
+++ b/reactos/drivers/bus/acpi/executer/ammisc.c
@ -25,11 +25,8 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acdispat.h"
+#include <acpi.h>
+


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/ammonad.c
+++ b/reactos/drivers/bus/acpi/executer/ammonad.c
@ -25,12 +25,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi.h>


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/ammutex.c
+++ b/reactos/drivers/bus/acpi/executer/ammutex.c
@ -25,11 +25,8 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi.h>
+

 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("ammutex")
--- a/reactos/drivers/bus/acpi/executer/amnames.c
+++ b/reactos/drivers/bus/acpi/executer/amnames.c
@ -25,10 +25,8 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi.h>
+

 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("amnames")
--- a/reactos/drivers/bus/acpi/executer/amprep.c
+++ b/reactos/drivers/bus/acpi/executer/amprep.c
@ -25,11 +25,7 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acparser.h"
+#include <acpi.h>


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amregion.c
+++ b/reactos/drivers/bus/acpi/executer/amregion.c
@ -25,12 +25,8 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi.h>
+


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amresnte.c
+++ b/reactos/drivers/bus/acpi/executer/amresnte.c
@ -25,14 +25,8 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "acevents.h"
+#include <acpi.h>
+


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amresolv.c
+++ b/reactos/drivers/bus/acpi/executer/amresolv.c
@ -25,14 +25,8 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "acevents.h"
+#include <acpi.h>
+


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amresop.c
+++ b/reactos/drivers/bus/acpi/executer/amresop.c
@ -25,14 +25,8 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "actables.h"
-#include "acevents.h"
+#include <acpi.h>
+


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amstore.c
+++ b/reactos/drivers/bus/acpi/executer/amstore.c
@ -25,13 +25,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "actables.h"
+#include <acpi.h>


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amstoren.c
+++ b/reactos/drivers/bus/acpi/executer/amstoren.c
@ -26,13 +26,8 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "actables.h"
+#include <acpi.h>
+


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amstorob.c
+++ b/reactos/drivers/bus/acpi/executer/amstorob.c
@ -25,13 +25,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "actables.h"
+#include <acpi.h>


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/executer/amsystem.c
+++ b/reactos/drivers/bus/acpi/executer/amsystem.c
@ -25,11 +25,8 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "achware.h"
-#include "acevents.h"
+#include <acpi.h>
+

 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("amsystem")
--- a/reactos/drivers/bus/acpi/executer/amutils.c
+++ b/reactos/drivers/bus/acpi/executer/amutils.c
@ -25,12 +25,8 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acevents.h"
+#include <acpi.h>
+

 #define _COMPONENT          ACPI_EXECUTER
 	 MODULE_NAME         ("amutils")
--- a/reactos/drivers/bus/acpi/executer/amxface.c
+++ b/reactos/drivers/bus/acpi/executer/amxface.c
@ -25,8 +25,8 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
+#include <acpi.h>
+


 #define _COMPONENT          ACPI_EXECUTER
--- a/reactos/drivers/bus/acpi/hardware/hwacpi.c
+++ b/reactos/drivers/bus/acpi/hardware/hwacpi.c
@ -25,9 +25,7 @@
 */


-#include "acpi.h"
-#include "achware.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_HARDWARE
 	 MODULE_NAME         ("hwacpi")
--- a/reactos/drivers/bus/acpi/hardware/hwgpe.c
+++ b/reactos/drivers/bus/acpi/hardware/hwgpe.c
@ -24,10 +24,7 @@
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
-#include "acevents.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_HARDWARE
 	 MODULE_NAME         ("hwgpe")
--- a/reactos/drivers/bus/acpi/hardware/hwregs.c
+++ b/reactos/drivers/bus/acpi/hardware/hwregs.c
@ -26,9 +26,7 @@
 */


-#include "acpi.h"
-#include "achware.h"
-#include "acnamesp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_HARDWARE
 	 MODULE_NAME         ("hwregs")
--- a/reactos/drivers/bus/acpi/hardware/hwsleep.c
+++ b/reactos/drivers/bus/acpi/hardware/hwsleep.c
@ -24,9 +24,7 @@
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

-#include "acpi.h"
-#include "acnamesp.h"
-#include "achware.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_HARDWARE
 	 MODULE_NAME         ("hwsleep")
--- a/reactos/drivers/bus/acpi/hardware/hwtimer.c
+++ b/reactos/drivers/bus/acpi/hardware/hwtimer.c
@ -24,8 +24,7 @@
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

-#include "acpi.h"
-#include "achware.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_HARDWARE
 	 MODULE_NAME         ("hwtimer")
--- a/reactos/drivers/bus/acpi/include/acexcep.h
+++ b/reactos/drivers/bus/acpi/include/acexcep.h
@ -146,102 +146,5 @@
 #define AE_CODE_CTRL_MAX                0x0008


-#ifdef DEFINE_ACPI_GLOBALS
-
-/*
- * String versions of the exception codes above
- * These strings must match the corresponding defines exactly
- */
-static NATIVE_CHAR          *acpi_gbl_exception_names_env[] =
-{
-	"AE_OK",
-	"AE_ERROR",
-	"AE_NO_ACPI_TABLES",
-	"AE_NO_NAMESPACE",
-	"AE_NO_MEMORY",
-	"AE_NOT_FOUND",
-	"AE_NOT_EXIST",
-	"AE_EXIST",
-	"AE_TYPE",
-	"AE_NULL_OBJECT",
-	"AE_NULL_ENTRY",
-	"AE_BUFFER_OVERFLOW",
-	"AE_STACK_OVERFLOW",
-	"AE_STACK_UNDERFLOW",
-	"AE_NOT_IMPLEMENTED",
-	"AE_VERSION_MISMATCH",
-	"AE_SUPPORT",
-	"AE_SHARE",
-	"AE_LIMIT",
-	"AE_TIME",
-	"AE_UNKNOWN_STATUS",
-	"AE_ACQUIRE_DEADLOCK",
-	"AE_RELEASE_DEADLOCK",
-	"AE_NOT_ACQUIRED",
-	"AE_ALREADY_ACQUIRED",
-	"AE_NO_HARDWARE_RESPONSE",
-	"AE_NO_GLOBAL_LOCK",
-};
-
-static NATIVE_CHAR          *acpi_gbl_exception_names_pgm[] =
-{
-	"AE_BAD_PARAMETER",
-	"AE_BAD_CHARACTER",
-	"AE_BAD_PATHNAME",
-	"AE_BAD_DATA",
-	"AE_BAD_ADDRESS",
-};
-
-static NATIVE_CHAR          *acpi_gbl_exception_names_tbl[] =
-{
-	"AE_BAD_SIGNATURE",
-	"AE_BAD_HEADER",
-	"AE_BAD_CHECKSUM",
-	"AE_BAD_VALUE",
-};
-
-static NATIVE_CHAR          *acpi_gbl_exception_names_aml[] =
-{
-	"AE_AML_ERROR",
-	"AE_AML_PARSE",
-	"AE_AML_BAD_OPCODE",
-	"AE_AML_NO_OPERAND",
-	"AE_AML_OPERAND_TYPE",
-	"AE_AML_OPERAND_VALUE",
-	"AE_AML_UNINITIALIZED_LOCAL",
-	"AE_AML_UNINITIALIZED_ARG",
-	"AE_AML_UNINITIALIZED_ELEMENT",
-	"AE_AML_NUMERIC_OVERFLOW",
-	"AE_AML_REGION_LIMIT",
-	"AE_AML_BUFFER_LIMIT",
-	"AE_AML_PACKAGE_LIMIT",
-	"AE_AML_DIVIDE_BY_ZERO",
-	"AE_AML_BAD_NAME",
-	"AE_AML_NAME_NOT_FOUND",
-	"AE_AML_INTERNAL",
-	"AE_AML_INVALID_SPACE_ID",
-	"AE_AML_STRING_LIMIT",
-	"AE_AML_NO_RETURN_VALUE",
-	"AE_AML_METHOD_LIMIT",
-	"AE_AML_NOT_OWNER",
-	"AE_AML_MUTEX_ORDER",
-	"AE_AML_MUTEX_NOT_ACQUIRED",
-};
-
-static NATIVE_CHAR          *acpi_gbl_exception_names_ctrl[] =
-{
-	"AE_CTRL_RETURN_VALUE",
-	"AE_CTRL_PENDING",
-	"AE_CTRL_TERMINATE",
-	"AE_CTRL_TRUE",
-	"AE_CTRL_FALSE",
-	"AE_CTRL_DEPTH",
-	"AE_CTRL_END",
-	"AE_CTRL_TRANSFER",
-};
-
-
-#endif /* DEFINE_ACPI_GLOBALS */
-

 #endif /* __ACEXCEP_H__ */
--- a/reactos/drivers/bus/acpi/include/acpi.h
+++ b/reactos/drivers/bus/acpi/include/acpi.h
@ -29,6 +29,7 @@
 #include "platform/types.h"
 #undef ROUND_DOWN
 #undef ROUND_UP
+#define DEFINE_ACPI_GLOBALS

 /*
 * Common includes for all ACPI driver files
@ -51,6 +52,18 @@
 #include "achware.h"            /* Hardware defines and interfaces */
 #include "accommon.h"           /* Common interfaces */
 #include "acresrc.h"            /* Resource Manager function prototypes */
-
+#include "acparser.h"
+#include "acinterp.h"
+#include "amlcode.h"
+#include "acnamesp.h"
+#include "acevents.h"
+#include "actables.h"
+#include "acdispat.h"
+#include <ntddk.h>
+#include <bm.h>
+#include <bn.h>
+#include <bmpower.h>
+#include <acpisys.h>
+#include <acglobal.h>

 #endif /* __ACPI_H__ */
--- a/reactos/drivers/bus/acpi/namespace/nsaccess.c
+++ b/reactos/drivers/bus/acpi/namespace/nsaccess.c
@ -24,12 +24,7 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acdispat.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsaccess")
--- a/reactos/drivers/bus/acpi/namespace/nsalloc.c
+++ b/reactos/drivers/bus/acpi/namespace/nsalloc.c
@ -24,10 +24,7 @@
 */


-#include "acpi.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsalloc")
--- a/reactos/drivers/bus/acpi/namespace/nseval.c
+++ b/reactos/drivers/bus/acpi/namespace/nseval.c
@ -25,12 +25,7 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nseval")
--- a/reactos/drivers/bus/acpi/namespace/nsinit.c
+++ b/reactos/drivers/bus/acpi/namespace/nsinit.c
@ -24,9 +24,7 @@
 */


-#include "acpi.h"
-#include "acnamesp.h"
-#include "acdispat.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsinit")
--- a/reactos/drivers/bus/acpi/namespace/nsload.c
+++ b/reactos/drivers/bus/acpi/namespace/nsload.c
@ -24,14 +24,7 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acdebug.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsload")
--- a/reactos/drivers/bus/acpi/namespace/nsnames.c
+++ b/reactos/drivers/bus/acpi/namespace/nsnames.c
@ -24,11 +24,7 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsnames")
--- a/reactos/drivers/bus/acpi/namespace/nsobject.c
+++ b/reactos/drivers/bus/acpi/namespace/nsobject.c
@ -25,12 +25,7 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "actables.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsobject")
--- a/reactos/drivers/bus/acpi/namespace/nssearch.c
+++ b/reactos/drivers/bus/acpi/namespace/nssearch.c
@ -24,11 +24,7 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nssearch")
--- a/reactos/drivers/bus/acpi/namespace/nsutils.c
+++ b/reactos/drivers/bus/acpi/namespace/nsutils.c
@ -25,11 +25,7 @@
 */


-#include "acpi.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "actables.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsutils")
--- a/reactos/drivers/bus/acpi/namespace/nswalk.c
+++ b/reactos/drivers/bus/acpi/namespace/nswalk.c
@ -24,10 +24,7 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nswalk")
--- a/reactos/drivers/bus/acpi/namespace/nsxfname.c
+++ b/reactos/drivers/bus/acpi/namespace/nsxfname.c
@ -25,13 +25,7 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acevents.h"
+#include <acpi.h>


 #define _COMPONENT          ACPI_NAMESPACE
--- a/reactos/drivers/bus/acpi/namespace/nsxfobj.c
+++ b/reactos/drivers/bus/acpi/namespace/nsxfobj.c
@ -25,11 +25,7 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acdispat.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_NAMESPACE
 	 MODULE_NAME         ("nsxfobj")
--- a/reactos/drivers/bus/acpi/ospm/acpienum.c
+++ b/reactos/drivers/bus/acpi/ospm/acpienum.c
@ -7,8 +7,7 @@
 * UPDATE HISTORY:
 *      01-05-2001  CSH  Created
 */
-#include <acpisys.h>
-#include <bm.h>
+#include <acpi.h>

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/bus/acpi/ospm/acpisys.c
+++ b/reactos/drivers/bus/acpi/ospm/acpisys.c
@ -7,9 +7,7 @@
 * UPDATE HISTORY:
 *      01-05-2001  CSH  Created
 */
-#include <acpisys.h>
-#include <bm.h>
-#include <bn.h>
+#include <acpi.h>

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/bus/acpi/ospm/bn.c
+++ b/reactos/drivers/bus/acpi/ospm/bn.c
@ -24,8 +24,6 @@
 */

 #include <acpi.h>
-#include "bn.h"
-

 #define _COMPONENT		ACPI_BUTTON
 	MODULE_NAME		("bn")
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bm.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bm.c
@ -25,7 +25,7 @@


 #include <acpi.h>
-#include "bm.h"
+


 #define _COMPONENT		ACPI_BUS_MANAGER
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c
@ -25,7 +25,7 @@


 #include <acpi.h>
-#include "bm.h"
+


 #define _COMPONENT		ACPI_BUS_MANAGER
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c
@ -25,8 +25,6 @@


 #include <acpi.h>
-#include "bm.h"
-#include "bmpower.h"


 #define _COMPONENT		ACPI_POWER_CONTROL
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c
@ -34,9 +34,6 @@


 #include <acpi.h>
-#include "bm.h"
-#include "bmpower.h"
-

 #define _COMPONENT		ACPI_POWER_CONTROL
 	MODULE_NAME		("bmpower")
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c
@ -25,7 +25,6 @@


 #include <acpi.h>
-#include "bm.h"

 #define _COMPONENT		ACPI_BUS_MANAGER
 	MODULE_NAME		("bmrequest")
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c
@ -25,7 +25,6 @@


 #include <acpi.h>
-#include "bm.h"


 #define _COMPONENT		ACPI_BUS_MANAGER
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c
@ -25,8 +25,6 @@


 #include <acpi.h>
-#include "bm.h"
-

 #define _COMPONENT		ACPI_BUS_MANAGER
 	MODULE_NAME		("bmutils")
--- a/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c
+++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c
@ -25,7 +25,6 @@


 #include <acpi.h>
-#include "bm.h"

 #define _COMPONENT		ACPI_BUS_MANAGER
 	MODULE_NAME		("bmxface")
--- a/reactos/drivers/bus/acpi/ospm/fdo.c
+++ b/reactos/drivers/bus/acpi/ospm/fdo.c
@ -8,9 +8,7 @@
 * UPDATE HISTORY:
 *      08-08-2001  CSH  Created
 */
-#include <acpisys.h>
-#include <bm.h>
-#include <bn.h>
+#include <acpi.h>

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/bus/acpi/ospm/include/acpisys.h
+++ b/reactos/drivers/bus/acpi/ospm/include/acpisys.h
@ -4,9 +4,6 @@
 * PURPOSE: ACPI bus driver definitions
 */
 #define ACPI_DEBUG
-#include <acpi.h>
-#include <ntddk.h>
-#include <bm.h>

 typedef ACPI_STATUS (*ACPI_DRIVER_FUNCTION)(VOID);

--- a/reactos/drivers/bus/acpi/ospm/osl.c
+++ b/reactos/drivers/bus/acpi/ospm/osl.c
@ -22,7 +22,7 @@
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#include <acpisys.h>
+#include <acpi.h>

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/bus/acpi/ospm/pdo.c
+++ b/reactos/drivers/bus/acpi/ospm/pdo.c
@ -7,9 +7,7 @@
 * UPDATE HISTORY:
 *      08-08-2001  CSH  Created
 */
-#include <acpisys.h>
-#include <bm.h>
-#include <bn.h>
+#include <acpi.h>

 #define NDEBUG
 #include <debug.h>
--- a/reactos/drivers/bus/acpi/parser/psargs.c
+++ b/reactos/drivers/bus/acpi/parser/psargs.c
@ -24,10 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psargs")
--- a/reactos/drivers/bus/acpi/parser/psopcode.c
+++ b/reactos/drivers/bus/acpi/parser/psopcode.c
@ -24,9 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
+#include <acpi.h>


 #define _COMPONENT          ACPI_PARSER
--- a/reactos/drivers/bus/acpi/parser/psparse.c
+++ b/reactos/drivers/bus/acpi/parser/psparse.c
@ -33,13 +33,7 @@
 * templates in Aml_op_info[]
 */

-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-#include "acdebug.h"
-#include "acinterp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psparse")
--- a/reactos/drivers/bus/acpi/parser/psscope.c
+++ b/reactos/drivers/bus/acpi/parser/psscope.c
@ -24,8 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psscope")
--- a/reactos/drivers/bus/acpi/parser/pstree.c
+++ b/reactos/drivers/bus/acpi/parser/pstree.c
@ -24,9 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("pstree")
--- a/reactos/drivers/bus/acpi/parser/psutils.c
+++ b/reactos/drivers/bus/acpi/parser/psutils.c
@ -24,9 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psutils")
--- a/reactos/drivers/bus/acpi/parser/pswalk.c
+++ b/reactos/drivers/bus/acpi/parser/pswalk.c
@ -24,12 +24,7 @@
 */


-#include "acpi.h"
-#include "amlcode.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acnamesp.h"
-#include "acinterp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("pswalk")
--- a/reactos/drivers/bus/acpi/parser/psxface.c
+++ b/reactos/drivers/bus/acpi/parser/psxface.c
@ -24,13 +24,7 @@
 */


-#include "acpi.h"
-#include "acparser.h"
-#include "acdispat.h"
-#include "acinterp.h"
-#include "amlcode.h"
-#include "acnamesp.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_PARSER
 	 MODULE_NAME         ("psxface")
--- a/reactos/drivers/bus/acpi/resource/rsaddr.c
+++ b/reactos/drivers/bus/acpi/resource/rsaddr.c
@ -27,8 +27,7 @@
 */


-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsaddr")
--- a/reactos/drivers/bus/acpi/resource/rscalc.c
+++ b/reactos/drivers/bus/acpi/resource/rscalc.c
@ -25,10 +25,7 @@
 */


-#include "acpi.h"
-#include "acresrc.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rscalc")
--- a/reactos/drivers/bus/acpi/resource/rscreate.c
+++ b/reactos/drivers/bus/acpi/resource/rscreate.c
@ -26,10 +26,7 @@
 */


-#include "acpi.h"
-#include "acresrc.h"
-#include "amlcode.h"
-#include "acnamesp.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rscreate")
--- a/reactos/drivers/bus/acpi/resource/rsdump.c
+++ b/reactos/drivers/bus/acpi/resource/rsdump.c
@ -24,8 +24,7 @@
 */


-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsdump")
--- a/reactos/drivers/bus/acpi/resource/rsio.c
+++ b/reactos/drivers/bus/acpi/resource/rsio.c
@ -29,9 +29,7 @@
 */


-#include "acpi.h"
-#include "acresrc.h"
-
+#include <acpi.h>
 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsio")

--- a/reactos/drivers/bus/acpi/resource/rsirq.c
+++ b/reactos/drivers/bus/acpi/resource/rsirq.c
@ -27,8 +27,7 @@
 */


-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsirq")
--- a/reactos/drivers/bus/acpi/resource/rslist.c
+++ b/reactos/drivers/bus/acpi/resource/rslist.c
@ -25,8 +25,7 @@
 */


-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rslist")
--- a/reactos/drivers/bus/acpi/resource/rsmemory.c
+++ b/reactos/drivers/bus/acpi/resource/rsmemory.c
@ -29,8 +29,7 @@
 */


-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsmemory")
--- a/reactos/drivers/bus/acpi/resource/rsmisc.c
+++ b/reactos/drivers/bus/acpi/resource/rsmisc.c
@ -31,8 +31,7 @@
 */


-#include "acpi.h"
-#include "acresrc.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsmisc")
--- a/reactos/drivers/bus/acpi/resource/rsutils.c
+++ b/reactos/drivers/bus/acpi/resource/rsutils.c
@ -24,10 +24,7 @@
 */


-#include "acpi.h"
-#include "acnamesp.h"
-#include "acresrc.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsutils")
--- a/reactos/drivers/bus/acpi/resource/rsxface.c
+++ b/reactos/drivers/bus/acpi/resource/rsxface.c
@ -24,10 +24,7 @@
 */


-#include "acpi.h"
-#include "acinterp.h"
-#include "acnamesp.h"
-#include "acresrc.h"
+#include <acpi.h>

 #define _COMPONENT          ACPI_RESOURCES
 	 MODULE_NAME         ("rsxface")
--- a/reactos/drivers/bus/acpi/tables/tbconvrt.c
+++ b/reactos/drivers/bus/acpi/tables/tbconvrt.c
@ -24,11 +24,7 @@
 */


-#include "acpi.h"
-#include "achware.h"
-#include "actables.h"
-#include "actbl.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbconvrt")
--- a/reactos/drivers/bus/acpi/tables/tbget.c
+++ b/reactos/drivers/bus/acpi/tables/tbget.c
@ -24,10 +24,7 @@
 */


-#include "acpi.h"
-#include "achware.h"
-#include "actables.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbget")
--- a/reactos/drivers/bus/acpi/tables/tbinstal.c
+++ b/reactos/drivers/bus/acpi/tables/tbinstal.c
@ -24,10 +24,7 @@
 */


-#include "acpi.h"
-#include "achware.h"
-#include "actables.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbinstal")
--- a/reactos/drivers/bus/acpi/tables/tbutils.c
+++ b/reactos/drivers/bus/acpi/tables/tbutils.c
@ -24,10 +24,7 @@
 */


-#include "acpi.h"
-#include "actables.h"
-#include "acinterp.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbutils")
--- a/reactos/drivers/bus/acpi/tables/tbxface.c
+++ b/reactos/drivers/bus/acpi/tables/tbxface.c
@ -25,11 +25,7 @@
 */


-#include "acpi.h"
-#include "acnamesp.h"
-#include "acinterp.h"
-#include "actables.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbxface")
--- a/reactos/drivers/bus/acpi/tables/tbxfroot.c
+++ b/reactos/drivers/bus/acpi/tables/tbxfroot.c
@ -24,10 +24,7 @@
 */


-#include "acpi.h"
-#include "achware.h"
-#include "actables.h"
-
+#include <acpi.h>

 #define _COMPONENT          ACPI_TABLES
 	 MODULE_NAME         ("tbxfroot")
--- a/Show more
+++ b/Show more