speaker(4) is a whimsical thing, but I don't think we should have a
dedicated chiptune interpreter in the kernel.
This patch unhooks the driver and the manpage from the build. The
driver is built for alpha, amd64, and i386.
A subsequent patch will move all relevant files to the attic and clean
up manpage cross references.
Nothing in base or xenocara includes <dev/spkrio.h>.
I see a couple SPKRTONE and SPKRTUNE symbols in ports, but I imagine
those ports don't use the symbols if they are missing.
ok?
Index: distrib/sets/lists/comp/mi
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.1597
diff -u -p -r1.1597 mi
--- distrib/sets/lists/comp/mi 20 Mar 2022 10:54:43 -0000 1.1597
+++ distrib/sets/lists/comp/mi 28 Apr 2022 11:29:15 -0000
@@ -439,7 +439,6 @@
./usr/include/dev/isa/sbdspvar.h
./usr/include/dev/isa/sbreg.h
./usr/include/dev/isa/sbvar.h
-./usr/include/dev/isa/spkrio.h
./usr/include/dev/isa/vga_isavar.h
./usr/include/dev/isa/viasioreg.h
./usr/include/dev/isa/wbsioreg.h
Index: distrib/sets/lists/man/mi
===================================================================
RCS file: /cvs/src/distrib/sets/lists/man/mi,v
retrieving revision 1.1664
diff -u -p -r1.1664 mi
--- distrib/sets/lists/man/mi 20 Apr 2022 01:39:49 -0000 1.1664
+++ distrib/sets/lists/man/mi 28 Apr 2022 11:29:15 -0000
@@ -1956,7 +1956,6 @@
./usr/share/man/man4/sparc64/zs.4
./usr/share/man/man4/sparc64/zx.4
./usr/share/man/man4/spdmem.4
-./usr/share/man/man4/speaker.4
./usr/share/man/man4/sppp.4
./usr/share/man/man4/sqphy.4
./usr/share/man/man4/ssdfb.4
Index: etc/MAKEDEV.common
===================================================================
RCS file: /cvs/src/etc/MAKEDEV.common,v
retrieving revision 1.115
diff -u -p -r1.115 MAKEDEV.common
--- etc/MAKEDEV.common 7 Jan 2022 01:13:15 -0000 1.115
+++ etc/MAKEDEV.common 28 Apr 2022 11:29:15 -0000
@@ -148,7 +148,6 @@ target(all, joy, 0, 1)dnl
twrget(all, rnd, random)dnl
target(all, uk, 0)dnl
twrget(all, vi, video, 0, 1)dnl
-twrget(all, speak, speaker)dnl
target(all, asc, 0)dnl
target(all, radio, 0)dnl
target(all, tuner, 0)dnl
@@ -462,8 +461,6 @@ _mkdev(bpf, bpf, {-M bpf c major_bpf_c 0
M bpf0 c major_bpf_c 0 600-})dnl
_mkdev(tun, {-tun*-}, {-M tun$U c major_tun_c $U 600-}, 600)dnl
_mkdev(tap, {-tap*-}, {-M tap$U c major_tap_c $U 600-}, 600)dnl
-__devitem(speak, speaker, PC speaker,spkr)dnl
-_mkdev(speak, speaker, {-M speaker c major_speak_c 0 600-})dnl
__devitem(tun, tun*, Network tunnel driver)dnl
__devitem(tap, tap*, Ethernet tunnel driver)dnl
__devitem(rnd, *random, In-kernel random data source,random)dnl
Index: etc/etc.alpha/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.alpha/MAKEDEV.md,v
retrieving revision 1.78
diff -u -p -r1.78 MAKEDEV.md
--- etc/etc.alpha/MAKEDEV.md 11 Nov 2021 09:47:32 -0000 1.78
+++ etc/etc.alpha/MAKEDEV.md 28 Apr 2022 11:29:15 -0000
@@ -76,7 +76,6 @@ _DEV(pppac, 71)
_DEV(radio, 59)
_DEV(rnd, 34)
_DEV(rmidi, 41)
-_DEV(speak, 40)
_DEV(tun, 7)
_DEV(tap, 68)
_DEV(tuner, 58)
Index: etc/etc.amd64/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.amd64/MAKEDEV.md,v
retrieving revision 1.80
diff -u -p -r1.80 MAKEDEV.md
--- etc/etc.amd64/MAKEDEV.md 7 Jan 2022 01:13:15 -0000 1.80
+++ etc/etc.amd64/MAKEDEV.md 28 Apr 2022 11:29:15 -0000
@@ -88,7 +88,6 @@ _DEV(pppac, 99)
_DEV(radio, 76)
_DEV(rnd, 45)
_DEV(rmidi, 52)
-_DEV(speak, 27)
_DEV(tun, 40)
_DEV(tap, 93)
_DEV(tuner, 49)
Index: etc/etc.i386/MAKEDEV.md
===================================================================
RCS file: /cvs/src/etc/etc.i386/MAKEDEV.md,v
retrieving revision 1.95
diff -u -p -r1.95 MAKEDEV.md
--- etc/etc.i386/MAKEDEV.md 7 Jan 2022 01:13:15 -0000 1.95
+++ etc/etc.i386/MAKEDEV.md 28 Apr 2022 11:29:15 -0000
@@ -90,7 +90,6 @@ _DEV(pppac, 99)
_DEV(radio, 76)
_DEV(rnd, 45)
_DEV(rmidi, 52)
-_DEV(speak, 27)
_DEV(tun, 40)
_DEV(tap, 94)
_DEV(tuner, 49)
Index: share/man/man4/Makefile
===================================================================
RCS file: /cvs/src/share/man/man4/Makefile,v
retrieving revision 1.817
diff -u -p -r1.817 Makefile
--- share/man/man4/Makefile 18 Jan 2022 07:53:39 -0000 1.817
+++ share/man/man4/Makefile 28 Apr 2022 11:29:15 -0000
@@ -80,7 +80,7 @@ MAN= aac.4 abcrtc.4 abl.4 ac97.4 acphy.4
safte.4 sbus.4 schsio.4 scsi.4 sd.4 \
sdmmc.4 sdhc.4 se.4 ses.4 sf.4 sili.4 \
simpleamp.4 simpleaudio.4 simplefb.4 simplepanel.4 siop.4 sis.4 sk.4 \
- sm.4 smsc.4 softraid.4 spdmem.4 sdtemp.4 speaker.4 sppp.4 sqphy.4 \
+ sm.4 smsc.4 softraid.4 spdmem.4 sdtemp.4 sppp.4 sqphy.4 \
ssdfb.4 st.4 ste.4 stge.4 sti.4 stp.4 sv.4 sxiccmu.4 \
sxidog.4 sximmc.4 sxipio.4 sxipwm.4 sxirsb.4 sxirtc.4 sxisid.4 \
sxisyscon.4 sxitemp.4 sxitwi.4 sym.4 sypwr.4 syscon.4 \
Index: sys/arch/alpha/conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/arch/alpha/conf/GENERIC,v
retrieving revision 1.271
diff -u -p -r1.271 GENERIC
--- sys/arch/alpha/conf/GENERIC 2 Jan 2022 23:14:26 -0000 1.271
+++ sys/arch/alpha/conf/GENERIC 28 Apr 2022 11:29:15 -0000
@@ -322,7 +322,6 @@ isapnp0 at isa?
# ISA devices
mcclock* at isa? port 0x70
pcppi* at isa? # PC prog. periph. interface
-spkr0 at pcppi? # IBM BASIC emulation
pckbc* at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard (kbd port)
pms* at pckbc? # PS/2-style mouse (aux port)
Index: sys/arch/amd64/conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/arch/amd64/conf/GENERIC,v
retrieving revision 1.512
diff -u -p -r1.512 GENERIC
--- sys/arch/amd64/conf/GENERIC 8 Mar 2022 15:08:01 -0000 1.512
+++ sys/arch/amd64/conf/GENERIC 28 Apr 2022 11:29:15 -0000
@@ -645,8 +645,6 @@ midi* at eap?
midi* at envy?
midi* at mpu?
-spkr0 at pcppi? # PC speaker
-
# Audio Support
audio* at eap?
audio* at envy?
Index: sys/arch/i386/conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/arch/i386/conf/GENERIC,v
retrieving revision 1.862
diff -u -p -r1.862 GENERIC
--- sys/arch/i386/conf/GENERIC 26 Mar 2022 14:25:14 -0000 1.862
+++ sys/arch/i386/conf/GENERIC 28 Apr 2022 11:29:16 -0000
@@ -705,8 +705,6 @@ midi* at autri?
midi* at eap?
midi* at envy?
-spkr0 at pcppi? # PC speaker
-
# Audio Support
audio* at sb?
audio* at gus?
