Connect the new ACPICA code to the 'acpica' device.

3 files changed, 141 insertions, 10 deletions

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 18f6539..6489bf3 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -45,6 +45,11 @@ INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
+
+# This hack lets us use the Intel ACPICA code without spamming a new 
+# include path into 100+ source files.
+INCLUDES+= -I$S/contrib/dev/acpica/Subsystem/Include
+
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 18f6539..6489bf3 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -45,6 +45,11 @@ INCLUDES+= -I$S/../include
 .else
 INCLUDES+= -I/usr/include
 .endif
+
+# This hack lets us use the Intel ACPICA code without spamming a new 
+# include path into 100+ source files.
+INCLUDES+= -I$S/contrib/dev/acpica/Subsystem/Include
+
 COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 
diff --git a/sys/conf/files b/sys/conf/files
index 44f24f6..f31a6f2 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -46,6 +46,108 @@ coda/coda_subr.c	optional vcoda
 coda/coda_venus.c	optional vcoda
 coda/coda_vfsops.c	optional vcoda
 coda/coda_vnops.c	optional vcoda
+contrib/dev/acpica/Subsystem/Common/cmalloc.c	optional acpica
+contrib/dev/acpica/Subsystem/Common/cmclib.c	optional acpica
+contrib/dev/acpica/Subsystem/Common/cmcopy.c	optional acpica
+contrib/dev/acpica/Subsystem/Common/cmdebug.c	optional acpica
+contrib/dev/acpica/Subsystem/Common/cmdelete.c	optional acpica
+contrib/dev/acpica/Subsystem/Common/cmeval.c	optional acpica
+contrib/dev/acpica/Subsystem/Common/cmglobal.c	optional acpica
+contrib/dev/acpica/Subsystem/Common/cminit.c	optional acpica
+contrib/dev/acpica/Subsystem/Common/cmobject.c	optional acpica
+contrib/dev/acpica/Subsystem/Common/cmutils.c	optional acpica
+contrib/dev/acpica/Subsystem/Common/cmxface.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbcmds.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbdisasm.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbdisply.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbexec.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbfileio.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbhistry.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbinput.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbstats.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbutils.c	optional acpica
+contrib/dev/acpica/Subsystem/Debugger/dbxface.c	optional acpica
+contrib/dev/acpica/Subsystem/Dispatcher/dsfield.c	optional acpica
+contrib/dev/acpica/Subsystem/Dispatcher/dsmethod.c	optional acpica
+contrib/dev/acpica/Subsystem/Dispatcher/dsmthdat.c	optional acpica
+contrib/dev/acpica/Subsystem/Dispatcher/dsobject.c	optional acpica
+contrib/dev/acpica/Subsystem/Dispatcher/dsopcode.c	optional acpica
+contrib/dev/acpica/Subsystem/Dispatcher/dsutils.c	optional acpica
+contrib/dev/acpica/Subsystem/Dispatcher/dswexec.c	optional acpica
+contrib/dev/acpica/Subsystem/Dispatcher/dswload.c	optional acpica
+contrib/dev/acpica/Subsystem/Dispatcher/dswscope.c	optional acpica
+contrib/dev/acpica/Subsystem/Dispatcher/dswstate.c	optional acpica
+contrib/dev/acpica/Subsystem/Events/evevent.c	optional acpica
+contrib/dev/acpica/Subsystem/Events/evmisc.c	optional acpica
+contrib/dev/acpica/Subsystem/Events/evregion.c	optional acpica
+contrib/dev/acpica/Subsystem/Events/evrgnini.c	optional acpica
+contrib/dev/acpica/Subsystem/Events/evsci.c	optional acpica
+contrib/dev/acpica/Subsystem/Events/evxface.c	optional acpica
+contrib/dev/acpica/Subsystem/Events/evxfevnt.c	optional acpica
+contrib/dev/acpica/Subsystem/Events/evxfregn.c	optional acpica
+contrib/dev/acpica/Subsystem/Hardware/hwacpi.c	optional acpica
+contrib/dev/acpica/Subsystem/Hardware/hwcpu32.c	optional acpica
+contrib/dev/acpica/Subsystem/Hardware/hwgpe.c	optional acpica
+contrib/dev/acpica/Subsystem/Hardware/hwregs.c	optional acpica
+contrib/dev/acpica/Subsystem/Hardware/hwxface.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amconfig.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amcreate.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amdump.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amdyadic.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amfield.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amfldio.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/ammisc.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/ammonad.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amnames.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amprep.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amregion.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amresnte.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amresolv.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amresop.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amstore.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amstoren.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amstorob.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amsystem.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amutils.c	optional acpica
+contrib/dev/acpica/Subsystem/Interpreter/amxface.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nsaccess.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nsalloc.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nsdump.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nseval.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nsinit.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nsload.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nsnames.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nsobject.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nssearch.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nsutils.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nswalk.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nsxfname.c	optional acpica
+contrib/dev/acpica/Subsystem/Namespace/nsxfobj.c	optional acpica
+contrib/dev/acpica/Subsystem/Parser/psargs.c	optional acpica
+contrib/dev/acpica/Subsystem/Parser/psfind.c	optional acpica
+contrib/dev/acpica/Subsystem/Parser/psopcode.c	optional acpica
+contrib/dev/acpica/Subsystem/Parser/psparse.c	optional acpica
+contrib/dev/acpica/Subsystem/Parser/psscope.c	optional acpica
+contrib/dev/acpica/Subsystem/Parser/pstree.c	optional acpica
+contrib/dev/acpica/Subsystem/Parser/psutils.c	optional acpica
+contrib/dev/acpica/Subsystem/Parser/pswalk.c	optional acpica
+contrib/dev/acpica/Subsystem/Parser/psxface.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rsaddr.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rscalc.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rscreate.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rsdump.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rsio.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rsirq.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rslist.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rsmemory.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rsmisc.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rsutils.c	optional acpica
+contrib/dev/acpica/Subsystem/Resources/rsxface.c	optional acpica
+contrib/dev/acpica/Subsystem/Tables/tbget.c	optional acpica
+contrib/dev/acpica/Subsystem/Tables/tbinstal.c	optional acpica
+contrib/dev/acpica/Subsystem/Tables/tbutils.c	optional acpica
+contrib/dev/acpica/Subsystem/Tables/tbxface.c	optional acpica
+contrib/dev/acpica/Subsystem/Tables/tbxfroot.c	optional acpica
 crypto/blowfish/bf_cbc.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_cbc_m.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_enc.c	optional ipsec ipsec_esp
