Rename the sound device drivers:

- `sound'
  The generic sound driver, always required.

- `snd_*'
  Device-dependent drivers, named after the sound module names.
  Configure accordingly to your hardware.

In addition, rename the `snd_pcm' module to `sound' in order to sync
with the driver names.

Suggested by:	cg

2 files changed, 132 insertions, 95 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index ac570e3..19a04f5 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1805,13 +1805,15 @@ options 	NATM			#native ATM
 options 	LIBMBPOOL		#needed by patm, iatm
 
 #
-# Audio drivers: `pcm', `sbc', `gusc'
+# Sound drivers
 #
-# pcm: PCM audio through various sound cards.
+# sound: The generic sound driver.
 #
-# This has support for a large number of new audio cards, based on
-# CS423x, OPTi931, Yamaha OPL-SAx, and also for SB16, GusPnP.
-# For more information about this driver and supported cards, see pcm(4).
+
+device		sound
+
+#
+# snd_*: Device-specific drivers.
 #
 # The flags of the device tells the device a bit more info about the
 # device that normally is obtained through the PnP interface.
@@ -1821,44 +1823,81 @@ options 	LIBMBPOOL		#needed by patm, iatm
 #		    zero if don't know what to put in (and you don't,
 #		    since this is unsupported at the moment...).
 #
-# Supported cards include:
-# Creative SoundBlaster ISA PnP/non-PnP
-# Supports ESS and Avance ISA chips as well.
-# Gravis UltraSound ISA PnP/non-PnP
-# Crystal Semiconductor CS461x/428x PCI
-# Neomagic 256AV (ac97)
-# Most of the more common ISA/PnP sb/mss/ess compatible cards.
-
-device		pcm
-
-# For non-pnp sound cards with no bridge drivers only:
-hint.pcm.0.at="isa"
-hint.pcm.0.irq="10"
-hint.pcm.0.drq="1"
-hint.pcm.0.flags="0x0"
-
-# The bridge drivers for sound cards.  These can be separately configured
-# for providing services to the likes of new-midi.
-# When used with 'device pcm' they also provide pcm sound services.
-#
-# sbc:  Creative SoundBlaster ISA PnP/non-PnP
-#	Supports ESS and Avance ISA chips as well.
-# gusc: Gravis UltraSound ISA PnP/non-PnP
-# csa:  Crystal Semiconductor CS461x/428x PCI
-
-# For non-PnP cards:
-device		sbc
-hint.sbc.0.at="isa"
-hint.sbc.0.port="0x220"
-hint.sbc.0.irq="5"
-hint.sbc.0.drq="1"
-hint.sbc.0.flags="0x15"
-device		gusc
-hint.gusc.0.at="isa"
-hint.gusc.0.port="0x220"
-hint.gusc.0.irq="5"
-hint.gusc.0.drq="1"
-hint.gusc.0.flags="0x13"
+# snd_als4000:		Avance Logic ALS4000 PCI.
+# snd_ad1816:		Analog Devices AD1816 ISA PnP/non-PnP.
+# snd_cmi:		CMedia CMI8338/CMI8738 PCI.
+# snd_cs4281:		Crystal Semiconductor CS4281 PCI.
+# snd_csa:		Crystal Semiconductor CS461x/428x PCI. (except
+#			4281)
+# snd_ds1:		Yamaha DS-1 PCI.
+# snd_emu10k1:		Creative EMU10K1 PCI and EMU10K2 (Audigy) PCI.
+# snd_es137x:		Ensoniq AudioPCI ES137x PCI.
+# snd_ess:		Ensoniq ESS ISA PnP/non-PnP.
+# snd_fm801:		Forte Media FM801 PCI.
+# snd_gusc:		Gravis UltraSound ISA PnP/non-PnP.
+# snd_ich:		Intel ICH PCI and some more audio controllers
+#			embedded in a chipset.
+# snd_maestro:		ESS Technology Maestro-1/2x PCI.
+# 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
+#			conjuction with snd_sbc.
+# snd_sb8:		Creative SoundBlaster (pre-16), to be used in
+#			conjuction 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_t4dwave:		Trident 4DWave PCI, Sis 7018 PCI and Acer Labs
+#			M5451 PCI.
+# snd_via8233:		VIA VT8233x PCI.
+# snd_via82c686:	VIA VT82C686A PCI.
+# snd_vibes:		S3 Sonicvibes PCI.
+# snd_uaudio:		USB audio.
+
+device		"snd_ad1816"
+device		"snd_als4000"
+#device		"snd_au88x0"
+device		snd_cmi
+device		"snd_cs4281"
+device		snd_csa
+device		"snd_ds1"
+device		"snd_emu10k1"
+device		"snd_es137x"
+device		snd_ess
+device		"snd_fm801"
+device		snd_gusc
+device		snd_ich
+device		snd_maestro
+device		"snd_maestro3"
+device		snd_mss
+device		snd_neomagic
+device		"snd_sb16"
+device		"snd_sb8"
+device		snd_sbc
+device		snd_solo
+device		"snd_t4dwave"
+device		"snd_via8233"
+device		"snd_via82c686"
+device		snd_vibes
+#device		"snd_vortex1"
+device		snd_uaudio
+
+# For non-pnp sound cards:
+hint.snd_mss.0.at="isa"
+hint.snd_mss.0.irq="10"
+hint.snd_mss.0.drq="1"
+hint.snd_mss.0.flags="0x0"
+hint.snd_sbc.0.at="isa"
+hint.snd_sbc.0.port="0x220"
+hint.snd_sbc.0.irq="5"
+hint.snd_sbc.0.drq="1"
+hint.snd_sbc.0.flags="0x15"
+hint.snd_gusc.0.at="isa"
+hint.snd_gusc.0.port="0x220"
+hint.snd_gusc.0.irq="5"
+hint.snd_gusc.0.drq="1"
+hint.snd_gusc.0.flags="0x13"
 
 #
 # Miscellaneous hardware:
