Module Name: src
Committed By: nat
Date: Thu Dec 8 21:42:42 UTC 2016
Modified Files:
src/sys/modules: Makefile
src/sys/modules/spkr: Makefile spkr.ioconf
Log Message:
Fix building of the spkr module. The module now is the synthesized speaker.
Reported by joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/sys/modules/Makefile
cvs rdiff -u -r1.1 -r1.2 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.183 src/sys/modules/Makefile:1.184
--- src/sys/modules/Makefile:1.183 Wed Nov 16 00:49:27 2016
+++ src/sys/modules/Makefile Thu Dec 8 21:42:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.183 2016/11/16 00:49:27 pgoyette Exp $
+# $NetBSD: Makefile,v 1.184 2016/12/08 21:42:42 nat Exp $
.include <bsd.own.mk>
@@ -116,6 +116,7 @@ SUBDIR+= skipjack
SUBDIR+= slcompress
SUBDIR+= smbfs
SUBDIR+= spdmem
+SUBDIR+= spkr
SUBDIR+= sppp_subr
SUBDIR+= sysmon
SUBDIR+= sysmon_envsys
@@ -365,7 +366,6 @@ 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.1 src/sys/modules/spkr/Makefile:1.2
--- src/sys/modules/spkr/Makefile:1.1 Sun May 17 05:21:38 2015
+++ src/sys/modules/spkr/Makefile Thu Dec 8 21:42:42 2016
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2015/05/17 05:21:38 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/08 21:42:42 nat Exp $
.include "../Makefile.inc"
-.PATH: ${S}/dev/isa
+.PATH: ${S}/dev
KMOD= spkr
IOCONF= spkr.ioconf
-SRCS= spkr.c
+SRCS= spkr_synth.c
WARNS= 4
Index: src/sys/modules/spkr/spkr.ioconf
diff -u src/sys/modules/spkr/spkr.ioconf:1.1 src/sys/modules/spkr/spkr.ioconf:1.2
--- src/sys/modules/spkr/spkr.ioconf:1.1 Sun May 17 05:21:38 2015
+++ src/sys/modules/spkr/spkr.ioconf Thu Dec 8 21:42:42 2016
@@ -1,10 +1,9 @@
-# $NetBSD: spkr.ioconf,v 1.1 2015/05/17 05:21:38 pgoyette Exp $
+# $NetBSD: spkr.ioconf,v 1.2 2016/12/08 21:42:42 nat Exp $
ioconf spkr
include "conf/files"
-include "dev/isa/files.isa"
-pseudo-root pcppi*
+pseudo-root audio*
-spkr* at pcppi?
+spkr* at audio?
