diff options
78 files changed, 337 insertions, 342 deletions
diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c index 6928f21..fb01a3f 100644 --- a/sys/amd64/acpica/OsdEnvironment.c +++ b/sys/amd64/acpica/OsdEnvironment.c @@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$"); #include <sys/linker_set.h> #include <sys/sysctl.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/actables.h> static u_long amd64_acpi_root; @@ -63,7 +63,7 @@ AcpiOsGetRootPointer(void) if (amd64_acpi_root == 0 && (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || - AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) && + AcpiFindRootPointer((ACPI_SIZE *)&ptr) == AE_OK) && ptr != 0) amd64_acpi_root = ptr; diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c index c69f14a..b902c12 100644 --- a/sys/amd64/acpica/acpi_machdep.c +++ b/sys/amd64/acpica/acpi_machdep.c @@ -33,7 +33,8 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/sysctl.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <machine/nexusvar.h> diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 2f9d8a0..bcc405f 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -53,7 +53,8 @@ __FBSDID("$FreeBSD$"); #include <machine/smp.h> #endif -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include "acpi_wakecode.h" diff --git a/sys/amd64/acpica/madt.c b/sys/amd64/acpica/madt.c index a8df55d..b27f8e4 100644 --- a/sys/amd64/acpica/madt.c +++ b/sys/amd64/acpica/madt.c @@ -48,8 +48,10 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/specialreg.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> +#include <contrib/dev/acpica/include/actables.h> + #include <dev/acpica/acpivar.h> #include <dev/pci/pcivar.h> diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile index 9a2a3fa..c1bbb52 100644 --- a/sys/boot/i386/libi386/Makefile +++ b/sys/boot/i386/libi386/Makefile @@ -48,7 +48,7 @@ CFLAGS+= -DTERM_EMU CFLAGS+= -Dalloca=__builtin_alloca CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ - -I${.CURDIR}/../../../contrib/dev/acpica \ + -I${.CURDIR}/../../../contrib/dev/acpica/include \ -I${.CURDIR}/../../.. -I. # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ diff --git a/sys/boot/i386/libi386/biosacpi.c b/sys/boot/i386/libi386/biosacpi.c index 971e7c7..0815983 100644 --- a/sys/boot/i386/libi386/biosacpi.c +++ b/sys/boot/i386/libi386/biosacpi.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <btxv86.h> #include "libi386.h" -#include "acfreebsd.h" +#include "platform/acfreebsd.h" #include "acconfig.h" #define ACPI_SYSTEM_XFACE #include "actypes.h" diff --git a/sys/boot/ia64/ski/acpi_stub.c b/sys/boot/ia64/ski/acpi_stub.c index 8e08e52..b16bb0a 100644 --- a/sys/boot/ia64/ski/acpi_stub.c +++ b/sys/boot/ia64/ski/acpi_stub.c @@ -27,7 +27,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> #define APIC_IO_SAPIC 6 #define APIC_LOCAL_SAPIC 7 diff --git a/sys/conf/files b/sys/conf/files index 2cdc23d..903a957 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -122,131 +122,134 @@ contrib/altq/altq/altq_rio.c optional altq \ contrib/altq/altq/altq_rmclass.c optional altq contrib/altq/altq/altq_subr.c optional altq \ compile-with "${NORMAL_C} -I$S/contrib/pf" -contrib/dev/acpica/dbcmds.c optional acpi acpi_debug -contrib/dev/acpica/dbdisply.c optional acpi acpi_debug -contrib/dev/acpica/dbexec.c optional acpi acpi_debug -contrib/dev/acpica/dbfileio.c optional acpi acpi_debug -contrib/dev/acpica/dbhistry.c optional acpi acpi_debug -contrib/dev/acpica/dbinput.c optional acpi acpi_debug -contrib/dev/acpica/dbstats.c optional acpi acpi_debug -contrib/dev/acpica/dbutils.c optional acpi acpi_debug -contrib/dev/acpica/dbxface.c optional acpi acpi_debug -contrib/dev/acpica/dmbuffer.c optional acpi acpi_debug -contrib/dev/acpica/dmnames.c optional acpi acpi_debug -contrib/dev/acpica/dmopcode.c optional acpi acpi_debug -contrib/dev/acpica/dmobject.c optional acpi acpi_debug -contrib/dev/acpica/dmresrc.c optional acpi acpi_debug -contrib/dev/acpica/dmresrcl.c optional acpi acpi_debug -contrib/dev/acpica/dmresrcs.c optional acpi acpi_debug -contrib/dev/acpica/dmutils.c optional acpi acpi_debug -contrib/dev/acpica/dmwalk.c optional acpi acpi_debug -contrib/dev/acpica/dsfield.c optional acpi -contrib/dev/acpica/dsinit.c optional acpi -contrib/dev/acpica/dsmethod.c optional acpi -contrib/dev/acpica/dsmthdat.c optional acpi -contrib/dev/acpica/dsobject.c optional acpi -contrib/dev/acpica/dsopcode.c optional acpi -contrib/dev/acpica/dsutils.c optional acpi -contrib/dev/acpica/dswexec.c optional acpi -contrib/dev/acpica/dswload.c optional acpi -contrib/dev/acpica/dswscope.c optional acpi -contrib/dev/acpica/dswstate.c optional acpi -contrib/dev/acpica/evevent.c optional acpi -contrib/dev/acpica/evgpe.c optional acpi -contrib/dev/acpica/evgpeblk.c optional acpi -contrib/dev/acpica/evmisc.c optional acpi -contrib/dev/acpica/evregion.c optional acpi -contrib/dev/acpica/evrgnini.c optional acpi -contrib/dev/acpica/evsci.c optional acpi -contrib/dev/acpica/evxface.c optional acpi -contrib/dev/acpica/evxfevnt.c optional acpi -contrib/dev/acpica/evxfregn.c optional acpi -contrib/dev/acpica/exconfig.c optional acpi -contrib/dev/acpica/exconvrt.c optional acpi -contrib/dev/acpica/excreate.c optional acpi -contrib/dev/acpica/exdump.c optional acpi -contrib/dev/acpica/exfield.c optional acpi -contrib/dev/acpica/exfldio.c optional acpi -contrib/dev/acpica/exmisc.c optional acpi -contrib/dev/acpica/exmutex.c optional acpi -contrib/dev/acpica/exnames.c optional acpi -contrib/dev/acpica/exoparg1.c optional acpi -contrib/dev/acpica/exoparg2.c optional acpi -contrib/dev/acpica/exoparg3.c optional acpi -contrib/dev/acpica/exoparg6.c optional acpi -contrib/dev/acpica/exprep.c optional acpi -contrib/dev/acpica/exregion.c optional acpi -contrib/dev/acpica/exresnte.c optional acpi -contrib/dev/acpica/exresolv.c optional acpi -contrib/dev/acpica/exresop.c optional acpi -contrib/dev/acpica/exstore.c optional acpi -contrib/dev/acpica/exstoren.c optional acpi -contrib/dev/acpica/exstorob.c optional acpi -contrib/dev/acpica/exsystem.c optional acpi -contrib/dev/acpica/exutils.c optional acpi -contrib/dev/acpica/hwacpi.c optional acpi -contrib/dev/acpica/hwgpe.c optional acpi -contrib/dev/acpica/hwregs.c optional acpi -contrib/dev/acpica/hwsleep.c optional acpi -contrib/dev/acpica/hwtimer.c optional acpi -contrib/dev/acpica/nsaccess.c optional acpi -contrib/dev/acpica/nsalloc.c optional acpi -contrib/dev/acpica/nsdump.c optional acpi -contrib/dev/acpica/nseval.c optional acpi -contrib/dev/acpica/nsinit.c optional acpi -contrib/dev/acpica/nsload.c optional acpi -contrib/dev/acpica/nsnames.c optional acpi -contrib/dev/acpica/nsobject.c optional acpi -contrib/dev/acpica/nsparse.c optional acpi -contrib/dev/acpica/nssearch.c optional acpi -contrib/dev/acpica/nsutils.c optional acpi -contrib/dev/acpica/nswalk.c optional acpi -contrib/dev/acpica/nsxfeval.c optional acpi -contrib/dev/acpica/nsxfname.c optional acpi -contrib/dev/acpica/nsxfobj.c optional acpi -contrib/dev/acpica/psargs.c optional acpi -contrib/dev/acpica/psloop.c optional acpi -contrib/dev/acpica/psopcode.c optional acpi -contrib/dev/acpica/psparse.c optional acpi -contrib/dev/acpica/psscope.c optional acpi -contrib/dev/acpica/pstree.c optional acpi -contrib/dev/acpica/psutils.c optional acpi -contrib/dev/acpica/pswalk.c optional acpi -contrib/dev/acpica/psxface.c optional acpi -contrib/dev/acpica/rsaddr.c optional acpi -contrib/dev/acpica/rscalc.c optional acpi -contrib/dev/acpica/rscreate.c optional acpi -contrib/dev/acpica/rsdump.c optional acpi -contrib/dev/acpica/rsinfo.c optional acpi -contrib/dev/acpica/rsio.c optional acpi -contrib/dev/acpica/rsirq.c optional acpi -contrib/dev/acpica/rslist.c optional acpi -contrib/dev/acpica/rsmemory.c optional acpi -contrib/dev/acpica/rsmisc.c optional acpi -contrib/dev/acpica/rsutils.c optional acpi -contrib/dev/acpica/rsxface.c optional acpi -contrib/dev/acpica/tbfadt.c optional acpi -contrib/dev/acpica/tbfind.c optional acpi -contrib/dev/acpica/tbinstal.c optional acpi -contrib/dev/acpica/tbutils.c optional acpi -contrib/dev/acpica/tbxface.c optional acpi -contrib/dev/acpica/tbxfroot.c optional acpi -contrib/dev/acpica/utalloc.c optional acpi -contrib/dev/acpica/utcache.c optional acpi -contrib/dev/acpica/utclib.c optional acpi -contrib/dev/acpica/utcopy.c optional acpi -contrib/dev/acpica/utdebug.c optional acpi -contrib/dev/acpica/utdelete.c optional acpi -contrib/dev/acpica/uteval.c optional acpi -contrib/dev/acpica/utglobal.c optional acpi -contrib/dev/acpica/utinit.c optional acpi -contrib/dev/acpica/utmath.c optional acpi -contrib/dev/acpica/utmisc.c optional acpi -contrib/dev/acpica/utmutex.c optional acpi -contrib/dev/acpica/utobject.c optional acpi -contrib/dev/acpica/utresrc.c optional acpi -contrib/dev/acpica/utstate.c optional acpi -contrib/dev/acpica/utxface.c optional acpi +contrib/dev/acpica/debugger/dbcmds.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbdisply.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbexec.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbfileio.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbhistry.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbinput.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbstats.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbutils.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbxface.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmbuffer.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmnames.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmopcode.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmobject.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmresrc.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmresrcl.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmresrcs.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmutils.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmwalk.c optional acpi acpi_debug +contrib/dev/acpica/dispatcher/dsfield.c optional acpi +contrib/dev/acpica/dispatcher/dsinit.c optional acpi +contrib/dev/acpica/dispatcher/dsmethod.c optional acpi +contrib/dev/acpica/dispatcher/dsmthdat.c optional acpi +contrib/dev/acpica/dispatcher/dsobject.c optional acpi +contrib/dev/acpica/dispatcher/dsopcode.c optional acpi +contrib/dev/acpica/dispatcher/dsutils.c optional acpi +contrib/dev/acpica/dispatcher/dswexec.c optional acpi +contrib/dev/acpica/dispatcher/dswload.c optional acpi +contrib/dev/acpica/dispatcher/dswscope.c optional acpi +contrib/dev/acpica/dispatcher/dswstate.c optional acpi +contrib/dev/acpica/events/evevent.c optional acpi +contrib/dev/acpica/events/evgpe.c optional acpi +contrib/dev/acpica/events/evgpeblk.c optional acpi +contrib/dev/acpica/events/evmisc.c optional acpi +contrib/dev/acpica/events/evregion.c optional acpi +contrib/dev/acpica/events/evrgnini.c optional acpi +contrib/dev/acpica/events/evsci.c optional acpi +contrib/dev/acpica/events/evxface.c optional acpi +contrib/dev/acpica/events/evxfevnt.c optional acpi +contrib/dev/acpica/events/evxfregn.c optional acpi +contrib/dev/acpica/executer/exconfig.c optional acpi +contrib/dev/acpica/executer/exconvrt.c optional acpi +contrib/dev/acpica/executer/excreate.c optional acpi +contrib/dev/acpica/executer/exdump.c optional acpi +contrib/dev/acpica/executer/exfield.c optional acpi +contrib/dev/acpica/executer/exfldio.c optional acpi +contrib/dev/acpica/executer/exmisc.c optional acpi +contrib/dev/acpica/executer/exmutex.c optional acpi +contrib/dev/acpica/executer/exnames.c optional acpi +contrib/dev/acpica/executer/exoparg1.c optional acpi +contrib/dev/acpica/executer/exoparg2.c optional acpi +contrib/dev/acpica/executer/exoparg3.c optional acpi +contrib/dev/acpica/executer/exoparg6.c optional acpi +contrib/dev/acpica/executer/exprep.c optional acpi +contrib/dev/acpica/executer/exregion.c optional acpi +contrib/dev/acpica/executer/exresnte.c optional acpi +contrib/dev/acpica/executer/exresolv.c optional acpi +contrib/dev/acpica/executer/exresop.c optional acpi +contrib/dev/acpica/executer/exstore.c optional acpi +contrib/dev/acpica/executer/exstoren.c optional acpi +contrib/dev/acpica/executer/exstorob.c optional acpi +contrib/dev/acpica/executer/exsystem.c optional acpi +contrib/dev/acpica/executer/exutils.c optional acpi +contrib/dev/acpica/hardware/hwacpi.c optional acpi +contrib/dev/acpica/hardware/hwgpe.c optional acpi +contrib/dev/acpica/hardware/hwregs.c optional acpi +contrib/dev/acpica/hardware/hwsleep.c optional acpi +contrib/dev/acpica/hardware/hwtimer.c optional acpi +contrib/dev/acpica/hardware/hwvalid.c optional acpi +contrib/dev/acpica/hardware/hwxface.c optional acpi +contrib/dev/acpica/namespace/nsaccess.c optional acpi +contrib/dev/acpica/namespace/nsalloc.c optional acpi +contrib/dev/acpica/namespace/nsdump.c optional acpi +contrib/dev/acpica/namespace/nseval.c optional acpi +contrib/dev/acpica/namespace/nsinit.c optional acpi +contrib/dev/acpica/namespace/nsload.c optional acpi +contrib/dev/acpica/namespace/nsnames.c optional acpi +contrib/dev/acpica/namespace/nsobject.c optional acpi +contrib/dev/acpica/namespace/nsparse.c optional acpi +contrib/dev/acpica/namespace/nspredef.c optional acpi +contrib/dev/acpica/namespace/nssearch.c optional acpi +contrib/dev/acpica/namespace/nsutils.c optional acpi +contrib/dev/acpica/namespace/nswalk.c optional acpi +contrib/dev/acpica/namespace/nsxfeval.c optional acpi +contrib/dev/acpica/namespace/nsxfname.c optional acpi +contrib/dev/acpica/namespace/nsxfobj.c optional acpi +contrib/dev/acpica/parser/psargs.c optional acpi +contrib/dev/acpica/parser/psloop.c optional acpi +contrib/dev/acpica/parser/psopcode.c optional acpi +contrib/dev/acpica/parser/psparse.c optional acpi +contrib/dev/acpica/parser/psscope.c optional acpi +contrib/dev/acpica/parser/pstree.c optional acpi +contrib/dev/acpica/parser/psutils.c optional acpi +contrib/dev/acpica/parser/pswalk.c optional acpi +contrib/dev/acpica/parser/psxface.c optional acpi +contrib/dev/acpica/resources/rsaddr.c optional acpi +contrib/dev/acpica/resources/rscalc.c optional acpi +contrib/dev/acpica/resources/rscreate.c optional acpi +contrib/dev/acpica/resources/rsdump.c optional acpi +contrib/dev/acpica/resources/rsinfo.c optional acpi +contrib/dev/acpica/resources/rsio.c optional acpi +contrib/dev/acpica/resources/rsirq.c optional acpi +contrib/dev/acpica/resources/rslist.c optional acpi +contrib/dev/acpica/resources/rsmemory.c optional acpi +contrib/dev/acpica/resources/rsmisc.c optional acpi +contrib/dev/acpica/resources/rsutils.c optional acpi +contrib/dev/acpica/resources/rsxface.c optional acpi +contrib/dev/acpica/tables/tbfadt.c optional acpi +contrib/dev/acpica/tables/tbfind.c optional acpi +contrib/dev/acpica/tables/tbinstal.c optional acpi +contrib/dev/acpica/tables/tbutils.c optional acpi +contrib/dev/acpica/tables/tbxface.c optional acpi +contrib/dev/acpica/tables/tbxfroot.c optional acpi +contrib/dev/acpica/utilities/utalloc.c optional acpi +contrib/dev/acpica/utilities/utcache.c optional acpi +contrib/dev/acpica/utilities/utcopy.c optional acpi +contrib/dev/acpica/utilities/utdebug.c optional acpi +contrib/dev/acpica/utilities/utdelete.c optional acpi +contrib/dev/acpica/utilities/uteval.c optional acpi +contrib/dev/acpica/utilities/utglobal.c optional acpi +contrib/dev/acpica/utilities/utinit.c optional acpi +contrib/dev/acpica/utilities/utlock.c optional acpi +contrib/dev/acpica/utilities/utmath.c optional acpi +contrib/dev/acpica/utilities/utmisc.c optional acpi +contrib/dev/acpica/utilities/utmutex.c optional acpi +contrib/dev/acpica/utilities/utobject.c optional acpi +contrib/dev/acpica/utilities/utresrc.c optional acpi +contrib/dev/acpica/utilities/utstate.c optional acpi +contrib/dev/acpica/utilities/utxface.c optional acpi contrib/ipfilter/netinet/fil.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \ diff --git a/sys/dev/acpi_support/acpi_aiboost.c b/sys/dev/acpi_support/acpi_aiboost.c index 00bf9cb..8fff872 100644 --- a/sys/dev/acpi_support/acpi_aiboost.c +++ b/sys/dev/acpi_support/acpi_aiboost.c @@ -31,7 +31,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> #include <sys/bus.h> -#include <contrib/dev/acpica/acpi.h> + +#include <contrib/dev/acpica/include/acpi.h> + #include "acpi_if.h" #include <sys/module.h> #include <dev/acpica/acpivar.h> diff --git a/sys/dev/acpi_support/acpi_asus.c b/sys/dev/acpi_support/acpi_asus.c index 28f9e7c..51ca6fa 100644 --- a/sys/dev/acpi_support/acpi_asus.c +++ b/sys/dev/acpi_support/acpi_asus.c @@ -47,7 +47,9 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/sbuf.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #include <dev/led/led.h> diff --git a/sys/dev/acpi_support/acpi_fujitsu.c b/sys/dev/acpi_support/acpi_fujitsu.c index 5de365a..6628135 100644 --- a/sys/dev/acpi_support/acpi_fujitsu.c +++ b/sys/dev/acpi_support/acpi_fujitsu.c @@ -37,7 +37,9 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/sysctl.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> /* Hooks for the ACPI CA debugging infrastructure */ diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index ca67716..0bf340d 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -42,7 +42,10 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/bus.h> #include <machine/cpufunc.h> -#include <contrib/dev/acpica/acpi.h> + +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include "acpi_if.h" #include <sys/module.h> #include <dev/acpica/acpivar.h> diff --git a/sys/dev/acpi_support/acpi_panasonic.c b/sys/dev/acpi_support/acpi_panasonic.c index f922233..595ca08 100644 --- a/sys/dev/acpi_support/acpi_panasonic.c +++ b/sys/dev/acpi_support/acpi_panasonic.c @@ -37,7 +37,8 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/power.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #define _COMPONENT ACPI_OEM diff --git a/sys/dev/acpi_support/acpi_sony.c b/sys/dev/acpi_support/acpi_sony.c index 88195c2..905461d 100644 --- a/sys/dev/acpi_support/acpi_sony.c +++ b/sys/dev/acpi_support/acpi_sony.c @@ -31,7 +31,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> #include <sys/bus.h> -#include <contrib/dev/acpica/acpi.h> + +#include <contrib/dev/acpica/include/acpi.h> + #include "acpi_if.h" #include <sys/module.h> #include <dev/acpica/acpivar.h> diff --git a/sys/dev/acpi_support/acpi_toshiba.c b/sys/dev/acpi_support/acpi_toshiba.c index d15fe7e..343d3ae 100644 --- a/sys/dev/acpi_support/acpi_toshiba.c +++ b/sys/dev/acpi_support/acpi_toshiba.c @@ -34,7 +34,8 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #define _COMPONENT ACPI_OEM diff --git a/sys/dev/acpica/Osd/OsdDebug.c b/sys/dev/acpica/Osd/OsdDebug.c index 27b94a0..8425357 100644 --- a/sys/dev/acpica/Osd/OsdDebug.c +++ b/sys/dev/acpica/Osd/OsdDebug.c @@ -41,8 +41,10 @@ __FBSDID("$FreeBSD$"); #include <ddb/ddb.h> #include <ddb/db_output.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acdebug.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> +#include <contrib/dev/acpica/include/acdebug.h> + #include <dev/acpica/acpivar.h> UINT32 diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c index 6e3beea..cf3cdd7 100644 --- a/sys/dev/acpica/Osd/OsdHardware.c +++ b/sys/dev/acpica/Osd/OsdHardware.c @@ -32,7 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> #include <sys/bus.h> #include <sys/kernel.h> @@ -65,75 +65,9 @@ __FBSDID("$FreeBSD$"); #define ACPI_BUS_HANDLE 0 #endif -/* - * Some BIOS vendors use AML to read/write directly to IO space. This - * can cause a problem if such accesses interfere with the OS's access to - * the same ports. Windows XP and newer systems block accesses to certain - * IO ports. We print a message or block accesses based on a tunable. - */ -static int illegal_bios_ports[] = { - 0x000, 0x00f, /* DMA controller 1 */ - 0x020, 0x021, /* PIC */ - 0x040, 0x043, /* Timer 1 */ - 0x048, 0x04b, /* Timer 2 failsafe */ - 0x070, 0x071, /* CMOS and RTC */ - 0x074, 0x076, /* Extended CMOS */ - 0x081, 0x083, /* DMA1 page registers */ - 0x087, 0x087, /* DMA1 ch0 low page */ - 0x089, 0x08b, /* DMA2 ch2 (0x89), ch3 low page (0x8a, 0x8b) */ - 0x08f, 0x091, /* DMA2 low page refresh (0x8f) */ - /* Arb ctrl port, card select feedback (0x90, 0x91) */ - 0x093, 0x094, /* System board setup */ - 0x096, 0x097, /* POS channel select */ - 0x0a0, 0x0a1, /* PIC (cascaded) */ - 0x0c0, 0x0df, /* ISA DMA */ - 0x4d0, 0x4d1, /* PIC ELCR (edge/level control) */ - 0xcf8, 0xcff, /* PCI config space. Microsoft adds 0xd00 also but - that seems incorrect. */ - -1, -1 -}; - -/* Block accesses to bad IO port addresses or just print a warning. */ -static int block_bad_io; -TUNABLE_INT("debug.acpi.block_bad_io", &block_bad_io); - -/* - * Look up bad ports in our table. Returns 0 if ok, 1 if marked bad but - * access is still allowed, or -1 to deny access. - */ -static int -acpi_os_check_port(UINT32 addr, UINT32 width) -{ - int error, *port; - - error = 0; - for (port = illegal_bios_ports; *port != -1; port += 2) { - if ((addr >= port[0] && addr <= port[1]) || - (addr < port[0] && addr + (width / 8) > port[0])) { - if (block_bad_io) - error = -1; - else - error = 1; - break; - } - } - - return (error); -} - ACPI_STATUS AcpiOsReadPort(ACPI_IO_ADDRESS InPort, UINT32 *Value, UINT32 Width) { - int error; - - error = acpi_os_check_port(InPort, Width); - if (error != 0) { - if (bootverbose) - printf("acpi: bad read from port 0x%03x (%d)\n", - (int)InPort, Width); - if (error == -1) - return (AE_BAD_PARAMETER); - } switch (Width) { case 8: @@ -159,16 +93,6 @@ AcpiOsReadPort(ACPI_IO_ADDRESS InPort, UINT32 *Value, UINT32 Width) ACPI_STATUS AcpiOsWritePort(ACPI_IO_ADDRESS OutPort, UINT32 Value, UINT32 Width) { - int error; - - error = acpi_os_check_port(OutPort, Width); - if (error != 0) { - if (bootverbose) - printf("acpi: bad write to port 0x%03x (%d), val %#x\n", - (int)OutPort, Width, Value); - if (error == -1) - return (AE_BAD_PARAMETER); - } switch (Width) { case 8: diff --git a/sys/dev/acpica/Osd/OsdInterrupt.c b/sys/dev/acpica/Osd/OsdInterrupt.c index c973124..158a2b9 100644 --- a/sys/dev/acpica/Osd/OsdInterrupt.c +++ b/sys/dev/acpica/Osd/OsdInterrupt.c @@ -39,7 +39,9 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/rman.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #define _COMPONENT ACPI_OS_SERVICES diff --git a/sys/dev/acpica/Osd/OsdMemory.c b/sys/dev/acpica/Osd/OsdMemory.c index 3804bb6..8ed7a90 100644 --- a/sys/dev/acpica/Osd/OsdMemory.c +++ b/sys/dev/acpica/Osd/OsdMemory.c @@ -33,7 +33,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> #include <sys/kernel.h> #include <sys/malloc.h> @@ -55,7 +55,7 @@ AcpiOsFree(void *Memory) } void * -AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_NATIVE_UINT Length) +AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_SIZE Length) { return (pmap_mapbios((vm_offset_t)PhysicalAddress, Length)); } @@ -80,17 +80,6 @@ AcpiOsValidateInterface (char *Interface) return (AE_SUPPORT); } -/* - * There is no clean way to do this. We make the charitable assumption - * that callers will not pass garbage to us. - */ -ACPI_STATUS -AcpiOsValidateAddress (UINT8 SpaceId, ACPI_PHYSICAL_ADDRESS Address, - ACPI_SIZE Length) -{ - return (AE_OK); -} - BOOLEAN AcpiOsReadable (void *Pointer, ACPI_SIZE Length) { diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c index 795de93..fa91ed8 100644 --- a/sys/dev/acpica/Osd/OsdSchedule.c +++ b/sys/dev/acpica/Osd/OsdSchedule.c @@ -43,7 +43,9 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/taskqueue.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #define _COMPONENT ACPI_OS_SERVICES diff --git a/sys/dev/acpica/Osd/OsdStream.c b/sys/dev/acpica/Osd/OsdStream.c index 8d1291a..81181db 100644 --- a/sys/dev/acpica/Osd/OsdStream.c +++ b/sys/dev/acpica/Osd/OsdStream.c @@ -32,7 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> void AcpiOsPrintf(const char *Format, ...) diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c index b15b1ea..68fdcaa 100644 --- a/sys/dev/acpica/Osd/OsdSynch.c +++ b/sys/dev/acpica/Osd/OsdSynch.c @@ -32,7 +32,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> #include "opt_acpi.h" #include <sys/kernel.h> @@ -367,7 +368,7 @@ AcpiOsDeleteLock (ACPI_SPINLOCK Handle) * (and thus can't block) but since we have ithreads, we don't worry * about potentially blocking. */ -ACPI_NATIVE_UINT +ACPI_CPU_FLAGS AcpiOsAcquireLock (ACPI_SPINLOCK Handle) { struct acpi_spinlock *h = (struct acpi_spinlock *)Handle; diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c index d9b29eb..55f674d 100644 --- a/sys/dev/acpica/Osd/OsdTable.c +++ b/sys/dev/acpica/Osd/OsdTable.c @@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/linker.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/actables.h> #undef _COMPONENT #define _COMPONENT ACPI_TABLES @@ -67,17 +67,30 @@ ACPI_STATUS AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable, ACPI_TABLE_HEADER **NewTable) { - caddr_t acpi_dsdt, p; + char modname[] = "acpi_dsdt"; + caddr_t acpi_table, p, s; if (ExistingTable == NULL || NewTable == NULL) return (AE_BAD_PARAMETER); +#ifdef notyet + for (int i = 0; i < ACPI_NAME_SIZE; i++) + modname[i + 5] = tolower(ExistingTable->Signature[i]); +#else /* If we're not overriding the DSDT, just return. */ - if ((acpi_dsdt = preload_search_by_type("acpi_dsdt")) == NULL || - (p = preload_search_info(acpi_dsdt, MODINFO_ADDR)) == NULL) { + if (strncmp(ExistingTable->Signature, ACPI_SIG_DSDT, ACPI_NAME_SIZE) != 0) { *NewTable = NULL; - } else + return (AE_OK); + } +#endif + + if ((acpi_table = preload_search_by_type(modname)) != NULL && + (p = preload_search_info(acpi_table, MODINFO_ADDR)) != NULL && + (s = preload_search_info(acpi_table, MODINFO_SIZE)) != NULL && + *(size_t *)s != 0) *NewTable = *(ACPI_TABLE_HEADER **)p; + else + *NewTable = NULL; return (AE_OK); } diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 4bc059b..63f95d3 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -61,11 +61,12 @@ __FBSDID("$FreeBSD$"); #include <isa/isavar.h> #include <isa/pnpvar.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> +#include <contrib/dev/acpica/include/acnamesp.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpiio.h> -#include <contrib/dev/acpica/achware.h> -#include <contrib/dev/acpica/acnamesp.h> #include "pci_if.h" #include <dev/pci/pcivar.h> @@ -416,7 +417,6 @@ static int acpi_attach(device_t dev) { struct acpi_softc *sc; - ACPI_TABLE_FACS *facs; ACPI_STATUS status; int error, state; UINT32 flags; @@ -593,14 +593,7 @@ acpi_attach(device_t dev) } /* Only enable S4BIOS by default if the FACS says it is available. */ - status = AcpiGetTable(ACPI_SIG_FACS, 0, (ACPI_TABLE_HEADER **)&facs); - if (ACPI_FAILURE(status)) { - device_printf(dev, "couldn't get FACS: %s\n", - AcpiFormatException(status)); - error = ENXIO; - goto out; - } - if (facs->Flags & ACPI_FACS_S4_BIOS_PRESENT) + if (AcpiGbl_FACS->Flags & ACPI_FACS_S4_BIOS_PRESENT) sc->acpi_s4bios = 1; /* Probe all supported sleep states. */ @@ -1848,8 +1841,7 @@ acpi_shutdown_final(void *arg, int howto) (AcpiGbl_FADT.Flags & ACPI_FADT_RESET_REGISTER) && sc->acpi_handle_reboot) { /* Reboot using the reset register. */ - status = AcpiHwLowLevelWrite( - AcpiGbl_FADT.ResetRegister.BitWidth, + status = AcpiWrite( AcpiGbl_FADT.ResetValue, &AcpiGbl_FADT.ResetRegister); if (ACPI_FAILURE(status)) device_printf(sc->acpi_dev, "reset failed - %s\n", @@ -3391,8 +3383,6 @@ static struct debugtag dbg_layer[] = { }; static struct debugtag dbg_level[] = { - {"ACPI_LV_ERROR", ACPI_LV_ERROR}, - {"ACPI_LV_WARN", ACPI_LV_WARN}, {"ACPI_LV_INIT", ACPI_LV_INIT}, {"ACPI_LV_DEBUG_OBJECT", ACPI_LV_DEBUG_OBJECT}, {"ACPI_LV_INFO", ACPI_LV_INFO}, diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c index 0ea69e8..638c09b 100644 --- a/sys/dev/acpica/acpi_acad.c +++ b/sys/dev/acpica/acpi_acad.c @@ -40,7 +40,8 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/power.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpiio.h> #include <isa/isavar.h> diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c index 2e8c7a4..dd2b3fa 100644 --- a/sys/dev/acpica/acpi_battery.c +++ b/sys/dev/acpica/acpi_battery.c @@ -36,7 +36,8 @@ __FBSDID("$FreeBSD$"); #include <sys/ioccom.h> #include <sys/sysctl.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpiio.h> diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c index 197af4f..7814c0e 100644 --- a/sys/dev/acpica/acpi_button.c +++ b/sys/dev/acpica/acpi_button.c @@ -35,7 +35,9 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> /* Hooks for the ACPI CA debugging infrastructure */ diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c index 24ab5f8..dde3ad5 100644 --- a/sys/dev/acpica/acpi_cmbat.c +++ b/sys/dev/acpica/acpi_cmbat.c @@ -41,7 +41,8 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <sys/malloc.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpiio.h> diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index a65faee..5d8ad53 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -46,7 +46,9 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <sys/rman.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> /* @@ -897,9 +899,9 @@ acpi_cpu_idle() * time if USB is loaded. */ if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { - AcpiGetRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active); + AcpiReadBitRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active); if (bm_active != 0) { - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1); + AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1); cx_next_idx = min(cx_next_idx, sc->cpu_non_c3); } } @@ -926,8 +928,8 @@ acpi_cpu_idle() */ if (cx_next->type == ACPI_STATE_C3) { if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { - AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 1); - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 1); + AcpiWriteBitRegister(ACPI_BITREG_ARB_DISABLE, 1); + AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 1); } else ACPI_FLUSH_CPU_CACHE(); } @@ -938,7 +940,7 @@ acpi_cpu_idle() * get the time very close to the CPU start/stop clock logic, this * is the only reliable time source. */ - AcpiHwLowLevelRead(32, &start_time, &AcpiGbl_FADT.XPmTimerBlock); + AcpiRead(&start_time, &AcpiGbl_FADT.XPmTimerBlock); CPU_GET_REG(cx_next->p_lvlx, 1); /* @@ -947,14 +949,14 @@ acpi_cpu_idle() * the processor has stopped. Doing it again provides enough * margin that we are certain to have a correct value. */ - AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT.XPmTimerBlock); - AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT.XPmTimerBlock); + AcpiRead(&end_time, &AcpiGbl_FADT.XPmTimerBlock); + AcpiRead(&end_time, &AcpiGbl_FADT.XPmTimerBlock); /* Enable bus master arbitration and disable bus master wakeup. */ if (cx_next->type == ACPI_STATE_C3 && (cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { - AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 0); - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 0); + AcpiWriteBitRegister(ACPI_BITREG_ARB_DISABLE, 0); + AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 0); } ACPI_ENABLE_IRQS(); @@ -1069,11 +1071,11 @@ acpi_cpu_quirks(void) val |= PIIX4_STOP_BREAK_MASK; pci_write_config(acpi_dev, PIIX4_DEVACTB_REG, val, 4); } - AcpiGetRegister(ACPI_BITREG_BUS_MASTER_RLD, &val); + AcpiReadBitRegister(ACPI_BITREG_BUS_MASTER_RLD, &val); if (val) { ACPI_DEBUG_PRINT((ACPI_DB_INFO, "acpi_cpu: PIIX4: reset BRLD_EN_BM\n")); - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 0); + AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 0); } break; default: diff --git a/sys/dev/acpica/acpi_dock.c b/sys/dev/acpica/acpi_dock.c index fc59b53..b7d2e3e 100644 --- a/sys/dev/acpica/acpi_dock.c +++ b/sys/dev/acpica/acpi_dock.c @@ -32,8 +32,9 @@ #include <sys/kernel.h> #include <sys/module.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/acnamesp.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpiio.h> diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index 696542c..a5a81dc 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -42,7 +42,9 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/rman.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> /* Hooks for the ACPI CA debugging infrastructure */ diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c index 17022bb..a418695 100644 --- a/sys/dev/acpica/acpi_hpet.c +++ b/sys/dev/acpica/acpi_hpet.c @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <sys/timetc.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpi_hpet.h> diff --git a/sys/dev/acpica/acpi_if.m b/sys/dev/acpica/acpi_if.m index 2ae19f4..4d90109 100644 --- a/sys/dev/acpica/acpi_if.m +++ b/sys/dev/acpica/acpi_if.m @@ -28,7 +28,8 @@ #include <sys/bus.h> #include <sys/types.h> -#include <contrib/dev/acpica/acpi.h> + +#include <contrib/dev/acpica/include/acpi.h> INTERFACE acpi; diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c index 382d1c6..0da0182 100644 --- a/sys/dev/acpica/acpi_isab.c +++ b/sys/dev/acpica/acpi_isab.c @@ -39,7 +39,9 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/module.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #include <isa/isavar.h> diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c index 0bb4a9f..47d5b45 100644 --- a/sys/dev/acpica/acpi_lid.c +++ b/sys/dev/acpica/acpi_lid.c @@ -37,7 +37,9 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/proc.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> /* Hooks for the ACPI CA debugging infrastructure */ diff --git a/sys/dev/acpica/acpi_package.c b/sys/dev/acpica/acpi_package.c index d7be257..55eaf93 100644 --- a/sys/dev/acpica/acpi_package.c +++ b/sys/dev/acpica/acpi_package.c @@ -36,7 +36,8 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/rman.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> /* diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c index 607691c..7c1bd86 100644 --- a/sys/dev/acpica/acpi_pci.c +++ b/sys/dev/acpica/acpi_pci.c @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/module.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #include <sys/pciio.h> diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index b39e8e2..dcf101d 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -35,7 +35,8 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/module.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpi_pcibvar.h> diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c index 96c9253..cc9bcbe 100644 --- a/sys/dev/acpica/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -34,7 +34,9 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/kernel.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpi_pcibvar.h> diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 495ae20..d9827ab 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/sysctl.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #include <machine/pci_cfgreg.h> diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c index f0f2d76..0da89c4 100644 --- a/sys/dev/acpica/acpi_pcib_pci.c +++ b/sys/dev/acpica/acpi_pcib_pci.c @@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/module.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpi_pcibvar.h> diff --git a/sys/dev/acpica/acpi_perf.c b/sys/dev/acpica/acpi_perf.c index e517ad3..31b1c63 100644 --- a/sys/dev/acpica/acpi_perf.c +++ b/sys/dev/acpica/acpi_perf.c @@ -44,7 +44,8 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/rman.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include "cpufreq_if.h" diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c index 3a64e3a..0988871 100644 --- a/sys/dev/acpica/acpi_powerres.c +++ b/sys/dev/acpica/acpi_powerres.c @@ -33,7 +33,9 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/bus.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> /* diff --git a/sys/dev/acpica/acpi_quirk.c b/sys/dev/acpica/acpi_quirk.c index b75a527..fe0a06f 100644 --- a/sys/dev/acpica/acpi_quirk.c +++ b/sys/dev/acpica/acpi_quirk.c @@ -30,7 +30,8 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/bus.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> enum ops_t { diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c index 2a81e54..d9132b0 100644 --- a/sys/dev/acpica/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -39,7 +39,9 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/rman.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> /* Hooks for the ACPI CA debugging infrastructure */ diff --git a/sys/dev/acpica/acpi_smbat.c b/sys/dev/acpica/acpi_smbat.c index 3935a9f..145e240 100644 --- a/sys/dev/acpica/acpi_smbat.c +++ b/sys/dev/acpica/acpi_smbat.c @@ -33,7 +33,8 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/bus.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpiio.h> #include <dev/acpica/acpi_smbus.h> diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c index 08cd15b..962fdb7 100644 --- a/sys/dev/acpica/acpi_thermal.c +++ b/sys/dev/acpica/acpi_thermal.c @@ -45,7 +45,9 @@ __FBSDID("$FreeBSD$"); #include "cpufreq_if.h" -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> /* Hooks for the ACPI CA debugging infrastructure */ diff --git a/sys/dev/acpica/acpi_throttle.c b/sys/dev/acpica/acpi_throttle.c index d79d7ae..40476e0 100644 --- a/sys/dev/acpica/acpi_throttle.c +++ b/sys/dev/acpica/acpi_throttle.c @@ -39,7 +39,8 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 73bd5ed..cfbeea4 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -40,7 +40,9 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <sys/rman.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> + #include <dev/acpica/acpivar.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c index b9fccfc..c095a40 100644 --- a/sys/dev/acpica/acpi_video.c +++ b/sys/dev/acpica/acpi_video.c @@ -38,7 +38,8 @@ __FBSDID("$FreeBSD$"); #include <sys/queue.h> #include <sys/sysctl.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> /* ACPI video extension driver. */ diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index a2722c0..d4e835d 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -49,7 +49,9 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <machine/resource.h> -#include <contrib/dev/acpica/acpi.h> + +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <dev/asmc/asmcvar.h> diff --git a/sys/dev/fdc/fdc_acpi.c b/sys/dev/fdc/fdc_acpi.c index c3cb9b9..79fa66b 100644 --- a/sys/dev/fdc/fdc_acpi.c +++ b/sys/dev/fdc/fdc_acpi.c @@ -35,7 +35,8 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/proc.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <dev/fdc/fdcvar.h> diff --git a/sys/dev/ipmi/ipmi_acpi.c b/sys/dev/ipmi/ipmi_acpi.c index 1bd3a64..4281002 100644 --- a/sys/dev/ipmi/ipmi_acpi.c +++ b/sys/dev/ipmi/ipmi_acpi.c @@ -36,7 +36,8 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <sys/selinfo.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> /* Hooks for the ACPI CA debugging infrastructure */ diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 63d9cee..667072f 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); #include "pci_if.h" #ifdef __HAVE_ACPI -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> #include "acpi_if.h" #else #define ACPI_PWR_FOR_SLEEP(x, y, z) diff --git a/sys/i386/acpica/OsdEnvironment.c b/sys/i386/acpica/OsdEnvironment.c index 61f5532..ec5e19c 100644 --- a/sys/i386/acpica/OsdEnvironment.c +++ b/sys/i386/acpica/OsdEnvironment.c @@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$"); #include <sys/linker_set.h> #include <sys/sysctl.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/actables.h> static u_long i386_acpi_root; @@ -63,7 +63,7 @@ AcpiOsGetRootPointer(void) if (i386_acpi_root == 0 && (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || - AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) && + AcpiFindRootPointer((ACPI_SIZE *)&ptr) == AE_OK) && ptr != 0) i386_acpi_root = ptr; diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c index 4d31b44..f60bcfe 100644 --- a/sys/i386/acpica/acpi_machdep.c +++ b/sys/i386/acpica/acpi_machdep.c @@ -41,7 +41,8 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <dev/acpica/acpiio.h> diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c index e5047b5..af8d4b2 100644 --- a/sys/i386/acpica/acpi_wakeup.c +++ b/sys/i386/acpica/acpi_wakeup.c @@ -47,7 +47,8 @@ __FBSDID("$FreeBSD$"); #include <machine/intr_machdep.h> #include <machine/segments.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include "acpi_wakecode.h" diff --git a/sys/i386/acpica/madt.c b/sys/i386/acpica/madt.c index e604829..f9756ec 100644 --- a/sys/i386/acpica/madt.c +++ b/sys/i386/acpica/madt.c @@ -48,8 +48,10 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/specialreg.h> -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/accommon.h> +#include <contrib/dev/acpica/include/actables.h> + #include <dev/acpica/acpivar.h> #include <dev/pci/pcivar.h> diff --git a/sys/i386/cpufreq/est.c b/sys/i386/cpufreq/est.c index a8cebd0..2c6fd2c 100644 --- a/sys/i386/cpufreq/est.c +++ b/sys/i386/cpufreq/est.c @@ -43,7 +43,8 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/specialreg.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include "acpi_if.h" diff --git a/sys/i386/cpufreq/hwpstate.c b/sys/i386/cpufreq/hwpstate.c index 7e024a3..f46080d 100644 --- a/sys/i386/cpufreq/hwpstate.c +++ b/sys/i386/cpufreq/hwpstate.c @@ -61,7 +61,8 @@ __FBSDID("$FreeBSD$"); #include <machine/cputypes.h> #include <machine/specialreg.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include "acpi_if.h" diff --git a/sys/i386/cpufreq/p4tcc.c b/sys/i386/cpufreq/p4tcc.c index a33be87..29279e3 100644 --- a/sys/i386/cpufreq/p4tcc.c +++ b/sys/i386/cpufreq/p4tcc.c @@ -51,7 +51,8 @@ __FBSDID("$FreeBSD$"); #include "cpufreq_if.h" -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include "acpi_if.h" diff --git a/sys/ia64/acpica/OsdEnvironment.c b/sys/ia64/acpica/OsdEnvironment.c index 9345eff..209e343 100644 --- a/sys/ia64/acpica/OsdEnvironment.c +++ b/sys/ia64/acpica/OsdEnvironment.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <machine/efi.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> static struct uuid acpi_root_uuid = EFI_TABLE_ACPI20; diff --git a/sys/ia64/acpica/acpi_machdep.c b/sys/ia64/acpica/acpi_machdep.c index 9426dd0..e5623fb 100644 --- a/sys/ia64/acpica/acpi_machdep.c +++ b/sys/ia64/acpica/acpi_machdep.c @@ -29,7 +29,8 @@ #include <sys/param.h> #include <sys/bus.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <machine/pal.h> diff --git a/sys/ia64/acpica/acpi_wakeup.c b/sys/ia64/acpica/acpi_wakeup.c index 3003a57f..c81c3b3 100644 --- a/sys/ia64/acpica/acpi_wakeup.c +++ b/sys/ia64/acpica/acpi_wakeup.c @@ -29,7 +29,8 @@ #include <sys/param.h> #include <sys/bus.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> int diff --git a/sys/ia64/acpica/madt.c b/sys/ia64/acpica/madt.c index 50b53b8..2543088 100644 --- a/sys/ia64/acpica/madt.c +++ b/sys/ia64/acpica/madt.c @@ -26,8 +26,8 @@ * $FreeBSD$ */ -#include <contrib/dev/acpica/acpi.h> -#include <contrib/dev/acpica/actables.h> +#include <contrib/dev/acpica/include/acpi.h> +#include <contrib/dev/acpica/include/actables.h> #include <machine/md_var.h> diff --git a/sys/ia64/ia64/nexus.c b/sys/ia64/ia64/nexus.c index a069399..502dc72 100644 --- a/sys/ia64/ia64/nexus.c +++ b/sys/ia64/ia64/nexus.c @@ -62,7 +62,8 @@ #include <machine/sapicvar.h> #include <machine/vmparam.h> -#include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/include/acpi.h> + #include <dev/acpica/acpivar.h> #include <isa/isareg.h> diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile index e6463e4..f5ebb27 100644 --- a/sys/modules/acpi/acpi/Makefile +++ b/sys/modules/acpi/acpi/Makefile @@ -8,16 +8,25 @@ .error "The ACPI module is only for i386" .endif -.PATH: ${.CURDIR}/../../../contrib/dev/acpica \ - ${.CURDIR}/../../../pci \ - ${.CURDIR}/../../../dev/acpica \ - ${.CURDIR}/../../../dev/acpica/Osd \ - ${.CURDIR}/../../../${MACHINE_ARCH}/acpica +.PATH: ${.CURDIR}/../../../contrib/dev/acpica/debugger \ + ${.CURDIR}/../../../contrib/dev/acpica/disassembler \ + ${.CURDIR}/../../../contrib/dev/acpica/dispatcher \ + ${.CURDIR}/../../../contrib/dev/acpica/events \ + ${.CURDIR}/../../../contrib/dev/acpica/executer \ + ${.CURDIR}/../../../contrib/dev/acpica/hardware \ + ${.CURDIR}/../../../contrib/dev/acpica/namespace \ + ${.CURDIR}/../../../contrib/dev/acpica/parser \ + ${.CURDIR}/../../../contrib/dev/acpica/resources \ + ${.CURDIR}/../../../contrib/dev/acpica/tables \ + ${.CURDIR}/../../../contrib/dev/acpica/utilities \ + ${.CURDIR}/../../../pci \ + ${.CURDIR}/../../../dev/acpica \ + ${.CURDIR}/../../../dev/acpica/Osd \ + ${.CURDIR}/../../../${MACHINE_ARCH}/acpica KMOD= acpi # ACPI CA sources -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS+= dsfield.c dsinit.c dsmethod.c dsmthdat.c dsobject.c dsopcode.c SRCS+= dsutils.c dswexec.c dswload.c dswscope.c dswstate.c SRCS+= evevent.c evgpe.c evgpeblk.c evmisc.c evregion.c evrgnini.c evsci.c @@ -26,17 +35,17 @@ SRCS+= exconfig.c exconvrt.c excreate.c exdump.c exfield.c exfldio.c exmisc.c SRCS+= exmutex.c exnames.c exoparg1.c exoparg2.c exoparg3.c exoparg6.c SRCS+= exprep.c exregion.c exresnte.c exresolv.c exresop.c exstore.c SRCS+= exstoren.c exstorob.c exsystem.c exutils.c -SRCS+= hwacpi.c hwgpe.c hwregs.c hwsleep.c hwtimer.c +SRCS+= hwacpi.c hwgpe.c hwregs.c hwsleep.c hwtimer.c hwvalid.c hwxface.c SRCS+= nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c nsload.c nsnames.c -SRCS+= nsobject.c nsparse.c nssearch.c nsutils.c nswalk.c nsxfeval.c -SRCS+= nsxfname.c nsxfobj.c +SRCS+= nsobject.c nsparse.c nspredef.c nssearch.c nsutils.c nswalk.c +SRCS+= nsxfeval.c nsxfname.c nsxfobj.c SRCS+= psargs.c psloop.c psopcode.c psparse.c psscope.c pstree.c psutils.c SRCS+= pswalk.c psxface.c SRCS+= rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c rsio.c rsirq.c rslist.c SRCS+= rsmemory.c rsmisc.c rsutils.c rsxface.c SRCS+= tbfadt.c tbfind.c tbinstal.c tbutils.c tbxface.c tbxfroot.c -SRCS+= utalloc.c utcache.c utclib.c utcopy.c utdebug.c utdelete.c uteval.c -SRCS+= utglobal.c utinit.c utmath.c utmisc.c utmutex.c utobject.c utresrc.c +SRCS+= utalloc.c utcache.c utcopy.c utdebug.c utdelete.c uteval.c utglobal.c +SRCS+= utinit.c utlock.c utmath.c utmisc.c utmutex.c utobject.c utresrc.c SRCS+= utstate.c utxface.c # OSPM layer and core hardware drivers diff --git a/sys/modules/acpi/acpi_aiboost/Makefile b/sys/modules/acpi/acpi_aiboost/Makefile index e33b6d3..e4a96c1 100644 --- a/sys/modules/acpi/acpi_aiboost/Makefile +++ b/sys/modules/acpi/acpi_aiboost/Makefile @@ -3,7 +3,6 @@ .PATH: ${.CURDIR}/../../../dev/acpi_support KMOD= acpi_aiboost -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS= acpi_aiboost.c opt_acpi.h device_if.h bus_if.h acpi_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/acpi/acpi_asus/Makefile b/sys/modules/acpi/acpi_asus/Makefile index da7bcf8..83672d7 100644 --- a/sys/modules/acpi/acpi_asus/Makefile +++ b/sys/modules/acpi/acpi_asus/Makefile @@ -3,7 +3,6 @@ .PATH: ${.CURDIR}/../../../dev/acpi_support KMOD= acpi_asus -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS= acpi_asus.c opt_acpi.h acpi_if.h bus_if.h device_if.h SRCS+= opt_ddb.h diff --git a/sys/modules/acpi/acpi_dock/Makefile b/sys/modules/acpi/acpi_dock/Makefile index f7287a4..efbb973 100644 --- a/sys/modules/acpi/acpi_dock/Makefile +++ b/sys/modules/acpi/acpi_dock/Makefile @@ -2,7 +2,6 @@ .PATH: ${.CURDIR}/../../../dev/acpica KMOD= acpi_dock -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS= acpi_dock.c opt_acpi.h device_if.h bus_if.h acpi_if.h SRCS+= opt_ddb.h diff --git a/sys/modules/acpi/acpi_fujitsu/Makefile b/sys/modules/acpi/acpi_fujitsu/Makefile index 03bf3c7..b77a225 100644 --- a/sys/modules/acpi/acpi_fujitsu/Makefile +++ b/sys/modules/acpi/acpi_fujitsu/Makefile @@ -3,8 +3,7 @@ .PATH: ${.CURDIR}/../../../dev/acpi_support KMOD= acpi_fujitsu -CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support \ - -I${.CURDIR}/../../../contrib/dev/acpica +CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support SRCS= acpi_fujitsu.c opt_acpi.h acpi_if.h device_if.h bus_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/acpi/acpi_ibm/Makefile b/sys/modules/acpi/acpi_ibm/Makefile index 75c22e7..caf0c2b 100644 --- a/sys/modules/acpi/acpi_ibm/Makefile +++ b/sys/modules/acpi/acpi_ibm/Makefile @@ -2,7 +2,6 @@ .PATH: ${.CURDIR}/../../../dev/acpi_support KMOD= acpi_ibm -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS= acpi_ibm.c opt_acpi.h device_if.h bus_if.h acpi_if.h SRCS+= opt_ddb.h diff --git a/sys/modules/acpi/acpi_panasonic/Makefile b/sys/modules/acpi/acpi_panasonic/Makefile index 663d3c2..36f8d77 100644 --- a/sys/modules/acpi/acpi_panasonic/Makefile +++ b/sys/modules/acpi/acpi_panasonic/Makefile @@ -3,7 +3,6 @@ .PATH: ${.CURDIR}/../../../dev/acpi_support KMOD= acpi_panasonic -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS= acpi_panasonic.c opt_acpi.h acpi_if.h bus_if.h device_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/acpi/acpi_sony/Makefile b/sys/modules/acpi/acpi_sony/Makefile index 3974094..027afef 100644 --- a/sys/modules/acpi/acpi_sony/Makefile +++ b/sys/modules/acpi/acpi_sony/Makefile @@ -3,7 +3,6 @@ .PATH: ${.CURDIR}/../../../dev/acpi_support KMOD= acpi_sony -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS= acpi_sony.c opt_acpi.h device_if.h bus_if.h acpi_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/acpi/acpi_toshiba/Makefile b/sys/modules/acpi/acpi_toshiba/Makefile index 24df091..1207015 100644 --- a/sys/modules/acpi/acpi_toshiba/Makefile +++ b/sys/modules/acpi/acpi_toshiba/Makefile @@ -3,7 +3,6 @@ .PATH: ${.CURDIR}/../../../dev/acpi_support KMOD= acpi_toshiba -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS= acpi_toshiba.c opt_acpi.h acpi_if.h bus_if.h device_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/acpi/acpi_video/Makefile b/sys/modules/acpi/acpi_video/Makefile index 77794ee..67d3f08 100644 --- a/sys/modules/acpi/acpi_video/Makefile +++ b/sys/modules/acpi/acpi_video/Makefile @@ -3,7 +3,6 @@ .PATH: ${.CURDIR}/../../../dev/acpica KMOD= acpi_video -CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS= acpi_video.c SRCS+= opt_acpi.h acpi_if.h bus_if.h device_if.h diff --git a/sys/modules/cpufreq/Makefile b/sys/modules/cpufreq/Makefile index 4e385b4..75b5c86 100644 --- a/sys/modules/cpufreq/Makefile +++ b/sys/modules/cpufreq/Makefile @@ -9,7 +9,6 @@ SRCS+= bus_if.h cpufreq_if.h device_if.h pci_if.h .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" .PATH: ${.CURDIR}/../../i386/cpufreq -CFLAGS+= -I${.CURDIR}/../../contrib/dev/acpica SRCS+= acpi_if.h opt_acpi.h SRCS+= est.c hwpstate.c p4tcc.c powernow.c diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile index d61a307..43b85f5 100644 --- a/sys/modules/fdc/Makefile +++ b/sys/modules/fdc/Makefile @@ -9,7 +9,6 @@ SRCS= fdc.c fdc_cbus.c .PATH: ${.CURDIR}/../../dev/fdc SRCS= fdc.c fdc_isa.c fdc_pccard.c .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" -CFLAGS+= -I${.CURDIR}/../../contrib/dev/acpica SRCS+= opt_acpi.h acpi_if.h fdc_acpi.c .endif .endif |
