From: YONETANI Tomokazu Date: Tue, 16 Aug 2005 10:31:35 +0000 (+0000) Subject: Get rid of 4.x-derived acpi code: X-Git-Tag: v2.0.1~6240 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/c86cd76aea74c72bd0bb58311e4a117dd68f50af Get rid of 4.x-derived acpi code: - move most part of /sys/dev/acpica5/Makefile.inc into /sys/conf/acpi.mk - rename SYSACPICA_DIR, OSACPI_DIR to ACPICA_DIR and ACPI_MI_DIR, make them relative to $S (or $SYSDIR) so as they can be shared between kernel and modules builds - remove 4.x ACPI lines from, and add acpica5 lines to, /sys/conf/files* - make LINT to use `device acpi' instead of older `device acpica' - adjust ACPI driver build wrapper and ACPI tools to use /sys/conf/acpi.mk --- diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile index 95e6cbcf4e..76dbfc347f 100644 --- a/sys/boot/i386/libi386/Makefile +++ b/sys/boot/i386/libi386/Makefile @@ -1,10 +1,10 @@ # $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.32 2003/07/02 12:45:45 ru Exp $ -# $DragonFly: src/sys/boot/i386/libi386/Attic/Makefile,v 1.5 2005/07/07 11:49:56 corecode Exp $ +# $DragonFly: src/sys/boot/i386/libi386/Attic/Makefile,v 1.6 2005/08/16 10:31:35 y0netan1 Exp $ # LIB= i386 INTERNALLIB= true -SYSACPICA?= contrib/dev/acpica -#SYSACPICA?= contrib/dev/acpica-unix-20031203 +SYSDIR?= ${.CURDIR}/../../.. +.include "${SYSDIR}/conf/acpi.mk" SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \ @@ -29,7 +29,8 @@ CFLAGS+= -DDISK_DEBUG CFLAGS+= -DTERM_EMU CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ - -I${.CURDIR}/../../../${SYSACPICA} \ + -I"${SYSDIR}/${ACPICA_DIR}/include" \ + -I"${SYSDIR}/${OSACPI_MI_DIR}" \ -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 d8097eab06..e16e12a420 100644 --- a/sys/boot/i386/libi386/biosacpi.c +++ b/sys/boot/i386/libi386/biosacpi.c @@ -24,14 +24,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.7 2003/08/25 23:28:31 obrien Exp $ - * $DragonFly: src/sys/boot/i386/libi386/Attic/biosacpi.c,v 1.3 2005/04/15 17:55:49 joerg Exp $ + * $DragonFly: src/sys/boot/i386/libi386/Attic/biosacpi.c,v 1.4 2005/08/16 10:31:35 y0netan1 Exp $ */ #include #include #include -#include "acfreebsd.h" +#include "acdragonfly.h" #include "acconfig.h" #define ACPI_SYSTEM_XFACE #include "actypes.h" diff --git a/sys/boot/pc32/libi386/Makefile b/sys/boot/pc32/libi386/Makefile index 77b2d798d2..6b8f9683e3 100644 --- a/sys/boot/pc32/libi386/Makefile +++ b/sys/boot/pc32/libi386/Makefile @@ -1,10 +1,10 @@ # $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.32 2003/07/02 12:45:45 ru Exp $ -# $DragonFly: src/sys/boot/pc32/libi386/Makefile,v 1.5 2005/07/07 11:49:56 corecode Exp $ +# $DragonFly: src/sys/boot/pc32/libi386/Makefile,v 1.6 2005/08/16 10:31:35 y0netan1 Exp $ # LIB= i386 INTERNALLIB= true -SYSACPICA?= contrib/dev/acpica -#SYSACPICA?= contrib/dev/acpica-unix-20031203 +SYSDIR?= ${.CURDIR}/../../.. +.include "${SYSDIR}/conf/acpi.mk" SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \ @@ -29,7 +29,8 @@ CFLAGS+= -DDISK_DEBUG CFLAGS+= -DTERM_EMU CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ - -I${.CURDIR}/../../../${SYSACPICA} \ + -I"${SYSDIR}/${ACPICA_DIR}/include" \ + -I"${SYSDIR}/${OSACPI_MI_DIR}" \ -I${.CURDIR}/../../.. -I. # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ diff --git a/sys/boot/pc32/libi386/biosacpi.c b/sys/boot/pc32/libi386/biosacpi.c index 900d243f86..82595f9b32 100644 --- a/sys/boot/pc32/libi386/biosacpi.c +++ b/sys/boot/pc32/libi386/biosacpi.c @@ -24,14 +24,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.7 2003/08/25 23:28:31 obrien Exp $ - * $DragonFly: src/sys/boot/pc32/libi386/biosacpi.c,v 1.3 2005/04/15 17:55:49 joerg Exp $ + * $DragonFly: src/sys/boot/pc32/libi386/biosacpi.c,v 1.4 2005/08/16 10:31:35 y0netan1 Exp $ */ #include #include #include -#include "acfreebsd.h" +#include "acdragonfly.h" #include "acconfig.h" #define ACPI_SYSTEM_XFACE #include "actypes.h" diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64 index 5de3c0a25c..877a65d5de 100644 --- a/sys/conf/Makefile.amd64 +++ b/sys/conf/Makefile.amd64 @@ -1,7 +1,7 @@ # Makefile.amd64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $DragonFly: src/sys/conf/Attic/Makefile.amd64,v 1.6 2005/07/30 09:10:33 swildner Exp $ +# $DragonFly: src/sys/conf/Attic/Makefile.amd64,v 1.7 2005/08/16 10:31:35 y0netan1 Exp $ # # Makefile for DragonFly BSD # @@ -51,9 +51,8 @@ INCLUDES+= -I/usr/include # 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 - - +.include "$S/conf/acpi.mk" +INCLUDES+= -I${.OBJDIR} -I"$S/${OSACPI_MI_DIR}" -I"$S/${ACPICA_DIR}/include" # This hack lets us use the ipfilter code without spamming a new # include path into 100+ source files. diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 417c7a18ab..6bdad5d933 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # $FreeBSD: src/sys/conf/Makefile.i386,v 1.179.2.16 2002/11/18 11:26:49 ru Exp $ -# $DragonFly: src/sys/conf/Attic/Makefile.i386,v 1.21 2005/07/30 09:10:33 swildner Exp $ +# $DragonFly: src/sys/conf/Attic/Makefile.i386,v 1.22 2005/08/16 10:31:35 y0netan1 Exp $ # # Makefile for DragonFly BSD # @@ -58,9 +58,8 @@ INCLUDES+= -I/usr/include # 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 - - +.include "$S/conf/acpi.mk" +INCLUDES+= -I${.OBJDIR} -I"$S/${OSACPI_MI_DIR}" -I"$S/${ACPICA_DIR}/include" # This hack lets us use the ipfilter code without spamming a new # include path into 100+ source files. diff --git a/sys/conf/acpi.mk b/sys/conf/acpi.mk new file mode 100644 index 0000000000..7bf1d88a32 --- /dev/null +++ b/sys/conf/acpi.mk @@ -0,0 +1,41 @@ +# $DragonFly: src/sys/conf/acpi.mk,v 1.1 2005/08/16 10:31:35 y0netan1 Exp $ +# + +ACPICA_VERSION= 20050309 +ACPICA_DIR?= contrib/dev/acpica-unix-${ACPICA_VERSION} +OSACPI_MI_DIR?= dev/acpica5 +OSACPI_MD_DIR?= ${MACHINE_ARCH}/acpica5 + +.if !defined(SYSDIR) && defined(S) +SYSDIR= $S +.endif + +.PATH: ${SYSDIR}/${ACPICA_DIR}/interpreter/dispatcher \ + ${SYSDIR}/${ACPICA_DIR}/interpreter/executer \ + ${SYSDIR}/${ACPICA_DIR}/interpreter/parser \ + ${SYSDIR}/${ACPICA_DIR}/events \ + ${SYSDIR}/${ACPICA_DIR}/hardware \ + ${SYSDIR}/${ACPICA_DIR}/namespace \ + ${SYSDIR}/${ACPICA_DIR}/resources \ + ${SYSDIR}/${ACPICA_DIR}/tables \ + ${SYSDIR}/${ACPICA_DIR}/utilities \ + ${SYSDIR}/${ACPICA_DIR}/debugger \ + ${SYSDIR}/${ACPICA_DIR}/disassembler \ + ${SYSDIR}/${ACPICA_DIR}/INTERPRETER/DISPATCHER \ + ${SYSDIR}/${ACPICA_DIR}/INTERPRETER/EXECUTER \ + ${SYSDIR}/${ACPICA_DIR}/INTERPRETER/PARSER \ + ${SYSDIR}/${ACPICA_DIR}/EVENTS \ + ${SYSDIR}/${ACPICA_DIR}/HARDWARE \ + ${SYSDIR}/${ACPICA_DIR}/NAMESPACE \ + ${SYSDIR}/${ACPICA_DIR}/RESOURCES \ + ${SYSDIR}/${ACPICA_DIR}/TABLES \ + ${SYSDIR}/${ACPICA_DIR}/UTILITIES + +${.OBJDIR}/acpi.h: ${SYSDIR}/${ACPICA_DIR}/include/acpi.h + cp ${.ALLSRC} ${.TARGET} + +${.OBJDIR}/platform/acenv.h: ${SYSDIR}/${ACPICA_DIR}/include/platform/acenv.h + mkdir -p ${.OBJDIR}/platform + sed -e 's/__FreeBSD__/__DragonFly__/' \ + -e 's/acfreebsd.h/acdragonfly.h/' ${.ALLSRC} > ${.TARGET}.new + mv -f ${.TARGET}.new ${.TARGET} diff --git a/sys/conf/files b/sys/conf/files index e265835b9a..e0bbb5b3c7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/conf/files,v 1.340.2.137 2003/06/04 17:10:30 sam Exp $ -# $DragonFly: src/sys/conf/files,v 1.101 2005/08/03 23:33:52 dillon Exp $ +# $DragonFly: src/sys/conf/files,v 1.102 2005/08/16 10:31:35 y0netan1 Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -64,126 +64,6 @@ bus/cam/scsi/scsi_pass.c optional pass bus/cam/scsi/scsi_ses.c optional ses bus/cam/scsi/scsi_target.c optional targ bus/cam/scsi/scsi_targ_bh.c optional targbh -contrib/dev/acpica/dbcmds.c optional acpica acpi_debug -contrib/dev/acpica/dbdisply.c optional acpica acpi_debug -contrib/dev/acpica/dbexec.c optional acpica acpi_debug -contrib/dev/acpica/dbfileio.c optional acpica acpi_debug -contrib/dev/acpica/dbhistry.c optional acpica acpi_debug -contrib/dev/acpica/dbinput.c optional acpica acpi_debug -contrib/dev/acpica/dbstats.c optional acpica acpi_debug -contrib/dev/acpica/dbutils.c optional acpica acpi_debug -contrib/dev/acpica/dbxface.c optional acpica acpi_debug -contrib/dev/acpica/dmbuffer.c optional acpica acpi_debug -contrib/dev/acpica/dmnames.c optional acpica acpi_debug -contrib/dev/acpica/dmopcode.c optional acpica acpi_debug -contrib/dev/acpica/dmresrc.c optional acpica acpi_debug -contrib/dev/acpica/dmresrcl.c optional acpica acpi_debug -contrib/dev/acpica/dmresrcs.c optional acpica acpi_debug -contrib/dev/acpica/dmutils.c optional acpica acpi_debug -contrib/dev/acpica/dmwalk.c optional acpica acpi_debug -contrib/dev/acpica/dsfield.c optional acpica -contrib/dev/acpica/dsinit.c optional acpica -contrib/dev/acpica/dsmethod.c optional acpica -contrib/dev/acpica/dsmthdat.c optional acpica -contrib/dev/acpica/dsobject.c optional acpica -contrib/dev/acpica/dsopcode.c optional acpica -contrib/dev/acpica/dsutils.c optional acpica -contrib/dev/acpica/dswexec.c optional acpica -contrib/dev/acpica/dswload.c optional acpica -contrib/dev/acpica/dswscope.c optional acpica -contrib/dev/acpica/dswstate.c optional acpica -contrib/dev/acpica/evevent.c optional acpica -contrib/dev/acpica/evgpe.c optional acpica -contrib/dev/acpica/evgpeblk.c optional acpica -contrib/dev/acpica/evmisc.c optional acpica -contrib/dev/acpica/evregion.c optional acpica -contrib/dev/acpica/evrgnini.c optional acpica -contrib/dev/acpica/evsci.c optional acpica -contrib/dev/acpica/evxface.c optional acpica -contrib/dev/acpica/evxfevnt.c optional acpica -contrib/dev/acpica/evxfregn.c optional acpica -contrib/dev/acpica/exconfig.c optional acpica -contrib/dev/acpica/exconvrt.c optional acpica -contrib/dev/acpica/excreate.c optional acpica -contrib/dev/acpica/exdump.c optional acpica -contrib/dev/acpica/exfield.c optional acpica -contrib/dev/acpica/exfldio.c optional acpica -contrib/dev/acpica/exmisc.c optional acpica -contrib/dev/acpica/exmutex.c optional acpica -contrib/dev/acpica/exnames.c optional acpica -contrib/dev/acpica/exoparg1.c optional acpica -contrib/dev/acpica/exoparg2.c optional acpica -contrib/dev/acpica/exoparg3.c optional acpica -contrib/dev/acpica/exoparg6.c optional acpica -contrib/dev/acpica/exprep.c optional acpica -contrib/dev/acpica/exregion.c optional acpica -contrib/dev/acpica/exresnte.c optional acpica -contrib/dev/acpica/exresolv.c optional acpica -contrib/dev/acpica/exresop.c optional acpica -contrib/dev/acpica/exstore.c optional acpica -contrib/dev/acpica/exstoren.c optional acpica -contrib/dev/acpica/exstorob.c optional acpica -contrib/dev/acpica/exsystem.c optional acpica -contrib/dev/acpica/exutils.c optional acpica -contrib/dev/acpica/hwacpi.c optional acpica -contrib/dev/acpica/hwgpe.c optional acpica -contrib/dev/acpica/hwregs.c optional acpica -contrib/dev/acpica/hwsleep.c optional acpica -contrib/dev/acpica/hwtimer.c optional acpica -contrib/dev/acpica/nsaccess.c optional acpica -contrib/dev/acpica/nsalloc.c optional acpica -contrib/dev/acpica/nsdump.c optional acpica -contrib/dev/acpica/nseval.c optional acpica -contrib/dev/acpica/nsinit.c optional acpica -contrib/dev/acpica/nsload.c optional acpica -contrib/dev/acpica/nsnames.c optional acpica -contrib/dev/acpica/nsobject.c optional acpica -contrib/dev/acpica/nsparse.c optional acpica -contrib/dev/acpica/nssearch.c optional acpica -contrib/dev/acpica/nsutils.c optional acpica -contrib/dev/acpica/nswalk.c optional acpica -contrib/dev/acpica/nsxfeval.c optional acpica -contrib/dev/acpica/nsxfname.c optional acpica -contrib/dev/acpica/nsxfobj.c optional acpica -contrib/dev/acpica/psargs.c optional acpica -contrib/dev/acpica/psopcode.c optional acpica -contrib/dev/acpica/psparse.c optional acpica -contrib/dev/acpica/psscope.c optional acpica -contrib/dev/acpica/pstree.c optional acpica -contrib/dev/acpica/psutils.c optional acpica -contrib/dev/acpica/pswalk.c optional acpica -contrib/dev/acpica/psxface.c optional acpica -contrib/dev/acpica/rsaddr.c optional acpica -contrib/dev/acpica/rscalc.c optional acpica -contrib/dev/acpica/rscreate.c optional acpica -contrib/dev/acpica/rsdump.c optional acpica -contrib/dev/acpica/rsio.c optional acpica -contrib/dev/acpica/rsirq.c optional acpica -contrib/dev/acpica/rslist.c optional acpica -contrib/dev/acpica/rsmemory.c optional acpica -contrib/dev/acpica/rsmisc.c optional acpica -contrib/dev/acpica/rsutils.c optional acpica -contrib/dev/acpica/rsxface.c optional acpica -contrib/dev/acpica/tbconvrt.c optional acpica -contrib/dev/acpica/tbget.c optional acpica -contrib/dev/acpica/tbgetall.c optional acpica -contrib/dev/acpica/tbinstal.c optional acpica -contrib/dev/acpica/tbrsdt.c optional acpica -contrib/dev/acpica/tbutils.c optional acpica -contrib/dev/acpica/tbxface.c optional acpica -contrib/dev/acpica/tbxfroot.c optional acpica -contrib/dev/acpica/utalloc.c optional acpica -contrib/dev/acpica/utclib.c optional acpica -contrib/dev/acpica/utcopy.c optional acpica -contrib/dev/acpica/utdebug.c optional acpica -contrib/dev/acpica/utdelete.c optional acpica -contrib/dev/acpica/uteval.c optional acpica -contrib/dev/acpica/utglobal.c optional acpica -contrib/dev/acpica/utinit.c optional acpica -contrib/dev/acpica/utmath.c optional acpica -contrib/dev/acpica/utmisc.c optional acpica -contrib/dev/acpica/utobject.c optional acpica -contrib/dev/acpica/utxface.c optional acpica contrib/ipfilter/netinet/fil.c optional ipfilter inet contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet @@ -227,27 +107,6 @@ dev/raid/aac/aac_pci.c optional aac pci dev/raid/aac/aac_linux.c optional aac compat_linux dev/raid/aac/aac_cam.c optional aacp aac -dev/acpica/acpi.c optional acpica -dev/acpica/acpica_support.c optional acpica -dev/acpica/acpi_acad.c optional acpica -dev/acpica/acpi_battery.c optional acpica -dev/acpica/acpi_button.c optional acpica -dev/acpica/acpi_cmbat.c optional acpica -dev/acpica/acpi_cpu.c optional acpica -dev/acpica/acpi_ec.c optional acpica -dev/acpica/acpi_lid.c optional acpica -dev/acpica/acpi_powerres.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/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/acpica/Osd/OsdTable.c optional acpica dev/pccard/pccbb/pccbb.c optional cbb dev/pccard/cardbus/cardbus.c optional cardbus @@ -1452,3 +1311,157 @@ emulation/43bsd/43bsd_resource.c optional compat_43 emulation/43bsd/43bsd_hostinfo.c optional compat_43 emulation/43bsd/43bsd_vm.c optional compat_43 emulation/dragonfly12/dfbsd12_stat.c nonoptional compat_df12 + +# OS ACPI MI code +${OSACPI_MI_DIR}/acpi.c optional acpi +${OSACPI_MI_DIR}/acpi_acad.c optional acpi +${OSACPI_MI_DIR}/acpi_battery.c optional acpi +${OSACPI_MI_DIR}/acpi_button.c optional acpi +${OSACPI_MI_DIR}/acpi_cmbat.c optional acpi +${OSACPI_MI_DIR}/acpi_cpu.c optional acpi +${OSACPI_MI_DIR}/acpi_ec.c optional acpi +${OSACPI_MI_DIR}/acpi_isab.c optional acpi isa +${OSACPI_MI_DIR}/acpi_lid.c optional acpi +${OSACPI_MI_DIR}/acpi_package.c optional acpi +# commented out to avoid PCI-routing problems +#${OSACPI_MI_DIR}/acpi_pci.c optional acpi pci +#${OSACPI_MI_DIR}/acpi_pci_link.c optional acpi pci +#${OSACPI_MI_DIR}/acpi_pcib.c optional acpi pci +#${OSACPI_MI_DIR}/acpi_pcib_acpi.c optional acpi pci +#${OSACPI_MI_DIR}/acpi_pcib_pci.c optional acpi pci +${OSACPI_MI_DIR}/acpi_powerres.c optional acpi +${OSACPI_MI_DIR}/acpi_resource.c optional acpi +${OSACPI_MI_DIR}/acpi_thermal.c optional acpi +${OSACPI_MI_DIR}/acpi_timer.c optional acpi +${OSACPI_MI_DIR}/Osd/OsdDebug.c optional acpi +${OSACPI_MI_DIR}/Osd/OsdHardware.c optional acpi +${OSACPI_MI_DIR}/Osd/OsdInterrupt.c optional acpi +${OSACPI_MI_DIR}/Osd/OsdMemory.c optional acpi +${OSACPI_MI_DIR}/Osd/OsdSchedule.c optional acpi +${OSACPI_MI_DIR}/Osd/OsdStream.c optional acpi +${OSACPI_MI_DIR}/Osd/OsdSynch.c optional acpi +${OSACPI_MI_DIR}/Osd/OsdTable.c optional acpi + +# ACPICA code +${ACPICA_DIR}/debugger/dbcmds.c optional acpi acpi_debug +${ACPICA_DIR}/debugger/dbdisply.c optional acpi acpi_debug +${ACPICA_DIR}/debugger/dbexec.c optional acpi acpi_debug +${ACPICA_DIR}/debugger/dbfileio.c optional acpi acpi_debug +${ACPICA_DIR}/debugger/dbhistry.c optional acpi acpi_debug +${ACPICA_DIR}/debugger/dbinput.c optional acpi acpi_debug +${ACPICA_DIR}/debugger/dbstats.c optional acpi acpi_debug +${ACPICA_DIR}/debugger/dbutils.c optional acpi acpi_debug +${ACPICA_DIR}/debugger/dbxface.c optional acpi acpi_debug +${ACPICA_DIR}/disassembler/dmbuffer.c optional acpi acpi_debug +${ACPICA_DIR}/disassembler/dmnames.c optional acpi acpi_debug +${ACPICA_DIR}/disassembler/dmobject.c optional acpi acpi_debug +${ACPICA_DIR}/disassembler/dmopcode.c optional acpi acpi_debug +${ACPICA_DIR}/disassembler/dmresrc.c optional acpi acpi_debug +${ACPICA_DIR}/disassembler/dmresrcl.c optional acpi acpi_debug +${ACPICA_DIR}/disassembler/dmresrcs.c optional acpi acpi_debug +${ACPICA_DIR}/disassembler/dmutils.c optional acpi acpi_debug +${ACPICA_DIR}/disassembler/dmwalk.c optional acpi acpi_debug +${ACPICA_DIR}/events/evevent.c optional acpi +${ACPICA_DIR}/events/evgpe.c optional acpi +${ACPICA_DIR}/events/evgpeblk.c optional acpi +${ACPICA_DIR}/events/evmisc.c optional acpi +${ACPICA_DIR}/events/evregion.c optional acpi +${ACPICA_DIR}/events/evrgnini.c optional acpi +${ACPICA_DIR}/events/evsci.c optional acpi +${ACPICA_DIR}/events/evxface.c optional acpi +${ACPICA_DIR}/events/evxfevnt.c optional acpi +${ACPICA_DIR}/events/evxfregn.c optional acpi +${ACPICA_DIR}/hardware/hwacpi.c optional acpi +${ACPICA_DIR}/hardware/hwgpe.c optional acpi +${ACPICA_DIR}/hardware/hwregs.c optional acpi +${ACPICA_DIR}/hardware/hwsleep.c optional acpi +${ACPICA_DIR}/hardware/hwtimer.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dsfield.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dsinit.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dsmethod.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dsmthdat.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dsobject.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dsopcode.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dsutils.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dswexec.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dswload.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dswscope.c optional acpi +${ACPICA_DIR}/interpreter/dispatcher/dswstate.c optional acpi +${ACPICA_DIR}/interpreter/executer/exconfig.c optional acpi +${ACPICA_DIR}/interpreter/executer/exconvrt.c optional acpi +${ACPICA_DIR}/interpreter/executer/excreate.c optional acpi +${ACPICA_DIR}/interpreter/executer/exdump.c optional acpi +${ACPICA_DIR}/interpreter/executer/exfield.c optional acpi +${ACPICA_DIR}/interpreter/executer/exfldio.c optional acpi +${ACPICA_DIR}/interpreter/executer/exmisc.c optional acpi +${ACPICA_DIR}/interpreter/executer/exmutex.c optional acpi +${ACPICA_DIR}/interpreter/executer/exnames.c optional acpi +${ACPICA_DIR}/interpreter/executer/exoparg1.c optional acpi +${ACPICA_DIR}/interpreter/executer/exoparg2.c optional acpi +${ACPICA_DIR}/interpreter/executer/exoparg3.c optional acpi +${ACPICA_DIR}/interpreter/executer/exoparg6.c optional acpi +${ACPICA_DIR}/interpreter/executer/exprep.c optional acpi +${ACPICA_DIR}/interpreter/executer/exregion.c optional acpi +${ACPICA_DIR}/interpreter/executer/exresnte.c optional acpi +${ACPICA_DIR}/interpreter/executer/exresolv.c optional acpi +${ACPICA_DIR}/interpreter/executer/exresop.c optional acpi +${ACPICA_DIR}/interpreter/executer/exstore.c optional acpi +${ACPICA_DIR}/interpreter/executer/exstoren.c optional acpi +${ACPICA_DIR}/interpreter/executer/exstorob.c optional acpi +${ACPICA_DIR}/interpreter/executer/exsystem.c optional acpi +${ACPICA_DIR}/interpreter/executer/exutils.c optional acpi +${ACPICA_DIR}/interpreter/parser/psargs.c optional acpi +${ACPICA_DIR}/interpreter/parser/psopcode.c optional acpi +${ACPICA_DIR}/interpreter/parser/psparse.c optional acpi +${ACPICA_DIR}/interpreter/parser/psscope.c optional acpi +${ACPICA_DIR}/interpreter/parser/pstree.c optional acpi +${ACPICA_DIR}/interpreter/parser/psutils.c optional acpi +${ACPICA_DIR}/interpreter/parser/pswalk.c optional acpi +${ACPICA_DIR}/interpreter/parser/psxface.c optional acpi +${ACPICA_DIR}/namespace/nsaccess.c optional acpi +${ACPICA_DIR}/namespace/nsalloc.c optional acpi +${ACPICA_DIR}/namespace/nsdump.c optional acpi +${ACPICA_DIR}/namespace/nsdumpdv.c optional acpi +${ACPICA_DIR}/namespace/nseval.c optional acpi +${ACPICA_DIR}/namespace/nsinit.c optional acpi +${ACPICA_DIR}/namespace/nsload.c optional acpi +${ACPICA_DIR}/namespace/nsnames.c optional acpi +${ACPICA_DIR}/namespace/nsobject.c optional acpi +${ACPICA_DIR}/namespace/nsparse.c optional acpi +${ACPICA_DIR}/namespace/nssearch.c optional acpi +${ACPICA_DIR}/namespace/nsutils.c optional acpi +${ACPICA_DIR}/namespace/nswalk.c optional acpi +${ACPICA_DIR}/namespace/nsxfeval.c optional acpi +${ACPICA_DIR}/namespace/nsxfname.c optional acpi +${ACPICA_DIR}/namespace/nsxfobj.c optional acpi +${ACPICA_DIR}/resources/rsaddr.c optional acpi +${ACPICA_DIR}/resources/rscalc.c optional acpi +${ACPICA_DIR}/resources/rscreate.c optional acpi +${ACPICA_DIR}/resources/rsdump.c optional acpi +${ACPICA_DIR}/resources/rsio.c optional acpi +${ACPICA_DIR}/resources/rsirq.c optional acpi +${ACPICA_DIR}/resources/rslist.c optional acpi +${ACPICA_DIR}/resources/rsmemory.c optional acpi +${ACPICA_DIR}/resources/rsmisc.c optional acpi +${ACPICA_DIR}/resources/rsutils.c optional acpi +${ACPICA_DIR}/resources/rsxface.c optional acpi +${ACPICA_DIR}/tables/tbconvrt.c optional acpi +${ACPICA_DIR}/tables/tbget.c optional acpi +${ACPICA_DIR}/tables/tbgetall.c optional acpi +${ACPICA_DIR}/tables/tbinstal.c optional acpi +${ACPICA_DIR}/tables/tbrsdt.c optional acpi +${ACPICA_DIR}/tables/tbutils.c optional acpi +${ACPICA_DIR}/tables/tbxface.c optional acpi +${ACPICA_DIR}/tables/tbxfroot.c optional acpi +${ACPICA_DIR}/utilities/utalloc.c optional acpi +${ACPICA_DIR}/utilities/utclib.c optional acpi +${ACPICA_DIR}/utilities/utcopy.c optional acpi +${ACPICA_DIR}/utilities/utdebug.c optional acpi +${ACPICA_DIR}/utilities/utdelete.c optional acpi +${ACPICA_DIR}/utilities/uteval.c optional acpi +${ACPICA_DIR}/utilities/utglobal.c optional acpi +${ACPICA_DIR}/utilities/utinit.c optional acpi +${ACPICA_DIR}/utilities/utmath.c optional acpi +${ACPICA_DIR}/utilities/utmisc.c optional acpi +${ACPICA_DIR}/utilities/utobject.c optional acpi +${ACPICA_DIR}/utilities/utxface.c optional acpi diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 67ad366073..7669dc4971 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -2,7 +2,7 @@ # files marked standard are always included. # # $FreeBSD: src/sys/conf/files.i386,v 1.307.2.38 2003/01/02 20:41:33 kan Exp $ -# $DragonFly: src/sys/conf/Attic/files.i386,v 1.32 2005/06/20 20:37:23 dillon Exp $ +# $DragonFly: src/sys/conf/Attic/files.i386,v 1.33 2005/08/16 10:31:35 y0netan1 Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -93,13 +93,25 @@ dev/disk/advansys/adv_isa.c optional adv isa dev/disk/aic/aic_isa.c optional aic isa dev/netif/ar/if_ar_isa.c optional ar isa dev/serial/dgb/dgm.c optional dgm -i386/acpica/OsdEnvironment.c optional acpica -i386/acpica/acpi_machdep.c optional acpica -i386/acpica/acpi_wakeup.c optional acpica -acpi_wakecode.h optional acpica \ - dependency "$S/i386/acpica/acpi_wakecode.S" \ - compile-with "${MAKE} -f $S/i386/acpica/Makefile MAKESRCPATH=$S/i386/acpica" \ - no-obj no-implicit-rule before-depend \ + +${OSACPI_MD_DIR}/OsdEnvironment.c optional acpi +${OSACPI_MD_DIR}/acpi_machdep.c optional acpi +${OSACPI_MD_DIR}/acpi_wakeup.c optional acpi +${OSACPI_MD_DIR}/acpi_toshiba.c optional acpi_toshiba acpi +acpi.h optional acpi \ + dependency "$S/${ACPICA_DIR}/include/acpi.h" \ + compile-with "cp $S/${ACPICA_DIR}/include/acpi.h ${.OBJDIR}/" \ + no-obj no-implicit-rule before-depend \ + clean "acpi.h" +platform/acenv.h optional acpi \ + dependency "$S/${ACPICA_DIR}/include/platform/acenv.h" \ + compile-with "mkdir -p ${.OBJDIR}/platform; cat ${.ALLSRC} | sed -e 's/__FreeBSD__/__DragonFly__/' -e 's/acfreebsd.h/acdragonfly.h/' > ${.TARGET}" \ + no-obj no-implicit-rule before-depend \ + clean "acenv.h" +acpi_wakecode.h optional acpi \ + dependency "$S/${OSACPI_MD_DIR}/acpi_wakecode.S" \ + compile-with "${MAKE} -f $S/${OSACPI_MD_DIR}/Makefile MAKESRCPATH=$S/${OSACPI_MD_DIR}" \ + no-obj no-implicit-rule before-depend \ clean "acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin" # @@ -250,7 +262,7 @@ i386/isa/npx.c mandatory npx bus/iicbus/i386/pcf.c optional pcf bus/pci/i386/pci_cfgreg.c optional pci bus/pci/i386/pcibus.c optional pci -i386/isa/pmtimer.c optional acpica pmtimer +i386/isa/pmtimer.c optional acpi pmtimer # XXX drhodus i386/isa/prof_machdep.c optional profiling-routine dev/serial/rc/rc.c optional rc diff --git a/sys/config/LINT b/sys/config/LINT index 76b0a23f22..319162af26 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/config/LINT,v 1.58 2005/08/15 16:46:19 dillon Exp $ +# $DragonFly: src/sys/config/LINT,v 1.59 2005/08/16 10:31:35 y0netan1 Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -2582,7 +2582,7 @@ device ubsec # Broadcom 5501, 5601, 58xx options UBSEC_DEBUG # enable debugging support: hw.ubsec.debug options UBSEC_RNDTEST # enable rndtest support -device acpica # basic ACPI support +device acpi # basic ACPI support # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 diff --git a/sys/dev/acpica5/Makefile.inc b/sys/dev/acpica5/Makefile.inc index 65e394d5dd..44b3581d7b 100644 --- a/sys/dev/acpica5/Makefile.inc +++ b/sys/dev/acpica5/Makefile.inc @@ -1,47 +1,11 @@ -# $DragonFly: src/sys/dev/acpica5/Makefile.inc,v 1.6 2005/05/08 00:06:46 corecode Exp $ +# $DragonFly: src/sys/dev/acpica5/Makefile.inc,v 1.7 2005/08/16 10:31:35 y0netan1 Exp $ -SYSACPICA_VERSION= 20050309 -SYSACPICA_DIR?= ${SYSDIR}/contrib/dev/acpica-unix-${SYSACPICA_VERSION} -OSACPI_DIR?= ${SYSDIR}/dev/acpica5 +.include "${SYSDIR}/conf/acpi.mk" CFLAGS+= -I${.OBJDIR} \ -I${.CURDIR} \ - -I${OSACPI_DIR} \ - -I${SYSACPICA_DIR}/include - -.PATH: ${SYSACPICA_DIR}/interpreter/dispatcher \ - ${SYSACPICA_DIR}/interpreter/executer \ - ${SYSACPICA_DIR}/interpreter/parser \ - ${SYSACPICA_DIR}/events \ - ${SYSACPICA_DIR}/hardware \ - ${SYSACPICA_DIR}/namespace \ - ${SYSACPICA_DIR}/resources \ - ${SYSACPICA_DIR}/tables \ - ${SYSACPICA_DIR}/utilities \ - ${SYSACPICA_DIR}/debugger \ - ${SYSACPICA_DIR}/disassembler \ - ${SYSACPICA_DIR}/INTERPRETER/DISPATCHER \ - ${SYSACPICA_DIR}/INTERPRETER/EXECUTER \ - ${SYSACPICA_DIR}/INTERPRETER/PARSER \ - ${SYSACPICA_DIR}/EVENTS \ - ${SYSACPICA_DIR}/HARDWARE \ - ${SYSACPICA_DIR}/NAMESPACE \ - ${SYSACPICA_DIR}/RESOURCES \ - ${SYSACPICA_DIR}/TABLES \ - ${SYSACPICA_DIR}/UTILITIES - -# acpi.h includes "platform/acenv.h". This is the easiest way to create -# a modified acenv.h -# -${.OBJDIR}/acpi.h: ${SYSACPICA_DIR}/include/acpi.h - cp ${.ALLSRC} ${.TARGET} - -${.OBJDIR}/platform/acenv.h: ${SYSACPICA_DIR}/include/platform/acenv.h - if [ ! -d ${.OBJDIR}/platform ]; then mkdir ${.OBJDIR}/platform; fi - cat ${.ALLSRC} | \ - sed -e 's/__FreeBSD__/__DragonFly__/' | \ - sed -e 's/acfreebsd.h/acdragonfly.h/' > ${.TARGET}.new - mv -f ${.TARGET}.new ${.TARGET} + -I${SYSDIR}/${OSACPI_MI_DIR} \ + -I${SYSDIR}/${ACPICA_DIR}/include SRCS+= ${.OBJDIR}/acpi.h ${.OBJDIR}/platform/acenv.h diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index a2f0fc88ef..c4ec2aabb7 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/i386/conf/Attic/LINT,v 1.58 2005/08/15 16:46:19 dillon Exp $ +# $DragonFly: src/sys/i386/conf/Attic/LINT,v 1.59 2005/08/16 10:31:35 y0netan1 Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -2582,7 +2582,7 @@ device ubsec # Broadcom 5501, 5601, 58xx options UBSEC_DEBUG # enable debugging support: hw.ubsec.debug options UBSEC_RNDTEST # enable rndtest support -device acpica # basic ACPI support +device acpi # basic ACPI support # DRM options: # mgadrm: AGP Matrox G200, G400, G450, G550 diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc index 190e9b1446..d2f76950ca 100644 --- a/usr.sbin/acpi/Makefile.inc +++ b/usr.sbin/acpi/Makefile.inc @@ -1,16 +1,24 @@ # $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $ # $FreeBSD: src/usr.sbin/acpi/Makefile.inc,v 1.8 2003/08/07 16:51:50 njl Exp $ -# $DragonFly: src/usr.sbin/acpi/Makefile.inc,v 1.2 2005/03/11 18:27:49 y0netan1 Exp $ +# $DragonFly: src/usr.sbin/acpi/Makefile.inc,v 1.3 2005/08/16 10:31:35 y0netan1 Exp $ SYSDIR?= ${.CURDIR}/../../../sys -OSACPI_DIR= ${SYSDIR}/dev/acpica5 -.include "${OSACPI_DIR}/Makefile.inc" +.include "${SYSDIR}/conf/acpi.mk" -.PATH: ${SYSACPICA_DIR} \ - ${SYSACPICA_DIR}/compiler \ - ${SYSACPICA_DIR}/common +.PATH: ${.OBJDIR} \ + ${SYSDIR}/${ACPICA_DIR} \ + ${SYSDIR}/${ACPICA_DIR}/compiler \ + ${SYSDIR}/${ACPICA_DIR}/common -CFLAGS+= -I${SYSACPICA_DIR}/compiler +CFLAGS+= -I${.OBJDIR} \ + -I${SYSDIR}/${OSACPI_MI_DIR} \ + -I${SYSDIR}/${ACPICA_DIR}/include \ + -I${SYSDIR}/${ACPICA_DIR}/compiler + +SRCS+= ${.OBJDIR}/acpi.h ${.OBJDIR}/platform/acenv.h + +CLEANFILES+= ${.OBJDIR}/acpi.h +CLEANDIRS+= ${.OBJDIR}/platform .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile index 9cc7f1397b..522a12b876 100644 --- a/usr.sbin/acpi/acpidb/Makefile +++ b/usr.sbin/acpi/acpidb/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.sbin/acpi/acpidb/Makefile,v 1.5 2004/05/25 02:56:55 njl Exp $ -# $DragonFly: src/usr.sbin/acpi/acpidb/Makefile,v 1.2 2005/03/12 14:33:40 y0netan1 Exp $ +# $DragonFly: src/usr.sbin/acpi/acpidb/Makefile,v 1.3 2005/08/16 10:31:35 y0netan1 Exp $ PROG= acpidb SRCS+= acpidb.c @@ -36,8 +36,8 @@ SRCS+= dbcmds.c dbdisply.c dbexec.c dbfileio.c \ utmisc.c utobject.c utxface.c .include -.if ${SYSACPICA_VERSION} >= 20041203 -CONTRIBDIR= ${SYSACPICA_DIR} +.if ${ACPICA_VERSION} >= 20041203 +CONTRIBDIR= ${SYSDIR}/${ACPICA_DIR} SRCS+= osunixxf.c.patch .endif MAN= acpidb.8