Module Name: src
Committed By: christos
Date: Tue Dec 13 20:42:21 UTC 2016
Modified Files:
src/sys/arch/acorn32/conf: EB7500ATX GENERIC INSTALL LOWMEM_WSCONS NC
src/sys/arch/algor/conf: P5064 P6032
src/sys/arch/alpha/conf: GENERIC
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/amiga/conf: AMIGA DRACO GENERIC GENERIC.in MDINSTALL
src/sys/arch/amigappc/conf: GENERIC NULL
src/sys/arch/atari/conf: GENERIC.in HADES HADES.in MILAN-ISAIDE
MILAN-PCIIDE
src/sys/arch/bebox/conf: GENERIC INSTALL
src/sys/arch/cats/conf: GENERIC INSTALL
src/sys/arch/cobalt/conf: GENERIC INSTALL
src/sys/arch/dreamcast/conf: GENERIC
src/sys/arch/epoc32/conf: GENERIC
src/sys/arch/evbarm/conf: ALLWINNER_A80 ARMADILLO9 BPI CUBIEBOARD
GUMSTIX HDL_G HPT5325 HUMMINGBIRD_A31 IMX23_OLINUXINO LUBBOCK
MINI2440 MMNET_GENERIC MPCSA_GENERIC MV2120 POGO RPI SHEEVAPLUG
SMDK2410 TEGRA TS7200 TWINTAIL
src/sys/arch/evbmips/conf: ALCHEMY LOONGSON MALTA
src/sys/arch/evbppc/conf: EV64260 OPENBLOCKS266_OPT PMPPC
src/sys/arch/hp300/conf: GENERIC
src/sys/arch/hpcarm/conf: NETBOOKPRO WZERO3
src/sys/arch/hpcmips/conf: GENERIC TX3922 VR41XX
src/sys/arch/hppa/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
INSTALL_TINY XEN3_DOM0
src/sys/arch/ibmnws/conf: GENERIC
src/sys/arch/iyonix/conf: GENERIC
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/macppc/conf: GENERIC GENERIC_601
src/sys/arch/mmeye/conf: MMEYE_WLF
src/sys/arch/netwinder/conf: GENERIC
src/sys/arch/ofppc/conf: GENERIC
src/sys/arch/playstation2/conf: DEBUG
src/sys/arch/pmax/conf: GENERIC GENERIC64 INSTALL INSTALL64
src/sys/arch/prep/conf: GENERIC
src/sys/arch/sandpoint/conf: ENCPP1
src/sys/arch/sgimips/conf: GENERIC32_IP2x GENERIC32_IP3x
src/sys/arch/shark/conf: GENERIC INSTALL
src/sys/arch/sparc/conf: INSTALL KRUPS MRCOFFEE TADPOLE3GX
src/sys/arch/sparc64/conf: GENERIC NONPLUS64
src/sys/arch/usermode/conf: GENERIC.common
src/sys/arch/vax/conf: GENERIC
src/sys/arch/x68k/conf: GENERIC INSTALL
src/sys/arch/zaurus/conf: GENERIC INSTALL
Log Message:
wildcard speaker attachments, now that we can handle many of them.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/acorn32/conf/EB7500ATX
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/acorn32/conf/INSTALL
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/acorn32/conf/LOWMEM_WSCONS
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/acorn32/conf/NC
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/algor/conf/P5064
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/algor/conf/P6032
cvs rdiff -u -r1.374 -r1.375 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.446 -r1.447 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/amiga/conf/AMIGA
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.313 -r1.314 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amiga/conf/MDINSTALL
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amigappc/conf/GENERIC
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amigappc/conf/NULL
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/atari/conf/GENERIC.in
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/atari/conf/HADES
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/atari/conf/HADES.in
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/atari/conf/MILAN-ISAIDE
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/atari/conf/MILAN-PCIIDE
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/bebox/conf/INSTALL
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/epoc32/conf/GENERIC
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/ALLWINNER_A80 \
src/sys/arch/evbarm/conf/MINI2440
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/ARMADILLO9 \
src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/BPI
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/conf/CUBIEBOARD
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/HDL_G \
src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/HPT5325 \
src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/IMX23_OLINUXINO
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/conf/LUBBOCK
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/POGO
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbarm/conf/SMDK2410
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/TEGRA
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/TS7200
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbmips/conf/ALCHEMY
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbmips/conf/LOONGSON
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/evbppc/conf/EV64260
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbppc/conf/PMPPC
cvs rdiff -u -r1.193 -r1.194 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/conf/NETBOOKPRO
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hpcarm/conf/WZERO3
cvs rdiff -u -r1.232 -r1.233 src/sys/arch/hpcmips/conf/GENERIC
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/hpcmips/conf/TX3922
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/hpcmips/conf/VR41XX
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.406 -r1.407 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1144 -r1.1145 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.145 -r1.146 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.147 -r1.148 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/ibmnws/conf/GENERIC
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.325 -r1.326 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mmeye/conf/MMEYE_WLF
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/ofppc/conf/GENERIC
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/playstation2/conf/DEBUG
cvs rdiff -u -r1.189 -r1.190 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/pmax/conf/GENERIC64
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/pmax/conf/INSTALL
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/pmax/conf/INSTALL64
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/prep/conf/GENERIC
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sandpoint/conf/ENCPP1
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/shark/conf/INSTALL
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/sparc/conf/INSTALL
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sparc/conf/MRCOFFEE
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sparc/conf/TADPOLE3GX
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sparc64/conf/NONPLUS64
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/usermode/conf/GENERIC.common
cvs rdiff -u -r1.198 -r1.199 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/x68k/conf/GENERIC
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/x68k/conf/INSTALL
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/zaurus/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/conf/EB7500ATX
diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.60 src/sys/arch/acorn32/conf/EB7500ATX:1.61
--- src/sys/arch/acorn32/conf/EB7500ATX:1.60 Sat Dec 10 18:03:22 2016
+++ src/sys/arch/acorn32/conf/EB7500ATX Tue Dec 13 15:42:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.60 2016/12/10 23:03:22 christos Exp $
+# $NetBSD: EB7500ATX,v 1.61 2016/12/13 20:42:15 christos Exp $
#
# EB7500ATX --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "EB7500ATX-$Revision: 1.60 $"
+#ident "EB7500ATX-$Revision: 1.61 $"
# estimated number of users
maxusers 32
@@ -222,7 +222,7 @@ pseudo-device wsmux
vidcaudio0 at vidc?
audio* at vidcaudio0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
rsbus0 at mainbus?
Index: src/sys/arch/acorn32/conf/GENERIC
diff -u src/sys/arch/acorn32/conf/GENERIC:1.119 src/sys/arch/acorn32/conf/GENERIC:1.120
--- src/sys/arch/acorn32/conf/GENERIC:1.119 Sat Dec 10 18:03:22 2016
+++ src/sys/arch/acorn32/conf/GENERIC Tue Dec 13 15:42:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.119 2016/12/10 23:03:22 christos Exp $
+# $NetBSD: GENERIC,v 1.120 2016/12/13 20:42:15 christos Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.119 $"
+#ident "GENERIC-$Revision: 1.120 $"
# estimated number of users
maxusers 32
@@ -248,7 +248,7 @@ lpt* at pioc? offset 0x0278 irq 0 # Old
vidcaudio0 at vidc?
audio* at vidcaudio0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Podule bus device
podulebus0 at root
Index: src/sys/arch/acorn32/conf/INSTALL
diff -u src/sys/arch/acorn32/conf/INSTALL:1.75 src/sys/arch/acorn32/conf/INSTALL:1.76
--- src/sys/arch/acorn32/conf/INSTALL:1.75 Sat Dec 10 18:03:22 2016
+++ src/sys/arch/acorn32/conf/INSTALL Tue Dec 13 15:42:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.75 2016/12/10 23:03:22 christos Exp $
+# $NetBSD: INSTALL,v 1.76 2016/12/13 20:42:15 christos Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.75 $"
+#ident "INSTALL-$Revision: 1.76 $"
# estimated number of users
maxusers 32
@@ -240,7 +240,7 @@ lpt* at pioc? offset 0x0278 irq 0
vidcaudio0 at vidc?
audio* at vidcaudio0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Podule bus device
podulebus0 at root
Index: src/sys/arch/acorn32/conf/LOWMEM_WSCONS
diff -u src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.69 src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.70
--- src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.69 Sat Dec 10 18:03:22 2016
+++ src/sys/arch/acorn32/conf/LOWMEM_WSCONS Tue Dec 13 15:42:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: LOWMEM_WSCONS,v 1.69 2016/12/10 23:03:22 christos Exp $
+# $NetBSD: LOWMEM_WSCONS,v 1.70 2016/12/13 20:42:15 christos Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@@ -218,7 +218,7 @@ lpt* at pioc? offset 0x0278 irq 0
vidcaudio0 at vidc?
audio* at vidcaudio0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Podule bus device
#podulebus0 at root
Index: src/sys/arch/acorn32/conf/NC
diff -u src/sys/arch/acorn32/conf/NC:1.68 src/sys/arch/acorn32/conf/NC:1.69
--- src/sys/arch/acorn32/conf/NC:1.68 Sat Dec 10 18:03:22 2016
+++ src/sys/arch/acorn32/conf/NC Tue Dec 13 15:42:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: NC,v 1.68 2016/12/10 23:03:22 christos Exp $
+# $NetBSD: NC,v 1.69 2016/12/13 20:42:15 christos Exp $
#
# NC - with wscons
#
@@ -210,7 +210,7 @@ lpt* at pioc? offset 0x0278 irq 0 # Old
vidcaudio0 at vidc?
audio* at vidcaudio0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Podule bus device
podulebus0 at root
Index: src/sys/arch/algor/conf/P5064
diff -u src/sys/arch/algor/conf/P5064:1.83 src/sys/arch/algor/conf/P5064:1.84
--- src/sys/arch/algor/conf/P5064:1.83 Thu Aug 20 21:52:07 2015
+++ src/sys/arch/algor/conf/P5064 Tue Dec 13 15:42:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: P5064,v 1.83 2015/08/21 01:52:07 uebayasi Exp $
+# $NetBSD: P5064,v 1.84 2016/12/13 20:42:15 christos Exp $
#
# Algorithmics P-5064 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P5064-$Revision: 1.83 $"
+#ident "P5064-$Revision: 1.84 $"
maxusers 32
@@ -217,7 +217,7 @@ mcclock* at isa? port 0x70
#pms* at pckbc? # PS/2-style mouse (aux port)
#attimer* at isa? # AT Timer
#pcppi* at isa? # PC prog. periph. interface
-#spkr0 at pcppi? # IBM BASIC emulation
+#spkr* at pcppi? # IBM BASIC emulation
#isabeep0 at pcppi? # "keyboard" beep
#midi* at pcppi?
com* at isa? port 0x3f8 irq 4 # standard serial ports
@@ -244,6 +244,7 @@ fdc0 at isa? port 0x3f0 irq 6 drq 2 # fl
#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System
#wss* at isapnp?
#audio* at wss?
+#spkr* at audio? # PC speaker (synthesized)
#midi* at wss?
#sb* at isa? port 0x220 irq 5 drq 1 # SoundBlaster
#sb* at isapnp?
Index: src/sys/arch/algor/conf/P6032
diff -u src/sys/arch/algor/conf/P6032:1.74 src/sys/arch/algor/conf/P6032:1.75
--- src/sys/arch/algor/conf/P6032:1.74 Thu Aug 20 21:52:07 2015
+++ src/sys/arch/algor/conf/P6032 Tue Dec 13 15:42:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: P6032,v 1.74 2015/08/21 01:52:07 uebayasi Exp $
+# $NetBSD: P6032,v 1.75 2016/12/13 20:42:15 christos Exp $
#
# Algorithmics P-6032 kernel.
#
@@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "P6032-$Revision: 1.74 $"
+#ident "P6032-$Revision: 1.75 $"
maxusers 32
@@ -222,7 +222,7 @@ mcclock* at isa? port 0x70
#pms* at pckbc? # PS/2-style mouse (aux port)
#attimer* at isa? # AT Timer
#pcppi* at isa? # PC prog. periph. interface
-#spkr0 at pcppi? # IBM BASIC emulation
+#spkr* at pcppi? # IBM BASIC emulation
#isabeep0 at pcppi? # "keyboard" beep
#midi* at pcppi?
com* at isa? port 0x3f8 irq 4 # standard serial ports
@@ -249,6 +249,7 @@ fdc0 at isa? port 0x3f0 irq 6 drq 2 # fl
#wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System
#wss* at isapnp?
#audio* at wss?
+#spkr* at audio? # PC speaker (synthesized)
#midi* at wss?
#sb* at isa? port 0x220 irq 5 drq 1 # SoundBlaster
#sb* at isapnp?
Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.374 src/sys/arch/alpha/conf/GENERIC:1.375
--- src/sys/arch/alpha/conf/GENERIC:1.374 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/alpha/conf/GENERIC Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.374 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.375 2016/12/13 20:42:16 christos Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.374 $"
+ident "GENERIC-$Revision: 1.375 $"
maxusers 32
@@ -440,7 +440,7 @@ pckbd* at pckbc? # PC keyboard (kbd p
pms* at pckbc? # PS/2-style mouse (aux port)
attimer* at isa? # AT Timer
pcppi* at isa? # PC prog. periph. interface
-spkr0 at pcppi? # IBM BASIC emulation
+spkr* at pcppi? # IBM BASIC emulation
isabeep0 at pcppi? # "keyboard" beep
com* at isa? port 0x3f8 irq 4 # standard serial ports
com* at isa? port 0x2f8 irq 3
@@ -709,7 +709,7 @@ midi* at midibus?
midi* at pcppi?
midi* at sb?
-#spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Workstation Console attachments
wsdisplay0 at wsemuldisplaydev? console 1
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.43 src/sys/arch/amd64/conf/ALL:1.44
--- src/sys/arch/amd64/conf/ALL:1.43 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/amd64/conf/ALL Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.43 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: ALL,v 1.44 2016/12/13 20:42:16 christos Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.43 $"
+#ident "ALL-$Revision: 1.44 $"
maxusers 64 # estimated number of users
@@ -1375,9 +1375,8 @@ midi* at midibus?
midi* at pcppi? # MIDI interface to the PC speaker
# The spkr driver provides a simple tone interface to the built in speaker.
-spkr0 at pcppi? # PC speaker
-
-#spkr0 at audio0 # PC speaker (synthesized)
+spkr* at pcppi? # PC speaker
+spkr* at audio? # PC speaker (synthesized)
# FM-Radio devices
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.446 src/sys/arch/amd64/conf/GENERIC:1.447
--- src/sys/arch/amd64/conf/GENERIC:1.446 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/amd64/conf/GENERIC Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.446 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.447 2016/12/13 20:42:16 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.446 $"
+#ident "GENERIC-$Revision: 1.447 $"
maxusers 64 # estimated number of users
@@ -1109,9 +1109,8 @@ hdafg* at hdaudiobus?
audio* at audiobus?
# The spkr driver provides a simple tone interface to the built in speaker.
-spkr0 at pcppi? # PC speaker
-
-#spkr0 at audio0 # PC speaker (synthesized)
+spkr* at pcppi? # PC speaker
+spkr* at audio? # PC speaker (synthesized)
# MPU 401 UARTs
#mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.122 src/sys/arch/amd64/conf/XEN3_DOM0:1.123
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.122 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.122 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.123 2016/12/13 20:42:16 christos Exp $
include "arch/amd64/conf/std.xen"
@@ -747,7 +747,7 @@ hdafg* at hdaudiobus?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# MPU 401 UARTs
#mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
Index: src/sys/arch/amiga/conf/AMIGA
diff -u src/sys/arch/amiga/conf/AMIGA:1.110 src/sys/arch/amiga/conf/AMIGA:1.111
--- src/sys/arch/amiga/conf/AMIGA:1.110 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/amiga/conf/AMIGA Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: AMIGA,v 1.110 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: AMIGA,v 1.111 2016/12/13 20:42:16 christos Exp $
# GENERIC, without DraCo
#
@@ -24,4 +24,4 @@ no scsibus* at drsc0
melody* at zbus0 # Melody MPEG audio decoder
audio* at melody?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.179 src/sys/arch/amiga/conf/DRACO:1.180
--- src/sys/arch/amiga/conf/DRACO:1.179 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/amiga/conf/DRACO Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.179 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: DRACO,v 1.180 2016/12/13 20:42:16 christos Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.179 $"
+#ident "GENERIC-$Revision: 1.180 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -284,7 +284,7 @@ lpt0 at drsupio? port ? # DraCo paralle
repulse* at zbus0 # ALiENDESiGN Repulse
audio* at repulse?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
toccata* at zbus0 # MacroSystem GmbH Toccata
audio* at toccata?
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.313 src/sys/arch/amiga/conf/GENERIC:1.314
--- src/sys/arch/amiga/conf/GENERIC:1.313 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/amiga/conf/GENERIC Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.313 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.314 2016/12/13 20:42:16 christos Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.313 $"
+#ident "GENERIC-$Revision: 1.314 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -344,7 +344,7 @@ a2kbbc0 at mainbus0 # A2000 battery ba
aucc* at mainbus0 # Amiga CC audio
audio* at aucc?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
a1k2cp0 at mainbus0 # A1200 on-board clockport
clockport* at a1k2cp0
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.131 src/sys/arch/amiga/conf/GENERIC.in:1.132
--- src/sys/arch/amiga/conf/GENERIC.in:1.131 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/amiga/conf/GENERIC.in Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.131 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC.in,v 1.132 2016/12/13 20:42:16 christos Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.131 $"
+#ident "GENERIC-$Revision: 1.132 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -414,7 +414,7 @@ m4_ifdef(`INSTALL_CONFIGURATION', `', `m
aucc* at mainbus0 # Amiga CC audio
audio* at aucc?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
a1k2cp0 at mainbus0 # A1200 on-board clockport
clockport* at a1k2cp0
Index: src/sys/arch/amiga/conf/MDINSTALL
diff -u src/sys/arch/amiga/conf/MDINSTALL:1.34 src/sys/arch/amiga/conf/MDINSTALL:1.35
--- src/sys/arch/amiga/conf/MDINSTALL:1.34 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/amiga/conf/MDINSTALL Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MDINSTALL,v 1.34 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: MDINSTALL,v 1.35 2016/12/13 20:42:16 christos Exp $
#
# INSTALL kernel for ramdisk installation
@@ -185,7 +185,7 @@ a2kbbc0 at mainbus0 # A2000 battery ba
aucc* at mainbus0 # Amiga CC audio
audio* at aucc?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
#
# DraCo Mainboard devices (sans keyboard)
Index: src/sys/arch/amigappc/conf/GENERIC
diff -u src/sys/arch/amigappc/conf/GENERIC:1.28 src/sys/arch/amigappc/conf/GENERIC:1.29
--- src/sys/arch/amigappc/conf/GENERIC:1.28 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/amigappc/conf/GENERIC Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.28 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.29 2016/12/13 20:42:16 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amigappc/conf/std.amigappc
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.28 $"
+#ident "GENERIC-$Revision: 1.29 $"
maxusers 8
@@ -224,7 +224,7 @@ a34kbbc0 at mainbus0 # A3000/A4000 batt
aucc* at mainbus0 # Amiga CC audio
audio* at aucc?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# wscons aware interface to amiga custom chips.
# If you enable it enable also wskbd.
Index: src/sys/arch/amigappc/conf/NULL
diff -u src/sys/arch/amigappc/conf/NULL:1.48 src/sys/arch/amigappc/conf/NULL:1.49
--- src/sys/arch/amigappc/conf/NULL:1.48 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/amigappc/conf/NULL Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: NULL,v 1.48 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: NULL,v 1.49 2016/12/13 20:42:16 christos Exp $
#
# NULL machine description file
#
@@ -7,7 +7,7 @@ include "arch/amigappc/conf/std.amigappc
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.48 $"
+#ident "GENERIC-$Revision: 1.49 $"
maxusers 8
@@ -209,7 +209,7 @@ fd* at fdc0 unit ? # floppy disks on t
#aucc* at mainbus0 # Amiga CC audio
#audio* at aucc?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
# wscons aware interface to amiga custom chips.
# If you enable it enable also wskbd.
Index: src/sys/arch/atari/conf/GENERIC.in
diff -u src/sys/arch/atari/conf/GENERIC.in:1.111 src/sys/arch/atari/conf/GENERIC.in:1.112
--- src/sys/arch/atari/conf/GENERIC.in:1.111 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/atari/conf/GENERIC.in Tue Dec 13 15:42:16 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.in,v 1.111 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC.in,v 1.112 2016/12/13 20:42:16 christos Exp $
#
# Generic atari
#
@@ -319,7 +319,7 @@ fxp* at pci? dev ? function ? # Intel Et
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
audio* at eso?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
#endif /* defined(HADES_KERNEL) || defined(MILAN_KERNEL) */
Index: src/sys/arch/atari/conf/HADES
diff -u src/sys/arch/atari/conf/HADES:1.109 src/sys/arch/atari/conf/HADES:1.110
--- src/sys/arch/atari/conf/HADES:1.109 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/atari/conf/HADES Tue Dec 13 15:42:16 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: HADES,v 1.109 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: HADES,v 1.110 2016/12/13 20:42:16 christos Exp $
#
# This file was automatically created. Changes will be
# lost when running makeconf in this directory.
@@ -92,7 +92,7 @@ fxp* at pci? dev ? function ? # Intel Et
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
audio* at eso?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
pseudo-device view 4 # View (graphics mapping)
pseudo-device mouse 1 # mouse
Index: src/sys/arch/atari/conf/HADES.in
diff -u src/sys/arch/atari/conf/HADES.in:1.14 src/sys/arch/atari/conf/HADES.in:1.15
--- src/sys/arch/atari/conf/HADES.in:1.14 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/atari/conf/HADES.in Tue Dec 13 15:42:16 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: HADES.in,v 1.14 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: HADES.in,v 1.15 2016/12/13 20:42:16 christos Exp $
#
# Medusa-Hades
#
@@ -70,6 +70,6 @@ ep* at pci0 dev ? function 0 # 3Com 3c59
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
audio* at eso?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
#endif /* SMALL030_KERNEL */
Index: src/sys/arch/atari/conf/MILAN-ISAIDE
diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.86 src/sys/arch/atari/conf/MILAN-ISAIDE:1.87
--- src/sys/arch/atari/conf/MILAN-ISAIDE:1.86 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/atari/conf/MILAN-ISAIDE Tue Dec 13 15:42:16 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: MILAN-ISAIDE,v 1.86 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.87 2016/12/13 20:42:16 christos Exp $
#
# This file was automatically created. Changes will be
# lost when running makeconf in this directory.
@@ -90,7 +90,7 @@ fxp* at pci? dev ? function ? # Intel Et
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
audio* at eso?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
options WSEMUL_VT100 # VT100 / VT220 emulation
options WS_KERNEL_FG=WSCOL_WHITE
Index: src/sys/arch/atari/conf/MILAN-PCIIDE
diff -u src/sys/arch/atari/conf/MILAN-PCIIDE:1.90 src/sys/arch/atari/conf/MILAN-PCIIDE:1.91
--- src/sys/arch/atari/conf/MILAN-PCIIDE:1.90 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/atari/conf/MILAN-PCIIDE Tue Dec 13 15:42:16 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: MILAN-PCIIDE,v 1.90 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: MILAN-PCIIDE,v 1.91 2016/12/13 20:42:16 christos Exp $
#
# This file was automatically created. Changes will be
# lost when running makeconf in this directory.
@@ -90,7 +90,7 @@ fxp* at pci? dev ? function ? # Intel Et
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
audio* at eso?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
options WSEMUL_VT100 # VT100 / VT220 emulation
options WS_KERNEL_FG=WSCOL_WHITE
Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.150 src/sys/arch/bebox/conf/GENERIC:1.151
--- src/sys/arch/bebox/conf/GENERIC:1.150 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/bebox/conf/GENERIC Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.150 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.151 2016/12/13 20:42:16 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.150 $"
+#ident "GENERIC-$Revision: 1.151 $"
maxusers 32
@@ -202,14 +202,14 @@ lpt0 at isa? port 0x378 irq 7 # standard
mcclock0 at isa? port 0x70 # time-of-day clock
attimer0 at isa?
#pcppi0 at isa?
-#spkr0 at pcppi?
+spkr* at pcppi?
wss0 at isa? port 0x82c irq 30 drq 6 drq2 7 # Windows Sound System
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# MIDI support
#midi* at pcppi? # MIDI interface to the PC speaker
Index: src/sys/arch/bebox/conf/INSTALL
diff -u src/sys/arch/bebox/conf/INSTALL:1.58 src/sys/arch/bebox/conf/INSTALL:1.59
--- src/sys/arch/bebox/conf/INSTALL:1.58 Thu Dec 8 21:25:46 2016
+++ src/sys/arch/bebox/conf/INSTALL Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.58 2016/12/09 02:25:46 christos Exp $
+# $NetBSD: INSTALL,v 1.59 2016/12/13 20:42:16 christos Exp $
#
# First try for BeBox config file
#
@@ -179,7 +179,7 @@ tlp* at pci? dev ? function ? # DECchip
ukphy* at mii? phy ? # generic unknown PHYs
#wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System
-#spkr0 at pcppi?
+#spkr* at pcppi?
# Joystick driver. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.160 src/sys/arch/cats/conf/GENERIC:1.161
--- src/sys/arch/cats/conf/GENERIC:1.160 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/cats/conf/GENERIC Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.160 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.161 2016/12/13 20:42:16 christos Exp $
#
# GENERIC machine description file
#
@@ -502,9 +502,8 @@ lpt1 at isa? port 0x278 irq 5
#ep* at isa? port ? irq ?
# The spkr driver provides a simple tone interface to the built in speaker.
-spkr0 at pcppi? # PC speaker
-
-#spkr0 at audio0 # PC speaker (synthesized)
+spkr* at pcppi? # PC speaker
+spkr* at audio? # PC speaker (synthesized)
ds1687rtc0 at isa? port 0x72 # Dallas 1687 RTC
Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.100 src/sys/arch/cats/conf/INSTALL:1.101
--- src/sys/arch/cats/conf/INSTALL:1.100 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/cats/conf/INSTALL Tue Dec 13 15:42:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.100 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: INSTALL,v 1.101 2016/12/13 20:42:16 christos Exp $
#
# CATSINST -- CHALTECH CATS Install kernel
#
@@ -398,9 +398,8 @@ lpt1 at isa? port 0x278 irq 5
#ep* at isa? port ? irq ?
# The spkr driver provides a simple tone interface to the built in speaker.
-#spkr0 at pcppi? # PC speaker
-
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at pcppi? # PC speaker
+#spkr* at audio? # PC speaker (synthesized)
ds1687rtc0 at isa? port 0x72 # Dallas RTC
Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.150 src/sys/arch/cobalt/conf/GENERIC:1.151
--- src/sys/arch/cobalt/conf/GENERIC:1.150 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/cobalt/conf/GENERIC Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.150 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.151 2016/12/13 20:42:17 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.150 $"
+#ident "GENERIC-$Revision: 1.151 $"
maxusers 32
@@ -306,7 +306,7 @@ lxtphy* at mii? phy ? # Level One LXT
# Audio support
#audio* at audiobus?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
# Pseudo-devices
Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.61 src/sys/arch/cobalt/conf/INSTALL:1.62
--- src/sys/arch/cobalt/conf/INSTALL:1.61 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/cobalt/conf/INSTALL Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.61 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: INSTALL,v 1.62 2016/12/13 20:42:17 christos Exp $
#
# INSTALL -- installation and rescue kernel.
#
@@ -10,7 +10,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.61 $"
+#ident "INSTALL-$Revision: 1.62 $"
makeoptions COPTS="-Os -mmemcpy"
makeoptions CPUFLAGS="-march=vr5000 -mabi=32"
@@ -283,7 +283,7 @@ lxtphy* at mii? phy ? # Level One LXT
# Audio support
#audio* at audiobus?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
# Pseudo-devices
Index: src/sys/arch/dreamcast/conf/GENERIC
diff -u src/sys/arch/dreamcast/conf/GENERIC:1.124 src/sys/arch/dreamcast/conf/GENERIC:1.125
--- src/sys/arch/dreamcast/conf/GENERIC:1.124 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/dreamcast/conf/GENERIC Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.124 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.125 2016/12/13 20:42:17 christos Exp $
#
# GENERIC machine description file
#
@@ -193,7 +193,7 @@ mbe* at g2bus? # SEGA LAN Adapter
aica* at g2bus? # AICA Sound Processing Unit
audio* at aica?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
#pseudo-device cgd # cryptographic disk devices
pseudo-device md # memory disk device (ramdisk)
Index: src/sys/arch/epoc32/conf/GENERIC
diff -u src/sys/arch/epoc32/conf/GENERIC:1.10 src/sys/arch/epoc32/conf/GENERIC:1.11
--- src/sys/arch/epoc32/conf/GENERIC:1.10 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/epoc32/conf/GENERIC Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.10 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GENERIC,v 1.11 2016/12/13 20:42:17 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/epoc32/conf/std.epoc32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.10 $"
+#ident "GENERIC-$Revision: 1.11 $"
maxusers 32 # estimated number of users
@@ -168,7 +168,7 @@ wskbd* at epockbd?
#audio* at audio?
-#spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# External devices
Index: src/sys/arch/evbarm/conf/ALLWINNER_A80
diff -u src/sys/arch/evbarm/conf/ALLWINNER_A80:1.18 src/sys/arch/evbarm/conf/ALLWINNER_A80:1.19
--- src/sys/arch/evbarm/conf/ALLWINNER_A80:1.18 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/ALLWINNER_A80 Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALLWINNER_A80,v 1.18 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: ALLWINNER_A80,v 1.19 2016/12/13 20:42:17 christos Exp $
#
# ALLWINNER_A80 - Allwinner A80 boards (Cubieboard4, OptimusBoard, etc)
#
@@ -102,7 +102,7 @@ awge0 at awinio0 port ?
#awinhdmiaudio0 at awinio0
#audio1 at awinhdmiaudio0
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
# TCON
#awintcon0 at awinio0 port 0
Index: src/sys/arch/evbarm/conf/MINI2440
diff -u src/sys/arch/evbarm/conf/MINI2440:1.18 src/sys/arch/evbarm/conf/MINI2440:1.19
--- src/sys/arch/evbarm/conf/MINI2440:1.18 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/MINI2440 Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MINI2440,v 1.18 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: MINI2440,v 1.19 2016/12/13 20:42:17 christos Exp $
#
# MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440
#
@@ -240,7 +240,7 @@ sd* at scsibus? target ? lun ? # SCSI di
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
dme0 at ssextio? intr 7 addr 0x20000300
Index: src/sys/arch/evbarm/conf/ARMADILLO9
diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.51 src/sys/arch/evbarm/conf/ARMADILLO9:1.52
--- src/sys/arch/evbarm/conf/ARMADILLO9:1.51 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/ARMADILLO9 Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.51 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: ARMADILLO9,v 1.52 2016/12/13 20:42:17 christos Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -251,7 +251,7 @@ uk* at scsibus? target ? lun ? # SCSI un
# Audio support
#audio* at audiobus?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
# MIDI support
#midi* at midibus?
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.51 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.52
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.51 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.51 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: SHEEVAPLUG,v 1.52 2016/12/13 20:42:17 christos Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -437,7 +437,7 @@ mvsocrtc* at mvsoc? offset ? irq ?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Pseudo-Devices
Index: src/sys/arch/evbarm/conf/BPI
diff -u src/sys/arch/evbarm/conf/BPI:1.19 src/sys/arch/evbarm/conf/BPI:1.20
--- src/sys/arch/evbarm/conf/BPI:1.19 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/BPI Tue Dec 13 15:42:17 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: BPI,v 1.19 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: BPI,v 1.20 2016/12/13 20:42:17 christos Exp $
#
# BPI -- Banana Pi - an Allwinner A20 Eval Board Kernel
#
@@ -138,7 +138,7 @@ awinhdmi0 at awinio0
awinhdmiaudio0 at awinio0
audio1 at awinhdmiaudio0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# TCON
awintcon0 at awinio0 port 0
Index: src/sys/arch/evbarm/conf/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.48 src/sys/arch/evbarm/conf/CUBIEBOARD:1.49
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.48 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/CUBIEBOARD Tue Dec 13 15:42:17 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: CUBIEBOARD,v 1.48 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: CUBIEBOARD,v 1.49 2016/12/13 20:42:17 christos Exp $
#
# CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
#
@@ -133,7 +133,7 @@ awinhdmi0 at awinio0
awinhdmiaudio0 at awinio0
audio1 at awinhdmiaudio0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# TCON
awintcon0 at awinio0 port 0
Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.88 src/sys/arch/evbarm/conf/GUMSTIX:1.89
--- src/sys/arch/evbarm/conf/GUMSTIX:1.88 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/GUMSTIX Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GUMSTIX,v 1.88 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: GUMSTIX,v 1.89 2016/12/13 20:42:17 christos Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@@ -204,7 +204,7 @@ pxaacu0 at pxaip? addr 0x40500000 intr 1
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# LCD
lcd0 at pxaip? addr 0x44000000 # consoleLCD-vx,consoleLCD16-vx
Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.47 src/sys/arch/evbarm/conf/HDL_G:1.48
--- src/sys/arch/evbarm/conf/HDL_G:1.47 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/HDL_G Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.47 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: HDL_G,v 1.48 2016/12/13 20:42:17 christos Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@@ -377,7 +377,7 @@ ugen* at uhub? port ?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# MIDI support
midi* at midibus?
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.47 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.48
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.47 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.47 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.48 2016/12/13 20:42:17 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.47 $"
+#ident "GENERIC-$Revision: 1.48 $"
maxusers 32 # estimated number of users
@@ -576,7 +576,7 @@ ucom* at uvscom? portno ?
# Audio support
#audio* at audiobus?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
# MIDI support
#midi* at midibus?
Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.29 src/sys/arch/evbarm/conf/HPT5325:1.30
--- src/sys/arch/evbarm/conf/HPT5325:1.29 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/HPT5325 Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.29 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: HPT5325,v 1.30 2016/12/13 20:42:17 christos Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -436,7 +436,7 @@ mvsocrtc* at mvsoc? offset ? irq ?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Pseudo-Devices
Index: src/sys/arch/evbarm/conf/MV2120
diff -u src/sys/arch/evbarm/conf/MV2120:1.29 src/sys/arch/evbarm/conf/MV2120:1.30
--- src/sys/arch/evbarm/conf/MV2120:1.29 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbarm/conf/MV2120 Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MV2120,v 1.29 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: MV2120,v 1.30 2016/12/13 20:42:17 christos Exp $
#
# This configuration supports for HP MV2120/MV5140/MV5150.
@@ -251,7 +251,7 @@ include "dev/bluetooth/bluetoothdevices.
audio* at audiobus?
midi* at midibus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Pseudo-Devices
Index: src/sys/arch/evbarm/conf/HUMMINGBIRD_A31
diff -u src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.26 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.27
--- src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.26 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/HUMMINGBIRD_A31 Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: HUMMINGBIRD_A31,v 1.26 2016/12/10 23:03:23 christos Exp $
+# $NetBSD: HUMMINGBIRD_A31,v 1.27 2016/12/13 20:42:17 christos Exp $
#
# HUMMINGBIRD_A31 - Merrii Hummingbird A31
#
@@ -95,7 +95,7 @@ awinhdmi0 at awinio0
awinhdmiaudio0 at awinio0
audio1 at awinhdmiaudio0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# TCON
awintcon0 at awinio0 port 0
Index: src/sys/arch/evbarm/conf/IMX23_OLINUXINO
diff -u src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.14 src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.15
--- src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.14 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/IMX23_OLINUXINO Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $Id: IMX23_OLINUXINO,v 1.14 2016/12/10 23:03:23 christos Exp $
+# $Id: IMX23_OLINUXINO,v 1.15 2016/12/13 20:42:17 christos Exp $
#
# IMX23_OLINUXINO -- Olimex i.MX23 OLinuXino kernel configuration file.
#
@@ -73,7 +73,7 @@ rtc0 at apbx? addr 0x8005C000 size 0x20
digfilt0 at apbx? addr 0x80048000 size 0x8000 irq -1
audio0 at digfilt0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# USB host
ehci0 at imxusbc0 unit 0 irq 11
Index: src/sys/arch/evbarm/conf/LUBBOCK
diff -u src/sys/arch/evbarm/conf/LUBBOCK:1.56 src/sys/arch/evbarm/conf/LUBBOCK:1.57
--- src/sys/arch/evbarm/conf/LUBBOCK:1.56 Sat Dec 10 18:03:23 2016
+++ src/sys/arch/evbarm/conf/LUBBOCK Tue Dec 13 15:42:17 2016
@@ -160,7 +160,7 @@ options PXA2X0_DMAC_DMOVER_CONCURRENCY=
pxaacu0 at pxaip? addr 0x40500000 intr 14
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# On-board device support
obio0 at pxaip? intr 8
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.25 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.26
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.25 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.25 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: MMNET_GENERIC,v 1.26 2016/12/13 20:42:17 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.25 $"
+#ident "GENERIC-$Revision: 1.26 $"
maxusers 32 # estimated number of users
@@ -519,7 +519,7 @@ ucom* at uvscom? portno ?
# Audio support
#audio* at audiobus?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
# MIDI support
#midi* at midibus?
Index: src/sys/arch/evbarm/conf/POGO
diff -u src/sys/arch/evbarm/conf/POGO:1.2 src/sys/arch/evbarm/conf/POGO:1.3
--- src/sys/arch/evbarm/conf/POGO:1.2 Thu Dec 8 06:31:10 2016
+++ src/sys/arch/evbarm/conf/POGO Tue Dec 13 15:42:17 2016
@@ -33,7 +33,7 @@ no wskbd*
no btmagic*
no btsco*
no audio*
-no spkr0 at audio0
+no spkr* at audio?
no config netbsd
# Use ld0a for SD slot in Mobile and v4 or sd0a for USB disk
Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.70 src/sys/arch/evbarm/conf/RPI:1.71
--- src/sys/arch/evbarm/conf/RPI:1.70 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbarm/conf/RPI Tue Dec 13 15:42:17 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI,v 1.70 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: RPI,v 1.71 2016/12/13 20:42:17 christos Exp $
#
# RPi -- Raspberry Pi
#
@@ -68,7 +68,7 @@ vchiq0 at obio?
vcaudio0 at vchiq0
audio0 at vcaudio0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# PL011 uart
plcom0 at obio?
Index: src/sys/arch/evbarm/conf/SMDK2410
diff -u src/sys/arch/evbarm/conf/SMDK2410:1.61 src/sys/arch/evbarm/conf/SMDK2410:1.62
--- src/sys/arch/evbarm/conf/SMDK2410:1.61 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbarm/conf/SMDK2410 Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2410,v 1.61 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: SMDK2410,v 1.62 2016/12/13 20:42:17 christos Exp $
#
# SMDK2410 -- Samsung's S3C2410 evaluation board.
#
@@ -214,7 +214,7 @@ midi* at midibus?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# on-board CS8900A Ethernet
cs* at ssextio? intr 9 addr 0x18000000
Index: src/sys/arch/evbarm/conf/TEGRA
diff -u src/sys/arch/evbarm/conf/TEGRA:1.9 src/sys/arch/evbarm/conf/TEGRA:1.10
--- src/sys/arch/evbarm/conf/TEGRA:1.9 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbarm/conf/TEGRA Tue Dec 13 15:42:17 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: TEGRA,v 1.9 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: TEGRA,v 1.10 2016/12/13 20:42:17 christos Exp $
#
# NVIDIA Tegra K1 (T124)
#
@@ -125,7 +125,7 @@ options HDAUDIO_32BIT_ACCESS
options HDAUDIO_ENABLE_HDMI
options HDAUDIO_ENABLE_DISPLAYPORT
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# HDMI CEC
tegracec0 at fdt? # HDMI CEC
Index: src/sys/arch/evbarm/conf/TS7200
diff -u src/sys/arch/evbarm/conf/TS7200:1.65 src/sys/arch/evbarm/conf/TS7200:1.66
--- src/sys/arch/evbarm/conf/TS7200:1.65 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbarm/conf/TS7200 Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: TS7200,v 1.65 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: TS7200,v 1.66 2016/12/13 20:42:17 christos Exp $
#
# TS7200 - Kernel for Technologic Systems TS7200 ARM hardware
#
@@ -425,7 +425,7 @@ ugen* at uhub? port ?
# Audio support
#audio* at audiobus?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
# MPU 401 UARTs
#mpu* at cmpci?
Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.68 src/sys/arch/evbarm/conf/TWINTAIL:1.69
--- src/sys/arch/evbarm/conf/TWINTAIL:1.68 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbarm/conf/TWINTAIL Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.68 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: TWINTAIL,v 1.69 2016/12/13 20:42:17 christos Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -167,7 +167,7 @@ options KGDB_DEVRATE=115200
# Audio support
#audio* at audiobus?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
# FlashROM disk driver
# frd* at pxaip?
Index: src/sys/arch/evbmips/conf/ALCHEMY
diff -u src/sys/arch/evbmips/conf/ALCHEMY:1.59 src/sys/arch/evbmips/conf/ALCHEMY:1.60
--- src/sys/arch/evbmips/conf/ALCHEMY:1.59 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbmips/conf/ALCHEMY Tue Dec 13 15:42:17 2016
@@ -1,11 +1,11 @@
-# $NetBSD: ALCHEMY,v 1.59 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: ALCHEMY,v 1.60 2016/12/13 20:42:17 christos Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
# DBAu1000 and DBAu1500 evaluation boards.
include "arch/evbmips/conf/std.alchemy"
-#ident "ALCHEMY-$Revision: 1.59 $"
+#ident "ALCHEMY-$Revision: 1.60 $"
maxusers 32
@@ -224,7 +224,7 @@ ugen* at uhub? port ?
auaudio* at aubus? addr ? # STAC9745 audio codec
audio* at auaudio?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# GPIOs
augpio* at aubus? addr ?
Index: src/sys/arch/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.28 src/sys/arch/evbmips/conf/LOONGSON:1.29
--- src/sys/arch/evbmips/conf/LOONGSON:1.28 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbmips/conf/LOONGSON Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.28 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: LOONGSON,v 1.29 2016/12/13 20:42:17 christos Exp $
#
# LOONGSON machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbmips/conf/std.loongson
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "LOONGSON-$Revision: 1.28 $"
+#ident "LOONGSON-$Revision: 1.29 $"
maxusers 16
@@ -209,7 +209,7 @@ com1 at isa? port 0x3f8 irq 4 # Fuloong
gcscaudio* at pci?
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
Index: src/sys/arch/evbmips/conf/MALTA
diff -u src/sys/arch/evbmips/conf/MALTA:1.84 src/sys/arch/evbmips/conf/MALTA:1.85
--- src/sys/arch/evbmips/conf/MALTA:1.84 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbmips/conf/MALTA Tue Dec 13 15:42:17 2016
@@ -1,10 +1,10 @@
-# $NetBSD: MALTA,v 1.84 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: MALTA,v 1.85 2016/12/13 20:42:17 christos Exp $
include "arch/evbmips/conf/std.malta"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MALTA-$Revision: 1.84 $"
+#ident "MALTA-$Revision: 1.85 $"
maxusers 32
@@ -296,7 +296,7 @@ clct* at pci? dev ? function ? # Cirrus
# Audio support
audio* at clct?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Pseudo-devices
Index: src/sys/arch/evbppc/conf/EV64260
diff -u src/sys/arch/evbppc/conf/EV64260:1.66 src/sys/arch/evbppc/conf/EV64260:1.67
--- src/sys/arch/evbppc/conf/EV64260:1.66 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbppc/conf/EV64260 Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: EV64260,v 1.66 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: EV64260,v 1.67 2016/12/13 20:42:17 christos Exp $
#
# MVP -- Motorola's Multiprocessing Verification Platform
#
@@ -237,7 +237,7 @@ cd* at scsibus? target ? lun ?
#auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
#audio* at auvia?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
acardide* at pci? dev ? function ? # Acard IDE controllers
Index: src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.21 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.22
--- src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.21 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS266_OPT,v 1.21 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: OPENBLOCKS266_OPT,v 1.22 2016/12/13 20:42:17 christos Exp $
#
include "arch/evbppc/conf/OPENBLOCKS266"
@@ -193,7 +193,7 @@ wd* at umass?
uaudio* at uhub? port ? configuration ?
audio* at uaudio?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# USB MIDI
umidi* at uhub? port ? configuration ?
Index: src/sys/arch/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.38 src/sys/arch/evbppc/conf/PMPPC:1.39
--- src/sys/arch/evbppc/conf/PMPPC:1.38 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/evbppc/conf/PMPPC Tue Dec 13 15:42:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: PMPPC,v 1.38 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: PMPPC,v 1.39 2016/12/13 20:42:17 christos Exp $
#
# PMPPC
#
@@ -432,7 +432,7 @@ radio* at radiodev?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
pseudo-device vnd # disk-like interface to files
#pseudo-device fss # file system snapshot device
Index: src/sys/arch/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.193 src/sys/arch/hp300/conf/GENERIC:1.194
--- src/sys/arch/hp300/conf/GENERIC:1.193 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/hp300/conf/GENERIC Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.193 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: GENERIC,v 1.194 2016/12/13 20:42:18 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.193 $"
+#ident "GENERIC-$Revision: 1.194 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -285,7 +285,7 @@ uk* at scsibus? target ? lun ? # unknow
arcofi* at dio? scode ?
audio* at arcofi?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
#
# Pseudo-devices
Index: src/sys/arch/hpcarm/conf/NETBOOKPRO
diff -u src/sys/arch/hpcarm/conf/NETBOOKPRO:1.19 src/sys/arch/hpcarm/conf/NETBOOKPRO:1.20
--- src/sys/arch/hpcarm/conf/NETBOOKPRO:1.19 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/hpcarm/conf/NETBOOKPRO Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: NETBOOKPRO,v 1.19 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: NETBOOKPRO,v 1.20 2016/12/13 20:42:18 christos Exp $
#
# NETBOOKPRO -- Psion Teklogix NETBOOK PRO
#
@@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.netbookp
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.19 $"
+#ident "GENERIC-$Revision: 1.20 $"
# estimated number of users
maxusers 32
@@ -185,7 +185,7 @@ pxaacu0 at pxaip? addr 0x40500000 intr 1
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Inter-Integrated Circuit controller
nbpiic0 at pxaip? addr 0x40300000 intr 18
Index: src/sys/arch/hpcarm/conf/WZERO3
diff -u src/sys/arch/hpcarm/conf/WZERO3:1.41 src/sys/arch/hpcarm/conf/WZERO3:1.42
--- src/sys/arch/hpcarm/conf/WZERO3:1.41 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/hpcarm/conf/WZERO3 Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: WZERO3,v 1.41 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: WZERO3,v 1.42 2016/12/13 20:42:18 christos Exp $
#
# WZERO3 -- Sharp Windows Mobile 5 based PDA
#
@@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.wzero3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.41 $"
+#ident "GENERIC-$Revision: 1.42 $"
# estimated number of users
maxusers 32
@@ -237,7 +237,7 @@ wd* at umass?
uaudio* at uhub? port ? configuration ?
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
Index: src/sys/arch/hpcmips/conf/GENERIC
diff -u src/sys/arch/hpcmips/conf/GENERIC:1.232 src/sys/arch/hpcmips/conf/GENERIC:1.233
--- src/sys/arch/hpcmips/conf/GENERIC:1.232 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/hpcmips/conf/GENERIC Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.232 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: GENERIC,v 1.233 2016/12/13 20:42:18 christos Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips.
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.232 $"
+#ident "GENERIC-$Revision: 1.233 $"
maxusers 16
@@ -655,7 +655,7 @@ ugen* at uhub? port ?
audio* at uaudio?
midi* at midibus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Pseudo-Devices
Index: src/sys/arch/hpcmips/conf/TX3922
diff -u src/sys/arch/hpcmips/conf/TX3922:1.104 src/sys/arch/hpcmips/conf/TX3922:1.105
--- src/sys/arch/hpcmips/conf/TX3922:1.104 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/hpcmips/conf/TX3922 Tue Dec 13 15:42:18 2016
@@ -1,7 +1,7 @@
#
# Distribution kernel (TOSHIBA TX3922 based model) kernel config file
#
-# $NetBSD: TX3922,v 1.104 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: TX3922,v 1.105 2016/12/13 20:42:18 christos Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@@ -225,7 +225,7 @@ scsibus* at umass? channel ?
uaudio* at uhub? port ? configuration ?
audio* at uaudio?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
Index: src/sys/arch/hpcmips/conf/VR41XX
diff -u src/sys/arch/hpcmips/conf/VR41XX:1.67 src/sys/arch/hpcmips/conf/VR41XX:1.68
--- src/sys/arch/hpcmips/conf/VR41XX:1.67 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/hpcmips/conf/VR41XX Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: VR41XX,v 1.67 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: VR41XX,v 1.68 2016/12/13 20:42:18 christos Exp $
#
# GENERIC machine description file
#
@@ -20,7 +20,7 @@
include "arch/hpcmips/conf/std.hpcmips"
include "arch/hpcmips/conf/std.hpcmips.vr41"
-#ident "GENERIC-$Revision: 1.67 $"
+#ident "GENERIC-$Revision: 1.68 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -515,7 +515,7 @@ ugen* at uhub? port ?
audio* at uaudio?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
pseudo-device loop # network loopback
pseudo-device ppp # serial-line IP ports
Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.10 src/sys/arch/hppa/conf/GENERIC:1.11
--- src/sys/arch/hppa/conf/GENERIC:1.10 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/hppa/conf/GENERIC Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.10 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: GENERIC,v 1.11 2016/12/13 20:42:18 christos Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hppa/conf/std.hppa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.10 $"
+#ident "GENERIC-$Revision: 1.11 $"
maxusers 32 # estimated number of users
@@ -548,7 +548,7 @@ harmony* at gsc? # Audio Type 2 (CS421
#com* at harmony? # Telephone add-in card
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# USB Controller and Devices
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.406 src/sys/arch/i386/conf/ALL:1.407
--- src/sys/arch/i386/conf/ALL:1.406 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/i386/conf/ALL Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.406 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: ALL,v 1.407 2016/12/13 20:42:18 christos Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.406 $"
+#ident "ALL-$Revision: 1.407 $"
maxusers 64 # estimated number of users
@@ -1543,9 +1543,8 @@ midi* at midibus?
midi* at pcppi? # MIDI interface to the PC speaker
# The spkr driver provides a simple tone interface to the built in speaker.
-spkr0 at pcppi? # PC speaker
-
-#spkr0 at audio0 # PC speaker (synthesized)
+spkr* at pcppi? # PC speaker
+spkr* at audio? # PC speaker (synthesized)
# FM-Radio devices
# ISA radio devices
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1144 src/sys/arch/i386/conf/GENERIC:1.1145
--- src/sys/arch/i386/conf/GENERIC:1.1144 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/i386/conf/GENERIC Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1144 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: GENERIC,v 1.1145 2016/12/13 20:42:18 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1144 $"
+#ident "GENERIC-$Revision: 1.1145 $"
maxusers 64 # estimated number of users
@@ -1466,9 +1466,8 @@ midi* at midibus?
midi* at pcppi? # MIDI interface to the PC speaker
# The spkr driver provides a simple tone interface to the built in speaker.
-#spkr0 at pcppi? # PC speaker
-
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at pcppi? # PC speaker
+#spkr* at audio? # PC speaker (synthesized)
# FM-Radio devices
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.145 src/sys/arch/i386/conf/GENERIC_TINY:1.146
--- src/sys/arch/i386/conf/GENERIC_TINY:1.145 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/i386/conf/GENERIC_TINY Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.145 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: GENERIC_TINY,v 1.146 2016/12/13 20:42:18 christos Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -508,9 +508,8 @@ we1 at isa? port 0x300 iomem 0xcc000 irq
#audio* at audiobus?
# The spkr driver provides a simple tone interface to the built in speaker.
-#spkr0 at pcppi? # PC speaker
-
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at pcppi? # PC speaker
+#spkr* at audio? # PC speaker (synthesized)
# Joysticks
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.33 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.34
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.33 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.33 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.34 2016/12/13 20:42:18 christos Exp $
#
# INSTALL - Installation kernel.
#
@@ -710,9 +710,8 @@ url* at uhub? port ? # Realtek RTL8150L
#midi* at pcppi? # MIDI interface to the PC speaker
# The spkr driver provides a simple tone interface to the built in speaker.
-#spkr0 at pcppi? # PC speaker
-
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at pcppi? # PC speaker
+#spkr* at audio? # PC speaker (synthesized)
# Mice
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.147 src/sys/arch/i386/conf/INSTALL_TINY:1.148
--- src/sys/arch/i386/conf/INSTALL_TINY:1.147 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/i386/conf/INSTALL_TINY Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.147 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: INSTALL_TINY,v 1.148 2016/12/13 20:42:18 christos Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -468,9 +468,8 @@ we1 at isa? port 0x300 iomem 0xcc000 irq
#audio* at audiobus?
# The spkr driver provides a simple tone interface to the built in speaker.
-#spkr0 at pcppi? # PC speaker
-
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at pcppi? # PC speaker
+#spkr* at audio? # PC speaker (synthesized)
# Joysticks
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.101 src/sys/arch/i386/conf/XEN3_DOM0:1.102
--- src/sys/arch/i386/conf/XEN3_DOM0:1.101 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/i386/conf/XEN3_DOM0 Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.101 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.102 2016/12/13 20:42:18 christos Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -719,7 +719,7 @@ hdafg* at hdaudiobus?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# MPU 401 UARTs
#mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
Index: src/sys/arch/ibmnws/conf/GENERIC
diff -u src/sys/arch/ibmnws/conf/GENERIC:1.48 src/sys/arch/ibmnws/conf/GENERIC:1.49
--- src/sys/arch/ibmnws/conf/GENERIC:1.48 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/ibmnws/conf/GENERIC Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.48 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: GENERIC,v 1.49 2016/12/13 20:42:18 christos Exp $
#
#
@@ -274,7 +274,7 @@ icsphy* at mii? phy ?
paud0 at isa? port 0x830 irq 10 drq 0 drq2 1
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Pseudo-Devices
Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.92 src/sys/arch/iyonix/conf/GENERIC:1.93
--- src/sys/arch/iyonix/conf/GENERIC:1.92 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/iyonix/conf/GENERIC Tue Dec 13 15:42:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.92 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: GENERIC,v 1.93 2016/12/13 20:42:18 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/iyonix/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.92 $"
+#ident "GENERIC-$Revision: 1.93 $"
maxusers 32 # estimated number of users
@@ -700,7 +700,7 @@ opl* at yds?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# MPU 401 UARTs
mpu* at cmpci?
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.52 src/sys/arch/landisk/conf/GENERIC:1.53
--- src/sys/arch/landisk/conf/GENERIC:1.52 Sat Dec 10 18:03:24 2016
+++ src/sys/arch/landisk/conf/GENERIC Tue Dec 13 15:42:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.52 2016/12/10 23:03:24 christos Exp $
+# $NetBSD: GENERIC,v 1.53 2016/12/13 20:42:19 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.52 $"
+#ident "GENERIC-$Revision: 1.53 $"
maxusers 16 # estimated number of users
@@ -395,7 +395,7 @@ ugen* at uhub? port ?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# MIDI support
midi* at midibus?
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.325 src/sys/arch/macppc/conf/GENERIC:1.326
--- src/sys/arch/macppc/conf/GENERIC:1.325 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/macppc/conf/GENERIC Tue Dec 13 15:42:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.325 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC,v 1.326 2016/12/13 20:42:19 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.325 $"
+#ident "GENERIC-$Revision: 1.326 $"
maxusers 32
@@ -566,7 +566,7 @@ eap* at pci? dev ? function ? # Ensoniq
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# MPU 401 UARTs
#mpu* at cmpci?
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.10 src/sys/arch/macppc/conf/GENERIC_601:1.11
--- src/sys/arch/macppc/conf/GENERIC_601:1.10 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/macppc/conf/GENERIC_601 Tue Dec 13 15:42:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.10 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC_601,v 1.11 2016/12/13 20:42:19 christos Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.10 $"
+ident "GENERIC-$Revision: 1.11 $"
maxusers 32
@@ -312,7 +312,7 @@ ugen* at uhub? port ? configuration ? in
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
#
# accept filters
Index: src/sys/arch/mmeye/conf/MMEYE_WLF
diff -u src/sys/arch/mmeye/conf/MMEYE_WLF:1.19 src/sys/arch/mmeye/conf/MMEYE_WLF:1.20
--- src/sys/arch/mmeye/conf/MMEYE_WLF:1.19 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/mmeye/conf/MMEYE_WLF Tue Dec 13 15:42:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE_WLF,v 1.19 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: MMEYE_WLF,v 1.20 2016/12/13 20:42:19 christos Exp $
#
# MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel
#
@@ -22,7 +22,7 @@ include "arch/mmeye/conf/std.mmeye"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.19 $"
+#ident "GENERIC-$Revision: 1.20 $"
maxusers 16 # estimated number of users
@@ -174,7 +174,7 @@ rs5c372rtc* at iic? addr 0x32
#ac97x at mainbus? addr1 0xb3000000-0xb300000f irq1 1 # AD1881A
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# SH4 Area5/6 PCMCIA space devices
ne0 at mainbus? addr1 0x14000000 irq1 13
Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.129 src/sys/arch/netwinder/conf/GENERIC:1.130
--- src/sys/arch/netwinder/conf/GENERIC:1.129 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/netwinder/conf/GENERIC Tue Dec 13 15:42:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.129 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC,v 1.130 2016/12/13 20:42:19 christos Exp $
#
# GENERIC machine description file
#
@@ -274,7 +274,7 @@ midi* at sb? # SB1 MIDI port
# Audio support
audio* at sb?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Pseudo-Devices
Index: src/sys/arch/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.160 src/sys/arch/ofppc/conf/GENERIC:1.161
--- src/sys/arch/ofppc/conf/GENERIC:1.160 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/ofppc/conf/GENERIC Tue Dec 13 15:42:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.160 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC,v 1.161 2016/12/13 20:42:19 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.160 $"
+#ident "GENERIC-$Revision: 1.161 $"
maxusers 32
@@ -405,7 +405,7 @@ auvia* at pci? dev ? function ? # VIA V
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
#
Index: src/sys/arch/playstation2/conf/DEBUG
diff -u src/sys/arch/playstation2/conf/DEBUG:1.22 src/sys/arch/playstation2/conf/DEBUG:1.23
--- src/sys/arch/playstation2/conf/DEBUG:1.22 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/playstation2/conf/DEBUG Tue Dec 13 15:42:19 2016
@@ -1,7 +1,7 @@
#
# kernel config file for debugging.
#
-# $NetBSD: DEBUG,v 1.22 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: DEBUG,v 1.23 2016/12/13 20:42:19 christos Exp $
#
include "arch/playstation2/conf/std.playstation2"
@@ -112,6 +112,6 @@ uyap* at uhub? port ?
audio* at uaudio?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
pseudo-device ppp # Point-to-Point Protocol
Index: src/sys/arch/pmax/conf/GENERIC
diff -u src/sys/arch/pmax/conf/GENERIC:1.189 src/sys/arch/pmax/conf/GENERIC:1.190
--- src/sys/arch/pmax/conf/GENERIC:1.189 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/pmax/conf/GENERIC Tue Dec 13 15:42:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.189 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC,v 1.190 2016/12/13 20:42:19 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.189 $"
+#ident "GENERIC-$Revision: 1.190 $"
maxusers 64
@@ -205,7 +205,7 @@ vsms* at zsc0 channel ? # mouse port on
audio* at bba?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
dtkbd* at dt? addr ?
dtms* at dt? addr ?
Index: src/sys/arch/pmax/conf/GENERIC64
diff -u src/sys/arch/pmax/conf/GENERIC64:1.23 src/sys/arch/pmax/conf/GENERIC64:1.24
--- src/sys/arch/pmax/conf/GENERIC64:1.23 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/pmax/conf/GENERIC64 Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.23 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC64,v 1.24 2016/12/13 20:42:20 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.23 $"
+#ident "GENERIC-$Revision: 1.24 $"
maxusers 64
@@ -204,7 +204,7 @@ vsms* at zsc0 channel ? # mouse port on
audio* at bba?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
dtkbd* at dt? addr ?
dtms* at dt? addr ?
Index: src/sys/arch/pmax/conf/INSTALL
diff -u src/sys/arch/pmax/conf/INSTALL:1.73 src/sys/arch/pmax/conf/INSTALL:1.74
--- src/sys/arch/pmax/conf/INSTALL:1.73 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/pmax/conf/INSTALL Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.73 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: INSTALL,v 1.74 2016/12/13 20:42:20 christos Exp $
#
# Distribution install kernel (any model)
# netbsd: cut-down kernel for miniroots.
@@ -113,7 +113,7 @@ lkkbd* at zsc1 channel ? # keyboard por
#audio* at bba?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
dtkbd* at dt? addr ?
#dtms* at dt? addr ?
Index: src/sys/arch/pmax/conf/INSTALL64
diff -u src/sys/arch/pmax/conf/INSTALL64:1.10 src/sys/arch/pmax/conf/INSTALL64:1.11
--- src/sys/arch/pmax/conf/INSTALL64:1.10 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/pmax/conf/INSTALL64 Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL64,v 1.10 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: INSTALL64,v 1.11 2016/12/13 20:42:20 christos Exp $
#
# Distribution install kernel (any model)
# netbsd: cut-down kernel for miniroots.
@@ -106,7 +106,7 @@ lkkbd* at zsc1 channel ? # keyboard por
#audio* at bba?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
dtkbd* at dt? addr ?
#dtms* at dt? addr ?
Index: src/sys/arch/prep/conf/GENERIC
diff -u src/sys/arch/prep/conf/GENERIC:1.179 src/sys/arch/prep/conf/GENERIC:1.180
--- src/sys/arch/prep/conf/GENERIC:1.179 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/prep/conf/GENERIC Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.179 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC,v 1.180 2016/12/13 20:42:20 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.179 $"
+#ident "GENERIC-$Revision: 1.180 $"
maxusers 32
@@ -506,9 +506,8 @@ ukphy* at mii? phy ? # generic unknown
#midi* at pcppi? # MIDI interface to the PC speaker
# The spkr driver provides a simple tone interface to the built in speaker.
-#spkr0 at pcppi? # PC speaker
-
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at pcppi? # PC speaker
+#spkr* at audio? # PC speaker (synthesized)
# Joysticks
Index: src/sys/arch/sandpoint/conf/ENCPP1
diff -u src/sys/arch/sandpoint/conf/ENCPP1:1.14 src/sys/arch/sandpoint/conf/ENCPP1:1.15
--- src/sys/arch/sandpoint/conf/ENCPP1:1.14 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/sandpoint/conf/ENCPP1 Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ENCPP1,v 1.14 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: ENCPP1,v 1.15 2016/12/13 20:42:20 christos Exp $
#
# Ampro EnCorePP1 machine description file
#
@@ -23,7 +23,7 @@ options PIC_I8259
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ENCPP1-$Revision: 1.14 $"
+#ident "ENCPP1-$Revision: 1.15 $"
maxusers 32
@@ -176,7 +176,7 @@ auvia* at pci? dev ? function ? # VIA in
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
pckbc0 at isa? # PS/2 keyboard controller
pckbd* at pckbc? # PC keyboard
Index: src/sys/arch/sgimips/conf/GENERIC32_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.107 src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.108
--- src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.107 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/sgimips/conf/GENERIC32_IP2x Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP2x,v 1.107 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC32_IP2x,v 1.108 2016/12/13 20:42:20 christos Exp $
#
# GENERIC32_IP2x machine description file
#
@@ -29,7 +29,7 @@ makeoptions TEXTADDR=0x88069000 # entry
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.107 $"
+#ident "GENERIC32-IP2x-$Revision: 1.108 $"
maxusers 32
@@ -280,7 +280,7 @@ zsms0 at zsc1 channel 1
scsibus* at scsi? # HPC SCSI
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Pseudo-Devices
Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.110 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.111
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.110 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.110 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.111 2016/12/13 20:42:20 christos Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entr
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.110 $"
+#ident "GENERIC32_IP3x-$Revision: 1.111 $"
maxusers 32
@@ -415,7 +415,7 @@ sbp* at ieee1394if? euihi ? euilo ?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# MIDI support
midi* at midibus?
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.125 src/sys/arch/shark/conf/GENERIC:1.126
--- src/sys/arch/shark/conf/GENERIC:1.125 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/shark/conf/GENERIC Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.125 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC,v 1.126 2016/12/13 20:42:20 christos Exp $
#
# Generic Shark configuration.
#
@@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.125 $"
+#ident "GENERIC-$Revision: 1.126 $"
# estimated number of users
maxusers 32
@@ -271,7 +271,7 @@ audio* at ess?
opl* at ess?
midi* at opl?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Joystick @OFW
joy* at ofisa?
Index: src/sys/arch/shark/conf/INSTALL
diff -u src/sys/arch/shark/conf/INSTALL:1.60 src/sys/arch/shark/conf/INSTALL:1.61
--- src/sys/arch/shark/conf/INSTALL:1.60 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/shark/conf/INSTALL Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.60 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: INSTALL,v 1.61 2016/12/13 20:42:20 christos Exp $
#
# Shark installation kernel
#
@@ -235,7 +235,7 @@ scr* at ofisascr?
#opl* at ess?
#midi* at opl?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
# Joystick @OFW
#joy* at ofisa?
Index: src/sys/arch/sparc/conf/INSTALL
diff -u src/sys/arch/sparc/conf/INSTALL:1.94 src/sys/arch/sparc/conf/INSTALL:1.95
--- src/sys/arch/sparc/conf/INSTALL:1.94 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/sparc/conf/INSTALL Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.94 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: INSTALL,v 1.95 2016/12/13 20:42:20 christos Exp $
#
# from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
#
@@ -508,7 +508,7 @@ pseudo-device loop
#audiocs0 at sbus0 slot ? offset ? # SUNW,CS4231
#audio* at audiocs0
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
## Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.71 src/sys/arch/sparc/conf/KRUPS:1.72
--- src/sys/arch/sparc/conf/KRUPS:1.71 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/sparc/conf/KRUPS Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.71 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: KRUPS,v 1.72 2016/12/13 20:42:20 christos Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "KRUPS-$Revision: 1.71 $"
+#ident "KRUPS-$Revision: 1.72 $"
maxusers 32
@@ -323,7 +323,7 @@ pseudo-device bpfilter
audiocs* at ebus? # SUNW,CS4231
audio* at audiocs?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# wscons
pckbc* at ebus? # PC keyboard controller
Index: src/sys/arch/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.50 src/sys/arch/sparc/conf/MRCOFFEE:1.51
--- src/sys/arch/sparc/conf/MRCOFFEE:1.50 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/sparc/conf/MRCOFFEE Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.50 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: MRCOFFEE,v 1.51 2016/12/13 20:42:20 christos Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MRCOFFEE-$Revision: 1.50 $"
+#ident "MRCOFFEE-$Revision: 1.51 $"
maxusers 32
@@ -315,7 +315,7 @@ pseudo-device bpfilter
audiocs0 at sbus0 slot ? offset ? # SUNW,CS4231
audio0 at audiocs0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
## Sun "tcx" accelerated color framebuffer.
tcx0 at sbus? slot ? offset ?
Index: src/sys/arch/sparc/conf/TADPOLE3GX
diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.69 src/sys/arch/sparc/conf/TADPOLE3GX:1.70
--- src/sys/arch/sparc/conf/TADPOLE3GX:1.69 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/sparc/conf/TADPOLE3GX Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: TADPOLE3GX,v 1.69 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: TADPOLE3GX,v 1.70 2016/12/13 20:42:20 christos Exp $
include "arch/sparc/conf/std.sparc"
@@ -345,7 +345,7 @@ options DBRI_BIG_BUFFER # use bigger DM
dbri0 at sbus0 slot ? offset ? # SUNW,DBRI[s3|e]
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# Tadpole 3GX/3GS (P9100 -- P Nine One Zero Zero -> pnozz)
pnozz0 at sbus? slot ? offset ?
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.195 src/sys/arch/sparc64/conf/GENERIC:1.196
--- src/sys/arch/sparc64/conf/GENERIC:1.195 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/sparc64/conf/GENERIC Tue Dec 13 15:42:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.195 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: GENERIC,v 1.196 2016/12/13 20:42:20 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.195 $"
+#ident "GENERIC-$Revision: 1.196 $"
maxusers 64
@@ -883,7 +883,7 @@ auacer* at pci? dev ? function ? # Ultr
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
midi* at midibus?
Index: src/sys/arch/sparc64/conf/NONPLUS64
diff -u src/sys/arch/sparc64/conf/NONPLUS64:1.49 src/sys/arch/sparc64/conf/NONPLUS64:1.50
--- src/sys/arch/sparc64/conf/NONPLUS64:1.49 Sat Dec 10 18:03:25 2016
+++ src/sys/arch/sparc64/conf/NONPLUS64 Tue Dec 13 15:42:20 2016
@@ -1,8 +1,8 @@
-# $NetBSD: NONPLUS64,v 1.49 2016/12/10 23:03:25 christos Exp $
+# $NetBSD: NONPLUS64,v 1.50 2016/12/13 20:42:20 christos Exp $
include "arch/sparc64/conf/std.sparc64"
-#ident "NONPLUS64-$Revision: 1.49 $"
+#ident "NONPLUS64-$Revision: 1.50 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -365,7 +365,7 @@ pseudo-device ipfilter
audiocs0 at sbus0 slot ? offset ? # SUNW,CS4231
audio* at audiocs0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
## Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
Index: src/sys/arch/usermode/conf/GENERIC.common
diff -u src/sys/arch/usermode/conf/GENERIC.common:1.23 src/sys/arch/usermode/conf/GENERIC.common:1.24
--- src/sys/arch/usermode/conf/GENERIC.common:1.23 Sat Dec 10 18:03:26 2016
+++ src/sys/arch/usermode/conf/GENERIC.common Tue Dec 13 15:42:21 2016
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC.common,v 1.23 2016/12/10 23:03:26 christos Exp $
+# $NetBSD: GENERIC.common,v 1.24 2016/12/13 20:42:21 christos Exp $
include "arch/usermode/conf/std.usermode"
options INCLUDE_CONFIG_FILE
-#ident "GENERIC-$Revision: 1.23 $"
+#ident "GENERIC-$Revision: 1.24 $"
maxusers 32
makeoptions DEBUG="-O1 -g3"
@@ -65,7 +65,7 @@ veth0 at mainbus?
vaudio0 at mainbus?
audio0 at vaudio0
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
vncfb0 at mainbus?
wsdisplay0 at vncfb?
Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.198 src/sys/arch/vax/conf/GENERIC:1.199
--- src/sys/arch/vax/conf/GENERIC:1.198 Sat Dec 10 18:03:26 2016
+++ src/sys/arch/vax/conf/GENERIC Tue Dec 13 15:42:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.198 2016/12/10 23:03:26 christos Exp $
+# $NetBSD: GENERIC,v 1.199 2016/12/13 20:42:21 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.198 $"
+#ident "GENERIC-$Revision: 1.199 $"
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -209,7 +209,7 @@ vsaudio0 at vsbus0 csr 0x200d0000 # VS40
vsaudio0 at vsbus0 csr 0x26800000 # VS4000/90 audio
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
tc0 at vsbus0 csr 0x36000000 # VS4000/60 or 90 TC adapter
tcds* at tc0 slot ? offset ? # TC dual SCSI controller
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.182 src/sys/arch/x68k/conf/GENERIC:1.183
--- src/sys/arch/x68k/conf/GENERIC:1.182 Sat Dec 10 18:03:26 2016
+++ src/sys/arch/x68k/conf/GENERIC Tue Dec 13 15:42:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.182 2016/12/10 23:03:26 christos Exp $
+# $NetBSD: GENERIC,v 1.183 2016/12/13 20:42:21 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.182 $"
+#ident "GENERIC-$Revision: 1.183 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -293,7 +293,7 @@ com1 at intio0 addr 0xefff10 intr 241 #
vs0 at intio0 addr 0xe92000 dma 3 dmaintr 106
audio* at vs?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
## Network interfaces
ne* at intio0 addr 0xece300 intr 249 # Nereid Ethernet
Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.111 src/sys/arch/x68k/conf/INSTALL:1.112
--- src/sys/arch/x68k/conf/INSTALL:1.111 Sat Dec 10 18:03:26 2016
+++ src/sys/arch/x68k/conf/INSTALL Tue Dec 13 15:42:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.111 2016/12/10 23:03:26 christos Exp $
+# $NetBSD: INSTALL,v 1.112 2016/12/13 20:42:21 christos Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.111 $"
+#ident "INSTALL-$Revision: 1.112 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@@ -255,7 +255,7 @@ sram0 at intio0 addr 0xed0000 # battery
#vs0 at intio0 addr 0xe92000 dma 3 dmaintr 106
#audio* at vs?
-#spkr0 at audio0 # PC speaker (synthesized)
+#spkr* at audio? # PC speaker (synthesized)
## Network interfaces
ne* at intio0 addr 0xece300 intr 249 # Nereid Ethernet
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.69 src/sys/arch/zaurus/conf/GENERIC:1.70
--- src/sys/arch/zaurus/conf/GENERIC:1.69 Sat Dec 10 18:03:26 2016
+++ src/sys/arch/zaurus/conf/GENERIC Tue Dec 13 15:42:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.69 2016/12/10 23:03:26 christos Exp $
+# $NetBSD: GENERIC,v 1.70 2016/12/13 20:42:21 christos Exp $
#
# GENERIC machine description file
#
@@ -241,7 +241,7 @@ audio* at zaudio?
# Audio support
audio* at audiobus?
-spkr0 at audio0 # PC speaker (synthesized)
+spkr* at audio? # PC speaker (synthesized)
# integrated 16550 UARTs
options COM_PXA2X0
Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.29 src/sys/arch/zaurus/conf/INSTALL:1.30
--- src/sys/arch/zaurus/conf/INSTALL:1.29 Thu Dec 8 06:31:13 2016
+++ src/sys/arch/zaurus/conf/INSTALL Tue Dec 13 15:42:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.29 2016/12/08 11:31:13 nat Exp $
+# $NetBSD: INSTALL,v 1.30 2016/12/13 20:42:21 christos Exp $
#
# INSTALL config file (GENERIC with memory disk root)
#
@@ -76,7 +76,7 @@ no wsmouse* at ztp?
no zaudio0 at iic?
no audio* at zaudio?
-no spkr0 at audio0
+no spkr* at audio?
no ums* at uhidev?
no wsmouse* at ums?
