mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-15 10:17:20 +00:00
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
This commit is contained in:
Seigo Tanimura
parent
6fe30ff3f2
commit
0739ea1de2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=132236
121
sys/conf/NOTES
121
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.
|
||||
# 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 pcm
|
||||
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 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"
|
||||
# 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:
|
||||
|
||||
102
sys/conf/files
102
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
|
||||
|
||||
@ -673,7 +673,7 @@ static driver_t ad1816_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_ad1816, isa, ad1816_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_ad1816, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_ad1816, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_ad1816, 1);
|
||||
|
||||
|
||||
|
||||
@ -171,7 +171,7 @@ static driver_t es1888_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_es1888, isa, es1888_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_es1888, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_es1888, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_es1888, 1);
|
||||
|
||||
|
||||
|
||||
@ -932,7 +932,7 @@ static driver_t ess_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_ess, sbc, ess_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_ess, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_ess, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_DEPEND(snd_ess, snd_sbc, 1, 1, 1);
|
||||
MODULE_VERSION(snd_ess, 1);
|
||||
|
||||
|
||||
@ -656,7 +656,7 @@ static driver_t gusc_driver = {
|
||||
* gusc can be attached to an isa bus.
|
||||
*/
|
||||
DRIVER_MODULE(snd_gusc, isa, gusc_driver, gusc_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_gusc, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_gusc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_gusc, 1);
|
||||
|
||||
|
||||
|
||||
@ -1881,7 +1881,7 @@ static driver_t mss_driver = {
|
||||
|
||||
DRIVER_MODULE(snd_mss, isa, mss_driver, pcm_devclass, 0, 0);
|
||||
DRIVER_MODULE(snd_mss, acpi, mss_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_mss, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_mss, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_mss, 1);
|
||||
|
||||
static int
|
||||
@ -2192,7 +2192,7 @@ static driver_t pnpmss_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_pnpmss, isa, pnpmss_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_pnpmss, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_pnpmss, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_pnpmss, 1);
|
||||
|
||||
static int
|
||||
@ -2276,7 +2276,7 @@ static driver_t guspcm_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_guspcm, gusc, guspcm_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_guspcm, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_guspcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_guspcm, 1);
|
||||
|
||||
|
||||
|
||||
@ -900,6 +900,6 @@ static driver_t sb16_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_sb16, sbc, sb16_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_sb16, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_sb16, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_DEPEND(snd_sb16, snd_sbc, 1, 1, 1);
|
||||
MODULE_VERSION(snd_sb16, 1);
|
||||
|
||||
@ -782,7 +782,7 @@ static driver_t sb_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_sb8, sbc, sb_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_sb8, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_sb8, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_DEPEND(snd_sb8, snd_sbc, 1, 1, 1);
|
||||
MODULE_VERSION(snd_sb8, 1);
|
||||
|
||||
|
||||
@ -790,5 +790,5 @@ static driver_t sbc_driver = {
|
||||
|
||||
/* sbc can be attached to an isa bus. */
|
||||
DRIVER_MODULE(snd_sbc, isa, sbc_driver, sbc_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_sbc, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_sbc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_sbc, 1);
|
||||
|
||||
@ -899,5 +899,5 @@ static driver_t als_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_als4000, pci, als_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_als4000, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_als4000, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_als4000, 1);
|
||||
|
||||
@ -729,5 +729,5 @@ static driver_t au88x0_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_au88x0, pci, au88x0_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_au88x0, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_au88x0, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_au88x0, 1);
|
||||
|
||||
@ -682,5 +682,5 @@ static driver_t au_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_aureal, pci, au_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_aureal, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_aureal, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_aureal, 1);
|
||||
|
||||
@ -1008,5 +1008,5 @@ static driver_t cmi_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_cmi, pci, cmi_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_cmi, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_cmi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_cmi, 1);
|
||||
|
||||
@ -976,5 +976,5 @@ static driver_t cs4281_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_cs4281, pci, cs4281_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_cs4281, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_cs4281, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_cs4281, 1);
|
||||
|
||||
@ -1064,5 +1064,5 @@ static driver_t csa_driver = {
|
||||
* csa can be attached to a pci bus.
|
||||
*/
|
||||
DRIVER_MODULE(snd_csa, pci, csa_driver, csa_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_csa, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_csa, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_csa, 1);
|
||||
|
||||
@ -848,6 +848,6 @@ static driver_t pcmcsa_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_csapcm, csa, pcmcsa_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_csapcm, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_csapcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_DEPEND(snd_csapcm, snd_csa, 1, 1, 1);
|
||||
MODULE_VERSION(snd_csapcm, 1);
|
||||
|
||||
@ -1084,5 +1084,5 @@ static driver_t ds1_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_ds1, pci, ds1_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_ds1, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_ds1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_ds1, 1);
|
||||
|
||||
@ -2038,7 +2038,7 @@ static driver_t emu_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_emu10k1, pci, emu_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_emu10k1, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_emu10k1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_emu10k1, 1);
|
||||
|
||||
/* dummy driver to silence the joystick device */
|
||||
|
||||
@ -981,5 +981,5 @@ static driver_t es_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_es137x, pci, es_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_es137x, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_es137x, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_es137x, 1);
|
||||
|
||||
@ -799,5 +799,5 @@ static driver_t fm801_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_fm801, pci, fm801_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_fm801, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_fm801, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_fm801, 1);
|
||||
|
||||
@ -923,5 +923,5 @@ static driver_t ich_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_ich, pci, ich_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_ich, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_ich, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_ich, 1);
|
||||
|
||||
@ -1191,5 +1191,5 @@ static driver_t agg_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_maestro, pci, agg_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_maestro, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_maestro, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_maestro, 1);
|
||||
|
||||
@ -1523,5 +1523,5 @@ static driver_t m3_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_maestro3, pci, m3_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_maestro3, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_maestro3, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_maestro3, 1);
|
||||
|
||||
@ -818,5 +818,5 @@ static driver_t nm_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_neomagic, pci, nm_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_neomagic, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_neomagic, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_neomagic, 1);
|
||||
|
||||
@ -1048,7 +1048,7 @@ static driver_t ess_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_solo, pci, ess_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_solo, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_solo, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_solo, 1);
|
||||
|
||||
|
||||
|
||||
@ -975,5 +975,5 @@ static driver_t tr_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_t4dwave, pci, tr_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_t4dwave, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_t4dwave, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_t4dwave, 1);
|
||||
|
||||
@ -923,5 +923,5 @@ static driver_t via_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_via8233, pci, via_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_via8233, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_via8233, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_via8233, 1);
|
||||
|
||||
@ -634,5 +634,5 @@ static driver_t via_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_via82c686, pci, via_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_via82c686, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_via82c686, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_via82c686, 1);
|
||||
|
||||
@ -943,5 +943,5 @@ static driver_t sonicvibes_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(snd_vibes, pci, sonicvibes_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(snd_vibes, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(snd_vibes, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(snd_vibes, 1);
|
||||
|
||||
@ -972,10 +972,15 @@ sysctl_hw_snd_vchans(SYSCTL_HANDLER_ARGS)
|
||||
|
||||
/************************************************************************/
|
||||
|
||||
static moduledata_t sndpcm_mod = {
|
||||
"snd_pcm",
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
DECLARE_MODULE(snd_pcm, sndpcm_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);
|
||||
MODULE_VERSION(snd_pcm, PCM_MODVER);
|
||||
#if notyet
|
||||
static int
|
||||
sound_modevent(module_t mod, int type, void *data)
|
||||
{
|
||||
return (midi_modevent(mod, type, data));
|
||||
}
|
||||
|
||||
DEV_MODULE(sound, sound_modevent, NULL);
|
||||
#else
|
||||
DEV_MODULE(sound, NULL, NULL);
|
||||
#endif /* notyet */
|
||||
MODULE_VERSION(sound, SOUND_MODVER);
|
||||
|
||||
@ -98,11 +98,11 @@ struct snd_mixer;
|
||||
|
||||
#define SND_STATUSLEN 64
|
||||
|
||||
#define PCM_MODVER 1
|
||||
#define SOUND_MODVER 1
|
||||
|
||||
#define PCM_MINVER 1
|
||||
#define PCM_PREFVER PCM_MODVER
|
||||
#define PCM_MAXVER 1
|
||||
#define SOUND_MINVER 1
|
||||
#define SOUND_PREFVER SOUND_MODVER
|
||||
#define SOUND_MAXVER 1
|
||||
|
||||
/*
|
||||
PROPOSAL:
|
||||
|
||||
@ -376,5 +376,5 @@ static driver_t ua_pcm_driver = {
|
||||
|
||||
DRIVER_MODULE(ua_pcm, uaudio, ua_pcm_driver, pcm_devclass, 0, 0);
|
||||
MODULE_DEPEND(ua_pcm, uaudio, 1, 1, 1);
|
||||
MODULE_DEPEND(ua_pcm, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER);
|
||||
MODULE_DEPEND(ua_pcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
|
||||
MODULE_VERSION(ua_pcm, 1);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += pcm
|
||||
SUBDIR += sound
|
||||
SUBDIR += driver
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.PATH: ${.CURDIR}/../../../dev/sound/pcm
|
||||
.PATH: ${.CURDIR}/../../../dev/sound/isa
|
||||
|
||||
KMOD= snd_pcm
|
||||
SRCS= device_if.h bus_if.h isa_if.h pci_if.h
|
||||
SRCS+= ac97_if.h channel_if.h feeder_if.h mixer_if.h
|
||||
SRCS+= ac97_if.c channel_if.c feeder_if.c mixer_if.c
|
||||
SRCS+= ac97.c ac97_patch.c buffer.c channel.c dsp.c
|
||||
SRCS+= fake.c feeder.c feeder_fmt.c feeder_rate.c
|
||||
SRCS+= mixer.c sndstat.c sound.c vchan.c
|
||||
SRCS+= sndbuf_dma.c
|
||||
|
||||
EXPORT_SYMS= YES # XXX evaluate
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
@ -3,7 +3,7 @@
|
||||
.PATH: ${.CURDIR}/../../../dev/sound/pcm
|
||||
.PATH: ${.CURDIR}/../../../dev/sound/isa
|
||||
|
||||
KMOD= snd_pcm
|
||||
KMOD= sound
|
||||
SRCS= device_if.h bus_if.h isa_if.h pci_if.h
|
||||
SRCS+= ac97_if.h channel_if.h feeder_if.h mixer_if.h
|
||||
SRCS+= ac97_if.c channel_if.c feeder_if.c mixer_if.c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user