Index: ObsoleteFiles.inc =================================================================== --- ObsoleteFiles.inc +++ ObsoleteFiles.inc @@ -52,6 +52,15 @@ # xargs -n1 | sort | uniq -d; # done +# 2022xxxx: ISA sound card drivers removed +OLD_FILES+=usr/share/man/man4/snd_ad1816.4 +OLD_FILES+=usr/share/man/man4/snd_ess.4 +OLD_FILES+=usr/share/man/man4/snd_gusc.4 +OLD_FILES+=usr/share/man/man4/snd_mss.4 +OLD_FILES+=usr/share/man/man4/snd_sb16.4 +OLD_FILES+=usr/share/man/man4/snd_sb8.4 +OLD_FILES+=usr/share/man/man4/snd_sbc.4 + # 20220318: snd_ds1 and snd_maestro drivers removed OLD_FILES+=usr/share/man/man4/snd_ds1.4.gz OLD_FILES+=usr/share/man/man4/snd_maestro.4.gz Index: share/man/man4/Makefile =================================================================== --- share/man/man4/Makefile +++ share/man/man4/Makefile @@ -499,7 +499,6 @@ smbus.4 \ smp.4 \ smsc.4 \ - snd_ad1816.4 \ snd_als4000.4 \ snd_atiixp.4 \ snd_cmi.4 \ @@ -510,16 +509,12 @@ snd_envy24.4 \ snd_envy24ht.4 \ snd_es137x.4 \ - snd_ess.4 \ snd_fm801.4 \ - snd_gusc.4 \ snd_hda.4 \ snd_hdspe.4 \ snd_ich.4 \ snd_maestro3.4 \ - snd_mss.4 \ snd_neomagic.4 \ - snd_sbc.4 \ snd_solo.4 \ snd_spicds.4 \ snd_t4dwave.4 \ @@ -739,8 +734,6 @@ MLINKS+=smp.4 SMP.4 MLINKS+=smsc.4 if_smsc.4 MLINKS+=snd_envy24.4 snd_ak452x.4 -MLINKS+=snd_sbc.4 snd_sb16.4 \ - snd_sbc.4 snd_sb8.4 MLINKS+=${_spkr.4} ${_speaker.4} MLINKS+=splash.4 screensaver.4 MLINKS+=ste.4 if_ste.4 Index: share/man/man4/pcm.4 =================================================================== --- share/man/man4/pcm.4 +++ share/man/man4/pcm.4 @@ -75,8 +75,6 @@ .Pp .Bl -bullet -compact .It -.Xr snd_ad1816 4 -.It .Xr snd_ai2s 4 (enabled by default on powerpc) .It .Xr snd_als4000 4 @@ -101,12 +99,8 @@ .It .Xr snd_es137x 4 (enabled by default on amd64, i386) .It -.Xr snd_ess 4 -.It .Xr snd_fm801 4 .It -.Xr snd_gusc 4 -.It .Xr snd_hda 4 (enabled by default on amd64, i386) .It .Xr snd_hdspe 4 @@ -115,16 +109,8 @@ .It .Xr snd_maestro3 4 .It -.Xr snd_mss 4 -.It .Xr snd_neomagic 4 .It -snd_sb16 -.It -snd_sb8 -.It -.Xr snd_sbc 4 -.It .Xr snd_solo 4 .It .Xr snd_spicds 4 @@ -698,7 +684,6 @@ A device node is not created properly. .El .Sh SEE ALSO -.Xr snd_ad1816 4 , .Xr snd_ai2s 4 , .Xr snd_als4000 4 , .Xr snd_atiixp 4 , @@ -711,16 +696,12 @@ .Xr snd_envy24 4 , .Xr snd_envy24ht 4 , .Xr snd_es137x 4 , -.Xr snd_ess 4 , .Xr snd_fm801 4 , -.Xr snd_gusc 4 , .Xr snd_hda 4 , .Xr snd_hdspe 4 , .Xr snd_ich 4 , .Xr snd_maestro3 4 , -.Xr snd_mss 4 , .Xr snd_neomagic 4 , -.Xr snd_sbc 4 , .Xr snd_solo 4 , .Xr snd_spicds 4 , .Xr snd_t4dwave 4 , Index: share/man/man4/snd_solo.4 =================================================================== --- share/man/man4/snd_solo.4 +++ share/man/man4/snd_solo.4 @@ -50,11 +50,6 @@ .It ESS Solo-1E (ES1946 Chipset) .El -.Pp -Note that older ESS ISA cards with ES18xx chipset are supported via -.Xr snd_ess 4 -and/or -.Xr snd_sbc 4 . .Sh SEE ALSO .Xr sound 4 .Sh HISTORY Index: sys/conf/NOTES =================================================================== --- sys/conf/NOTES +++ sys/conf/NOTES @@ -2034,7 +2034,6 @@ # zero if don't know what to put in (and you don't, # since this is unsupported at the moment...). # -# snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP. # snd_als4000: Avance Logic ALS4000 PCI. # snd_atiixp: ATI IXP 200/300/400 PCI. # snd_cmi: CMedia CMI8338/CMI8738 PCI. @@ -2046,10 +2045,7 @@ # snd_envy24: VIA Envy24 and compatible, needs snd_spicds. # snd_envy24ht: VIA Envy24HT and compatible, needs snd_spicds. # snd_es137x: Ensoniq AudioPCI ES137x PCI. -# snd_ess: Ensoniq ESS ISA PnP/non-PnP, to be used in -# conjunction with snd_sbc. # snd_fm801: Forte Media FM801 PCI. -# snd_gusc: Gravis UltraSound ISA PnP/non-PnP. # snd_hda: Intel High Definition Audio (Controller) and # compatible. # snd_hdspe: RME HDSPe AIO and RayDAT. @@ -2057,14 +2053,7 @@ # embedded in a chipset, for example nVidia # nForce controllers. # snd_maestro3: ESS Technology Maestro-3/Allegro PCI. -# snd_mss: Microsoft Sound System ISA PnP/non-PnP. # snd_neomagic: Neomagic 256 AV/ZX PCI. -# snd_sb16: Creative SoundBlaster16, to be used in -# conjunction with snd_sbc. -# snd_sb8: Creative SoundBlaster (pre-16), to be used in -# conjunction with snd_sbc. -# snd_sbc: Creative SoundBlaster ISA PnP/non-PnP. -# Supports ESS and Avance ISA chips as well. # snd_solo: ESS Solo-1x PCI. # snd_spicds: SPI codec driver, needed by Envy24/Envy24HT drivers. # snd_t4dwave: Trident 4DWave DX/NX PCI, Sis 7018 PCI and Acer Labs @@ -2074,7 +2063,6 @@ # snd_via82c686: VIA VT82C686A PCI. # snd_vibes: S3 Sonicvibes PCI. -device snd_ad1816 device snd_als4000 device snd_atiixp device snd_cmi @@ -2085,18 +2073,12 @@ device snd_envy24 device snd_envy24ht device snd_es137x -device snd_ess device snd_fm801 -device snd_gusc device snd_hda device snd_hdspe device snd_ich device snd_maestro3 -device snd_mss device snd_neomagic -device snd_sb16 -device snd_sb8 -device snd_sbc device snd_solo device snd_spicds device snd_t4dwave Index: sys/conf/files =================================================================== --- sys/conf/files +++ sys/conf/files @@ -3089,14 +3089,6 @@ dev/snp/snp.c optional snp dev/sound/clone.c optional sound dev/sound/unit.c optional sound -dev/sound/isa/ad1816.c optional snd_ad1816 isa -dev/sound/isa/ess.c optional snd_ess isa -dev/sound/isa/gusc.c optional snd_gusc isa -dev/sound/isa/mss.c optional snd_mss isa -dev/sound/isa/sb16.c optional snd_sb16 isa -dev/sound/isa/sb8.c optional snd_sb8 isa -dev/sound/isa/sbc.c optional snd_sbc isa -dev/sound/isa/sndbuf_dma.c optional sound isa dev/sound/pci/als4000.c optional snd_als4000 pci dev/sound/pci/atiixp.c optional snd_atiixp pci dev/sound/pci/cmi.c optional snd_cmi pci Index: sys/dev/sound/driver.c =================================================================== --- sys/dev/sound/driver.c +++ sys/dev/sound/driver.c @@ -58,7 +58,6 @@ DECLARE_MODULE(snd_driver, snd_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); MODULE_VERSION(snd_driver, 1); -MODULE_DEPEND(snd_driver, snd_ad1816, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_als4000, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_atiixp, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_cmi, 1, 1, 1); @@ -69,17 +68,11 @@ MODULE_DEPEND(snd_driver, snd_envy24, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_envy24ht, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_es137x, 1, 1, 1); -MODULE_DEPEND(snd_driver, snd_ess, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_fm801, 1, 1, 1); -MODULE_DEPEND(snd_driver, snd_gusc, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_hda, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_ich, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_maestro3, 1, 1, 1); -MODULE_DEPEND(snd_driver, snd_mss, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_neomagic, 1, 1, 1); -MODULE_DEPEND(snd_driver, snd_sb16, 1, 1, 1); -MODULE_DEPEND(snd_driver, snd_sb8, 1, 1, 1); -MODULE_DEPEND(snd_driver, snd_sbc, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_solo, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_spicds, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_t4dwave, 1, 1, 1); Index: sys/modules/sound/driver/Makefile =================================================================== --- sys/modules/sound/driver/Makefile +++ sys/modules/sound/driver/Makefile @@ -6,9 +6,9 @@ # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). -SUBDIR= ad1816 als4000 atiixp cs4281 ${_csa} emu10k1 emu10kx +SUBDIR= als4000 atiixp cs4281 ${_csa} emu10k1 emu10kx SUBDIR+= envy24 envy24ht es137x ess fm801 hda hdspe ich -SUBDIR+= ${_maestro3} neomagic sb16 sb8 sbc solo spicds t4dwave via8233 +SUBDIR+= ${_maestro3} neomagic sb16 sb8 solo spicds t4dwave via8233 SUBDIR+= via82c686 vibes driver uaudio .if ${MK_SOURCELESS_UCODE} != "no" @@ -17,7 +17,7 @@ .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -SUBDIR+= cmi mss +SUBDIR+= cmi .endif .if ${MACHINE_CPUARCH} == "powerpc"