Module Name: src Committed By: nat Date: Thu Dec 8 23:22:18 UTC 2016
Modified Files: src/sys/modules: Makefile src/sys/modules/spkr: Makefile spkr.ioconf Log Message: Revert to previous. Add PCPPISPEAKER flag to fix build. To generate a diff of this commit: cvs rdiff -u -r1.184 -r1.185 src/sys/modules/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/modules/spkr/Makefile \ src/sys/modules/spkr/spkr.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.184 src/sys/modules/Makefile:1.185 --- src/sys/modules/Makefile:1.184 Thu Dec 8 21:42:42 2016 +++ src/sys/modules/Makefile Thu Dec 8 23:22:18 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.184 2016/12/08 21:42:42 nat Exp $ +# $NetBSD: Makefile,v 1.185 2016/12/08 23:22:18 nat Exp $ .include <bsd.own.mk> @@ -116,7 +116,6 @@ SUBDIR+= skipjack SUBDIR+= slcompress SUBDIR+= smbfs SUBDIR+= spdmem -SUBDIR+= spkr SUBDIR+= sppp_subr SUBDIR+= sysmon SUBDIR+= sysmon_envsys @@ -366,6 +365,7 @@ SUBDIR+= auvitek SUBDIR+= coram SUBDIR+= cxdtv SUBDIR+= emdtv +SUBDIR+= spkr .endif .if (${MKISCSI} != "no") Index: src/sys/modules/spkr/Makefile diff -u src/sys/modules/spkr/Makefile:1.2 src/sys/modules/spkr/Makefile:1.3 --- src/sys/modules/spkr/Makefile:1.2 Thu Dec 8 21:42:42 2016 +++ src/sys/modules/spkr/Makefile Thu Dec 8 23:22:18 2016 @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.2 2016/12/08 21:42:42 nat Exp $ +# $NetBSD: Makefile,v 1.3 2016/12/08 23:22:18 nat Exp $ .include "../Makefile.inc" -.PATH: ${S}/dev +.PATH: ${S}/dev/isa KMOD= spkr IOCONF= spkr.ioconf -SRCS= spkr_synth.c +CFLAGS+= -DPCPPISPEAKER +SRCS= spkr.c WARNS= 4 Index: src/sys/modules/spkr/spkr.ioconf diff -u src/sys/modules/spkr/spkr.ioconf:1.2 src/sys/modules/spkr/spkr.ioconf:1.3 --- src/sys/modules/spkr/spkr.ioconf:1.2 Thu Dec 8 21:42:42 2016 +++ src/sys/modules/spkr/spkr.ioconf Thu Dec 8 23:22:18 2016 @@ -1,9 +1,10 @@ -# $NetBSD: spkr.ioconf,v 1.2 2016/12/08 21:42:42 nat Exp $ +# $NetBSD: spkr.ioconf,v 1.3 2016/12/08 23:22:18 nat Exp $ ioconf spkr include "conf/files" +include "dev/isa/files.isa" -pseudo-root audio* +pseudo-root pcppi* -spkr* at audio? +spkr* at pcppi?