@@ -84,16 +186,35 @@ dev/aac/aac_pci.c	optional aac pci
 dev/acpi/acpi.c		optional acpi
 dev/acpi/acpi_io.c	optional acpi
 dev/acpi/acpi_event.c	optional acpi
-dev/acpi/acpi_powerres.c	optional	acpi
-dev/acpi/aml/aml_amlmem.c	optional	acpi
-dev/acpi/aml/aml_common.c	optional	acpi
-dev/acpi/aml/aml_evalobj.c	optional	acpi
-dev/acpi/aml/aml_memman.c	optional	acpi
-dev/acpi/aml/aml_name.c		optional	acpi
-dev/acpi/aml/aml_obj.c		optional	acpi
-dev/acpi/aml/aml_parse.c	optional	acpi
-dev/acpi/aml/aml_store.c	optional	acpi
-dev/acpi/aml/aml_region.c	optional	acpi
+dev/acpi/acpi_powerres.c	optional acpi
+dev/acpi/aml/aml_amlmem.c	optional acpi
+dev/acpi/aml/aml_common.c	optional acpi
+dev/acpi/aml/aml_evalobj.c	optional acpi
+dev/acpi/aml/aml_memman.c	optional acpi
+dev/acpi/aml/aml_name.c		optional acpi
+dev/acpi/aml/aml_obj.c		optional acpi
+dev/acpi/aml/aml_parse.c	optional acpi
+dev/acpi/aml/aml_store.c	optional acpi
+dev/acpi/aml/aml_region.c	optional acpi
+dev/acpica/acpi.c		optional acpica
+dev/acpica/acpi_apic.c		optional acpica
+dev/acpica/acpi_button.c	optional acpica
+dev/acpica/acpi_ec.c		optional acpica
+dev/acpica/acpi_isa.c		optional acpica isa
+dev/acpica/acpi_lid.c		optional acpica
+dev/acpica/acpi_pcib.c		optional acpica pci
+dev/acpica/acpi_processor.c	optional acpica
+dev/acpica/acpi_resource.c	optional acpica
+dev/acpica/acpi_thermal.c	optional acpica
+dev/acpica/acpi_timer.c		optional acpica
+dev/acpica/Osd/OsdDebug.c	optional acpica
+dev/acpica/Osd/OsdEnvironment.c	optional acpica
+dev/acpica/Osd/OsdHardware.c	optional acpica
+dev/acpica/Osd/OsdInterrupt.c	optional acpica
+dev/acpica/Osd/OsdMemory.c	optional acpica
+dev/acpica/Osd/OsdSchedule.c	optional acpica
+dev/acpica/Osd/OsdStream.c	optional acpica
+dev/acpica/Osd/OsdSynch.c	optional acpica
 dev/advansys/adv_eisa.c	optional adv eisa
 dev/advansys/adv_pci.c	optional adv pci
 dev/advansys/advansys.c	optional adv