[src/trunk]: src/sys/modules Revert to previous. Add PCPPISPEAKER flag to fi...

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

details:   https://anonhg.NetBSD.org/src/rev/ff524b8b1051
branches:  trunk
changeset: 819506:ff524b8b1051
user:      nat <nat%NetBSD.org@localhost>
date:      Thu Dec 08 23:22:18 2016 +0000

description:
Revert to previous.  Add PCPPISPEAKER flag to fix build.

diffstat:

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

diffs (62 lines):

diff -r eebf3f08e3bf -r ff524b8b1051 sys/modules/Makefile
--- a/sys/modules/Makefile      Thu Dec 08 23:07:11 2016 +0000
+++ b/sys/modules/Makefile      Thu Dec 08 23:22:18 2016 +0000
@@ -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+=       slcompress
 SUBDIR+=       smbfs
 SUBDIR+=       spdmem
-SUBDIR+=       spkr
 SUBDIR+=       sppp_subr
 SUBDIR+=       sysmon
 SUBDIR+=       sysmon_envsys
@@ -366,6 +365,7 @@
 SUBDIR+=       coram
 SUBDIR+=       cxdtv
 SUBDIR+=       emdtv
+SUBDIR+=       spkr
 .endif
 
 .if (${MKISCSI} != "no")
diff -r eebf3f08e3bf -r ff524b8b1051 sys/modules/spkr/Makefile
--- a/sys/modules/spkr/Makefile Thu Dec 08 23:07:11 2016 +0000
+++ b/sys/modules/spkr/Makefile Thu Dec 08 23:22:18 2016 +0000
@@ -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
 
diff -r eebf3f08e3bf -r ff524b8b1051 sys/modules/spkr/spkr.ioconf
--- a/sys/modules/spkr/spkr.ioconf      Thu Dec 08 23:07:11 2016 +0000
+++ b/sys/modules/spkr/spkr.ioconf      Thu Dec 08 23:22:18 2016 +0000
@@ -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?