Update for slightly changed ACPI OSD module. Make debugging code conditional

on ACPI_DEBUG, so we can set it in /etc/make.conf.

1 files changed, 22 insertions, 13 deletions

diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile
index 375c356642c8..8c7550ee7e45 100644
--- a/sys/modules/acpi/Makefile
+++ b/sys/modules/acpi/Makefile
@@ -1,12 +1,15 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../contrib/dev/acpica \
-       ${.CURDIR}/../../pci ${.CURDIR}/../../dev/acpica \
-       ${.CURDIR}/../../dev/acpica/Osd ${.CURDIR}/../../${MACHINE}/acpica
+       ${.CURDIR}/../../pci \
+       ${.CURDIR}/../../dev/acpica \
+       ${.CURDIR}/../../dev/acpica/Osd \
+       ${.CURDIR}/../../${MACHINE}/acpica
 
-KMOD=	acpica
+KMOD=	acpi
 
 # ACPI CA sources
+CFLAGS+=   -I${.CURDIR}/../../contrib/dev/acpica
 SRCS+=	dsfield.c dsmethod.c dsmthdat.c dsobject.c dsopcode.c dsutils.c
 SRCS+=	dswexec.c dswload.c dswscope.c dswstate.c evevent.c evmisc.c evregion.c
 SRCS+=	evrgnini.c evsci.c evxface.c evxfevnt.c evxfregn.c exconfig.c exconvrt.c
@@ -22,28 +25,34 @@ SRCS+=  rsutils.c rsxface.c tbconvrt.c tbget.c tbinstal.c tbutils.c tbxface.c
 SRCS+=	tbxfroot.c utalloc.c utclib.c utcopy.c utdebug.c utdelete.c uteval.c
 SRCS+=	utglobal.c utinit.c utmisc.c utobject.c utxface.c
 
-# ACPI CA debug support
-#SRCS=	dbcmds.c dbdisasm.c dbdisply.c dbexec.c dbfileio.c dbhistry.c dbinput.c
-#SRCS+=	dbstats.c dbutils.c dbxface.c 
-
 # OSD layer
 SRCS+=	acpi.c acpi_acad.c acpi_battery.c acpi_button.c acpi_cmbat.c acpi_cpu.c
-SRCS+=	acpi_ec.c acpi_isa.c acpi_lid.c acpi_pcib.c acpi_powerprofile.c
+SRCS+=	acpi_ec.c acpi_lid.c acpi_pcib.c acpi_powerprofile.c
 SRCS+=	acpi_powerres.c acpi_resource.c acpi_thermal.c acpi_timer.c
-SRCS+=	acpi_wakecode.h acpi_wakeup.c
 SRCS+=  OsdDebug.c 
 SRCS+=	OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c
 SRCS+=	OsdStream.c OsdSynch.c OsdEnvironment.c 
 SRCS+=	opt_acpi.h opt_ddb.h
 SRCS+=	device_if.h bus_if.h pci_if.h pcib_if.h isa_if.h
 
-CFLAGS+=   -I${.CURDIR}/../../contrib/dev/acpica
-CLEANFILES+=	acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin
-
+# Debugging support
+.if ACPI_DEBUG
+CFLAGS+=-DACPI_DEBUG
+SRCS+=	dbcmds.c dbdisasm.c dbdisply.c dbexec.c dbfileio.c dbhistry.c
+SRCS+=	dbinput.c dbstats.c dbutils.c dbxface.c
 opt_ddb.h: Makefile
 	echo '#define DDB 1'  >opt_ddb.h
+.else
+opt_ddb.h: Makefile
+	echo ''  >opt_ddb.h
+.endif
+
+# Machine-specific sleep/wakeup code
+SRCS+=	acpi_wakecode.h acpi_wakeup.c
+CLEANFILES+=	acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin
 
 acpi_wakecode.h: acpi_wakecode.S
-	${MAKE} -f ${.CURDIR}/../../${MACHINE}/acpica/Makefile MAKESRCPATH=${.CURDIR}/../../${MACHINE}/acpica
+	${MAKE} -f ${.CURDIR}/../../${MACHINE}/acpica/Makefile \
+		MAKESRCPATH=${.CURDIR}/../../${MACHINE}/acpica
 
 .include <bsd.kmod.mk>