From c06098a4065d7be63bd57c45889a91da9bc0f5e4 Mon Sep 17 00:00:00 2001 From: jkim Date: Thu, 22 Mar 2007 18:16:43 +0000 Subject: Catch up with ACPI-CA 20070320 import. --- sys/modules/Makefile | 2 +- sys/modules/acpi/Makefile | 7 ++-- sys/modules/acpi/acpi/Makefile | 73 ++++++++++++++++++++---------------------- 3 files changed, 40 insertions(+), 42 deletions(-) (limited to 'sys/modules') diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 21d7013..dff387d 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -453,7 +453,7 @@ _snc= snc .if ${MACHINE_ARCH} == "amd64" _aac= aac -_acpi= acpi +_acpi= acpi _agp= agp _an= an _arcmsr= arcmsr diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile index 70d761a..7bc565b 100644 --- a/sys/modules/acpi/Makefile +++ b/sys/modules/acpi/Makefile @@ -1,10 +1,11 @@ # $FreeBSD$ .if ${MACHINE} == "i386" -SUBDIR= acpi +SUBDIR= acpi .endif -SUBDIR+= acpi_aiboost acpi_asus acpi_fujitsu acpi_ibm \ - acpi_panasonic acpi_sony acpi_toshiba acpi_video acpi_dock +SUBDIR+= acpi_aiboost acpi_asus acpi_fujitsu acpi_ibm \ + acpi_panasonic acpi_sony acpi_toshiba acpi_video \ + acpi_dock .include diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile index b79fd4f..deec748 100644 --- a/sys/modules/acpi/acpi/Makefile +++ b/sys/modules/acpi/acpi/Makefile @@ -1,10 +1,13 @@ # $FreeBSD$ +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" +.error "ACPI can only be compiled into the kernel on the amd64 and ia64 platforms" +.endif + .if ${MACHINE} != "i386" .error "The ACPI module is only for i386" .endif - .PATH: ${.CURDIR}/../../../contrib/dev/acpica \ ${.CURDIR}/../../../pci \ ${.CURDIR}/../../../dev/acpica \ @@ -15,47 +18,42 @@ KMOD= acpi # ACPI CA sources CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica -SRCS+= dsfield.c dsinit.c dsmethod.c dsmthdat.c -SRCS+= dsobject.c dsopcode.c dsutils.c dswexec.c dswload.c -SRCS+= dswscope.c dswstate.c evevent.c evgpe.c evgpeblk.c -SRCS+= evmisc.c evregion.c evrgnini.c evsci.c evxface.c -SRCS+= evxfevnt.c evxfregn.c exconfig.c exconvrt.c excreate.c -SRCS+= exdump.c exfield.c exfldio.c exmisc.c exmutex.c -SRCS+= exnames.c exoparg1.c exoparg2.c exoparg3.c exoparg6.c -SRCS+= exprep.c exregion.c exresnte.c exresolv.c exresop.c -SRCS+= exstore.c exstoren.c exstorob.c exsystem.c exutils.c +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 +SRCS+= evxface.c evxfevnt.c evxfregn.c +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+= nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c -SRCS+= nsload.c nsnames.c nsobject.c nsparse.c nssearch.c -SRCS+= nsutils.c nswalk.c nsxfeval.c nsxfname.c nsxfobj.c -SRCS+= psargs.c psloop.c psopcode.c psparse.c psscope.c -SRCS+= pstree.c psutils.c pswalk.c psxface.c -SRCS+= rsaddr.c rscalc.c rscreate.c rsdump.c rsinfo.c rsio.c -SRCS+= rsirq.c rslist.c rsmemory.c rsmisc.c rsutils.c -SRCS+= rsxface.c tbconvrt.c tbget.c tbgetall.c tbinstal.c -SRCS+= tbrsdt.c tbutils.c tbxface.c tbxfroot.c utalloc.c -SRCS+= utcache.c utclib.c utcopy.c utdebug.c utdelete.c -SRCS+= uteval.c utglobal.c utinit.c utmath.c utmisc.c -SRCS+= utmutex.c utobject.c utstate.c utxface.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+= 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+= utstate.c utxface.c # OSPM layer and core hardware drivers -SRCS+= acpi.c acpi_button.c acpi_isab.c -SRCS+= acpi_package.c acpi_pci.c acpi_pcib.c acpi_pcib_acpi.c -SRCS+= acpi_pcib_pci.c acpi_powerres.c acpi_quirk.c acpi_resource.c -SRCS+= acpi_timer.c acpi_pci_link.c acpi_thermal.c +SRCS+= acpi.c acpi_button.c acpi_isab.c acpi_package.c acpi_pci.c acpi_pcib.c +SRCS+= acpi_pcib_acpi.c acpi_pcib_pci.c acpi_powerres.c acpi_quirk.c +SRCS+= acpi_resource.c acpi_timer.c acpi_pci_link.c acpi_thermal.c # ACPI hardware drivers, mostly used for mobile systems. -SRCS+= acpi_acad.c acpi_battery.c acpi_cmbat.c acpi_cpu.c -SRCS+= acpi_ec.c acpi_hpet.c acpi_lid.c acpi_perf.c acpi_smbat.c -SRCS+= acpi_throttle.c +SRCS+= acpi_acad.c acpi_battery.c acpi_cmbat.c acpi_cpu.c acpi_ec.c +SRCS+= acpi_hpet.c acpi_lid.c acpi_perf.c acpi_smbat.c acpi_throttle.c # OSD layer -SRCS+= OsdDebug.c -SRCS+= OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c -SRCS+= OsdStream.c OsdSynch.c OsdTable.c OsdEnvironment.c -SRCS+= opt_acpi.h opt_bus.h opt_ddb.h -SRCS+= acpi_if.h acpi_quirks.h bus_if.h cpufreq_if.h device_if.h -SRCS+= isa_if.h pci_if.h pcib_if.h +SRCS+= OsdDebug.c +SRCS+= OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c OsdStream.c +SRCS+= OsdSynch.c OsdTable.c OsdEnvironment.c +SRCS+= opt_acpi.h opt_bus.h opt_ddb.h acpi_if.h acpi_quirks.h bus_if.h +SRCS+= cpufreq_if.h device_if.h isa_if.h pci_if.h pcib_if.h # XXX ACPI should not depend on the following headers but this is currently # needed for the build of assym.s. @@ -63,12 +61,11 @@ SRCS+= isa_if.h pci_if.h pcib_if.h SRCS+= opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h # Debugging support -DBSRC= dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c -DBSRC+= dbinput.c dbstats.c dbutils.c dbxface.c +DBSRC= dbcmds.c dbdisply.c dbexec.c dbfileio.c dbhistry.c dbinput.c dbstats.c +DBSRC+= dbutils.c dbxface.c DBSRC+= dmbuffer.c dmnames.c dmopcode.c dmobject.c dmresrc.c dmresrcl.c DBSRC+= dmresrcs.c dmutils.c dmwalk.c -CFLAGS+=-DACPI_USE_LOCAL_CACHE .if !defined(KERNBUILDDIR) .if ACPI_MAX_THREADS CFLAGS+=-DACPI_MAX_THREADS=${ACPI_MAX_THREADS} -- cgit v1.1