diff --git a/sys/conf/files b/sys/conf/files
index 0454d68..d01d0b2 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -35,7 +35,7 @@ aic79xx_{seq.h,reg.h,reg_print.c}	optional ahd pci		   \
 aic79xx_reg_print.o		optional ahd pci ahd_reg_pretty_print	   \
 	compile-with	"${NORMAL_C}"					   \
 	no-implicit-rule local
-emu10k1-alsa%diked.h		optional pcm pci			   \
+emu10k1-alsa%diked.h		optional snd_emu10k1 pci			   \
 	dependency	"$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \
 	compile-with	"CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
 	no-obj no-implicit-rule before-depend				   \
@@ -679,57 +679,55 @@ dev/sn/if_sn_isa.c	optional sn isa
 dev/sn/if_sn_pccard.c	optional sn card
 dev/sn/if_sn_pccard.c	optional sn pccard
 dev/snp/snp.c		optional snp
-dev/sound/isa/ad1816.c	optional pcm isa
-dev/sound/isa/es1888.c	optional pcm isa
-dev/sound/isa/ess.c	optional pcm isa
-dev/sound/isa/gusc.c	optional gusc isa
-dev/sound/isa/gusc.c	optional pcm isa
-dev/sound/isa/mss.c	optional pcm isa
-dev/sound/isa/sb16.c	optional pcm isa
-dev/sound/isa/sb8.c	optional pcm isa
-dev/sound/isa/sbc.c	optional pcm isa
-dev/sound/isa/sbc.c	optional sbc isa
-dev/sound/isa/sndbuf_dma.c	optional pcm isa
-dev/sound/pci/als4000.c	optional pcm pci
-#dev/sound/pci/au88x0.c	optional pcm pci
-dev/sound/pci/cmi.c	optional pcm pci
-dev/sound/pci/cs4281.c	optional pcm pci
-dev/sound/pci/csa.c	optional csa pci
-dev/sound/pci/csa.c	optional pcm pci
-dev/sound/pci/csapcm.c	optional pcm pci
-dev/sound/pci/ds1.c	optional pcm pci
-dev/sound/pci/emu10k1.c	optional pcm pci dependency "emu10k1-alsa%diked.h"
-dev/sound/pci/es137x.c	optional pcm pci
-dev/sound/pci/fm801.c	optional pcm pci
-dev/sound/pci/ich.c	optional pcm pci
-dev/sound/pci/maestro.c optional pcm pci
-dev/sound/pci/neomagic.c optional pcm pci
-dev/sound/pci/solo.c	optional pcm pci
-dev/sound/pci/t4dwave.c	optional pcm pci
-dev/sound/pci/via8233.c	optional pcm pci
-dev/sound/pci/via82c686.c	optional pcm pci
-dev/sound/pci/vibes.c	optional pcm pci
-#dev/sound/pci/vortex1.c	optional pcm pci
-dev/sound/pcm/ac97.c	optional pcm
-dev/sound/pcm/ac97_patch.c	optional pcm
-dev/sound/pcm/ac97_if.m	optional pcm
-dev/sound/pcm/buffer.c	optional pcm
-dev/sound/pcm/channel.c	optional pcm
-dev/sound/pcm/channel_if.m	optional pcm
-dev/sound/pcm/dsp.c	optional pcm
-dev/sound/pcm/fake.c	optional pcm
-dev/sound/pcm/feeder.c	optional pcm
-dev/sound/pcm/feeder_if.m	optional pcm
-dev/sound/pcm/feeder_fmt.c	optional pcm
-dev/sound/pcm/feeder_rate.c	optional pcm
-dev/sound/pcm/mixer.c	optional pcm
-dev/sound/pcm/mixer_if.m	optional pcm
-dev/sound/pcm/sndstat.c	optional pcm
-dev/sound/pcm/sound.c	optional pcm
-dev/sound/pcm/vchan.c	optional pcm
-#dev/sound/usb/upcm.c	optional pcm usb
-dev/sound/usb/uaudio.c	optional pcm usb
-dev/sound/usb/uaudio_pcm.c	optional pcm usb
+dev/sound/isa/ad1816.c	optional snd_ad1816 isa
+dev/sound/isa/es1888.c	optional snd_ess 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/au88x0.c	optional snd_au88x0 pci
+dev/sound/pci/cmi.c	optional snd_cmi pci
+dev/sound/pci/cs4281.c	optional snd_cs4281 pci
+dev/sound/pci/csa.c	optional snd_csa pci
+dev/sound/pci/csapcm.c	optional snd_csa pci
+dev/sound/pci/ds1.c	optional snd_ds1 pci
+dev/sound/pci/emu10k1.c	optional snd_emu10k1 pci dependency "emu10k1-alsa%diked.h"
+dev/sound/pci/es137x.c	optional snd_es137x pci
+dev/sound/pci/fm801.c	optional snd_fm801 pci
+dev/sound/pci/ich.c	optional snd_ich pci
+dev/sound/pci/maestro.c optional snd_maestro pci
+dev/sound/pci/maestro3.c	optional snd_maestro3 pci
+dev/sound/pci/neomagic.c	optional snd_neomagic pci
+dev/sound/pci/solo.c	optional snd_solo pci
+dev/sound/pci/t4dwave.c	optional snd_t4dwave pci
+dev/sound/pci/via8233.c	optional snd_via8233 pci
+dev/sound/pci/via82c686.c	optional snd_via82c686 pci
+dev/sound/pci/vibes.c	optional snd_vibes pci
+#dev/sound/pci/vortex1.c	optional snd_vortex1 pci
+dev/sound/pcm/ac97.c	optional sound
+dev/sound/pcm/ac97_patch.c	optional sound
+dev/sound/pcm/ac97_if.m	optional sound
+dev/sound/pcm/buffer.c	optional sound
+dev/sound/pcm/channel.c	optional sound
+dev/sound/pcm/channel_if.m	optional sound
+dev/sound/pcm/dsp.c	optional sound
+dev/sound/pcm/fake.c	optional sound
+dev/sound/pcm/feeder.c	optional sound
+dev/sound/pcm/feeder_if.m	optional sound
+dev/sound/pcm/feeder_fmt.c	optional sound
+dev/sound/pcm/feeder_rate.c	optional sound
+dev/sound/pcm/mixer.c	optional sound
+dev/sound/pcm/mixer_if.m	optional sound
+dev/sound/pcm/sndstat.c	optional sound
+dev/sound/pcm/sound.c	optional sound
+dev/sound/pcm/vchan.c	optional sound
+#dev/sound/usb/upcm.c	optional snd_upcm usb
+dev/sound/usb/uaudio.c	optional snd_uaudio usb
+dev/sound/usb/uaudio_pcm.c	optional snd_uaudio usb
 dev/sr/if_sr.c		optional sr
 dev/sr/if_sr_pci.c	optional sr pci
 dev/streams/streams.c	optional streams