[src/trunk]: src/sys/modules Fix building of the spkr module. The module now...

[nat <nat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7df06b6c5f01
branches:  trunk
changeset: 349362:7df06b6c5f01
user:      nat <nat%NetBSD.org@localhost>
date:      Thu Dec 08 21:42:42 2016 +0000

description:
Fix building of the spkr module.  The module now is the synthesized speaker.
Reported by joerg@

diffstat:

 sys/modules/Makefile         |  4 ++--
 sys/modules/spkr/Makefile    |  6 +++---
 sys/modules/spkr/spkr.ioconf |  7 +++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diffs (61 lines):

diff -r e17be75a686b -r 7df06b6c5f01 sys/modules/Makefile
--- a/sys/modules/Makefile      Thu Dec 08 20:53:12 2016 +0000
+++ b/sys/modules/Makefile      Thu Dec 08 21:42:42 2016 +0000
@@ -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+=       slcompress
 SUBDIR+=       smbfs
 SUBDIR+=       spdmem
+SUBDIR+=       spkr
 SUBDIR+=       sppp_subr
 SUBDIR+=       sysmon
 SUBDIR+=       sysmon_envsys
@@ -365,7 +366,6 @@
 SUBDIR+=       coram
 SUBDIR+=       cxdtv
 SUBDIR+=       emdtv
-SUBDIR+=       spkr
 .endif
 
 .if (${MKISCSI} != "no")
diff -r e17be75a686b -r 7df06b6c5f01 sys/modules/spkr/Makefile
--- a/sys/modules/spkr/Makefile Thu Dec 08 20:53:12 2016 +0000
+++ b/sys/modules/spkr/Makefile Thu Dec 08 21:42:42 2016 +0000
@@ -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
 
diff -r e17be75a686b -r 7df06b6c5f01 sys/modules/spkr/spkr.ioconf
--- a/sys/modules/spkr/spkr.ioconf      Thu Dec 08 20:53:12 2016 +0000
+++ b/sys/modules/spkr/spkr.ioconf      Thu Dec 08 21:42:42 2016 +0000
@@ -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?