diff --git a/sys/conf/NOTES b/sys/conf/NOTES index c767bd5f1212..7f15d119cbbe 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.152 1995/03/06 10:33:34 ugen Exp $ +# $Id: LINT,v 1.153 1995/03/12 12:18:43 bde Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -543,28 +543,45 @@ pseudo-device ispy 1 # pca: PCM audio through your PC speaker # -options AUDIO_PAS -options AUDIO_SB -options AUDIO_ADLIB -options AUDIO_GUS -options "AUDIO_MPU401" -options "AUDIO_UART6850" -options AUDIO_PSS -options "AUDIO_GUS16" -options AUDIO_GUSMAX -options AUDIO_MSS -options AUDIO_SBPRO -options "AUDIO_SB16" -options "AUDIO_YM3812" +# SB = SoundBlaster; PAS = ProAudioSpectrum; GUS = Gravis UltraSound +# Controls all sound devices +controller snd0 -device snd10 at isa? port 0x530 irq 10 drq 1 vector adintr -device snd5 at isa? port 0x330 irq 6 vector mpuintr -device snd4 at isa? port 0x220 irq 15 drq 6 vector gusintr -device snd3 at isa? port 0x388 irq 10 drq 6 vector pasintr -device snd2 at isa? port 0x220 irq 7 drq 1 vector sbintr -device snd6 at isa? port 0x220 irq 7 drq 5 vector sbintr -device snd7 at isa? port 0x300 -device snd1 at isa? port 0x388 +# Yamaha OPL-3 FM - for SB, SB Pro, SB16, PAS +device opl0 at isa? port 0x388 + +# Yamaha OPL-3 FM - for PAS +#device opl0 at isa? port 0x38a + +# SoundBlaster DSP driver - for SB, SB Pro, SB16, PAS(emulating SB) +device sb0 at isa? port 0x220 irq 7 drq 1 vector sbintr + +# SoundBlaster 16 DSP driver - for SB16 - requires sb0 device +device sbxvi0 at isa? drq 5 + +# SoundBlaster 16 MIDI - for SB16 - requires sb0 device +device sbmidi0 at isa? port 0x300 + +# ProAudioSpectrum PCM and Midi - for PAS +device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr + +# MPU-401 - for MPU-401 standalone card +device mpu0 at isa? port 0x330 irq 6 drq 0 + +# Gravis UltraSound - for GUS, GUS16, GUSMAX +device gus0 at isa? port 0x220 irq 11 drq 1 vector gusintr + +# Gravis UltraSound 16 bit option - for GUS16 - requires gus0 +device gusxvi0 at isa? port 0x530 irq 7 drq 3 vector adintr + +# Gravis UltraSound MAX - for GUSMAX - requires gus0 +device gusmax0 at isa? port 0x32c + +# MS Sound System +device mss0 at isa? port 0x530 irq 10 drq 1 vector adintr + +# 6850 UART Midi +device uart0 at isa? port 0x330 irq 5 vector "m6850intr" device pca0 at isa? tty diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 0e443ca11703..e88984573438 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -107,38 +107,49 @@ i386/isa/psm.c optional psm device-driver i386/isa/readMBR.c standard i386/isa/seagate.c optional sea device-driver i386/isa/sio.c optional sio device-driver -i386/isa/sound/ad1848.c optional snd device-driver -i386/isa/sound/adlib_card.c optional snd device-driver -i386/isa/sound/audio.c optional snd device-driver i386/isa/sound/dev_table.c optional snd device-driver -i386/isa/sound/dmabuf.c optional snd device-driver -i386/isa/sound/gus_card.c optional snd device-driver -i386/isa/sound/gus_midi.c optional snd device-driver -i386/isa/sound/gus_vol.c optional snd device-driver -i386/isa/sound/gus_wave.c optional snd device-driver -i386/isa/sound/ics2101.c optional snd device-driver -i386/isa/sound/midi_synth.c optional snd device-driver -i386/isa/sound/midibuf.c optional snd device-driver -i386/isa/sound/mpu401.c optional snd device-driver -i386/isa/sound/opl3.c optional snd device-driver -i386/isa/sound/pas2_card.c optional snd device-driver -i386/isa/sound/pas2_midi.c optional snd device-driver -i386/isa/sound/pas2_mixer.c optional snd device-driver -i386/isa/sound/pas2_pcm.c optional snd device-driver -i386/isa/sound/patmgr.c optional snd device-driver -i386/isa/sound/pss.c optional snd device-driver -i386/isa/sound/sb16_dsp.c optional snd device-driver -i386/isa/sound/sb16_midi.c optional snd device-driver -i386/isa/sound/sb_card.c optional snd device-driver -i386/isa/sound/sb_dsp.c optional snd device-driver -i386/isa/sound/sb_midi.c optional snd device-driver -i386/isa/sound/sb_mixer.c optional snd device-driver -i386/isa/sound/sequencer.c optional snd device-driver -i386/isa/sound/sound_switch.c optional snd device-driver -i386/isa/sound/sound_timer.c optional snd device-driver i386/isa/sound/soundcard.c optional snd device-driver +i386/isa/sound/sound_switch.c optional snd device-driver +i386/isa/sound/audio.c optional snd device-driver +i386/isa/sound/dmabuf.c optional snd device-driver i386/isa/sound/sys_timer.c optional snd device-driver -i386/isa/sound/uart6850.c optional snd device-driver +i386/isa/sound/sequencer.c optional snd device-driver +i386/isa/sound/patmgr.c optional snd device-driver +i386/isa/sound/adlib_card.c optional opl device-driver +i386/isa/sound/opl3.c optional opl device-driver +i386/isa/sound/gus_card.c optional gus device-driver +i386/isa/sound/gus_midi.c optional gus device-driver +i386/isa/sound/gus_vol.c optional gus device-driver +i386/isa/sound/gus_wave.c optional gus device-driver +i386/isa/sound/ics2101.c optional gus device-driver +i386/isa/sound/sound_timer.c optional gus device-driver +i386/isa/sound/midi_synth.c optional gus device-driver +i386/isa/sound/midibuf.c optional gus device-driver +i386/isa/sound/ad1848.c optional gusxvi device-driver +i386/isa/sound/ad1848.c optional gusmax device-driver +i386/isa/sound/ad1848.c optional mss device-driver +i386/isa/sound/midi_synth.c optional mss device-driver +i386/isa/sound/midibuf.c optional mss device-driver +i386/isa/sound/mpu401.c optional mpu device-driver +i386/isa/sound/midi_synth.c optional mpu device-driver +i386/isa/sound/midibuf.c optional mpu device-driver +i386/isa/sound/pas2_card.c optional pas device-driver +i386/isa/sound/pas2_midi.c optional pas device-driver +i386/isa/sound/pas2_mixer.c optional pas device-driver +i386/isa/sound/pas2_pcm.c optional pas device-driver +i386/isa/sound/midi_synth.c optional pas device-driver +i386/isa/sound/midibuf.c optional pas device-driver +i386/isa/sound/sb_card.c optional sb device-driver +i386/isa/sound/sb_dsp.c optional sb device-driver +i386/isa/sound/sb_midi.c optional sb device-driver +i386/isa/sound/sb_mixer.c optional sb device-driver +i386/isa/sound/midi_synth.c optional sb device-driver +i386/isa/sound/midibuf.c optional sb device-driver +i386/isa/sound/sb16_dsp.c optional sbxvi device-driver +i386/isa/sound/sb16_midi.c optional sbmidi device-driver +i386/isa/sound/uart6850.c optional uart device-driver +i386/isa/sound/midi_synth.c optional uart device-driver +i386/isa/sound/midibuf.c optional uart device-driver i386/isa/sound/vat_audio.c optional vat_audio i386/isa/spigot.c optional spigot device-driver i386/isa/spkr.c optional speaker diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index c767bd5f1212..7f15d119cbbe 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.152 1995/03/06 10:33:34 ugen Exp $ +# $Id: LINT,v 1.153 1995/03/12 12:18:43 bde Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -543,28 +543,45 @@ pseudo-device ispy 1 # pca: PCM audio through your PC speaker # -options AUDIO_PAS -options AUDIO_SB -options AUDIO_ADLIB -options AUDIO_GUS -options "AUDIO_MPU401" -options "AUDIO_UART6850" -options AUDIO_PSS -options "AUDIO_GUS16" -options AUDIO_GUSMAX -options AUDIO_MSS -options AUDIO_SBPRO -options "AUDIO_SB16" -options "AUDIO_YM3812" +# SB = SoundBlaster; PAS = ProAudioSpectrum; GUS = Gravis UltraSound +# Controls all sound devices +controller snd0 -device snd10 at isa? port 0x530 irq 10 drq 1 vector adintr -device snd5 at isa? port 0x330 irq 6 vector mpuintr -device snd4 at isa? port 0x220 irq 15 drq 6 vector gusintr -device snd3 at isa? port 0x388 irq 10 drq 6 vector pasintr -device snd2 at isa? port 0x220 irq 7 drq 1 vector sbintr -device snd6 at isa? port 0x220 irq 7 drq 5 vector sbintr -device snd7 at isa? port 0x300 -device snd1 at isa? port 0x388 +# Yamaha OPL-3 FM - for SB, SB Pro, SB16, PAS +device opl0 at isa? port 0x388 + +# Yamaha OPL-3 FM - for PAS +#device opl0 at isa? port 0x38a + +# SoundBlaster DSP driver - for SB, SB Pro, SB16, PAS(emulating SB) +device sb0 at isa? port 0x220 irq 7 drq 1 vector sbintr + +# SoundBlaster 16 DSP driver - for SB16 - requires sb0 device +device sbxvi0 at isa? drq 5 + +# SoundBlaster 16 MIDI - for SB16 - requires sb0 device +device sbmidi0 at isa? port 0x300 + +# ProAudioSpectrum PCM and Midi - for PAS +device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr + +# MPU-401 - for MPU-401 standalone card +device mpu0 at isa? port 0x330 irq 6 drq 0 + +# Gravis UltraSound - for GUS, GUS16, GUSMAX +device gus0 at isa? port 0x220 irq 11 drq 1 vector gusintr + +# Gravis UltraSound 16 bit option - for GUS16 - requires gus0 +device gusxvi0 at isa? port 0x530 irq 7 drq 3 vector adintr + +# Gravis UltraSound MAX - for GUSMAX - requires gus0 +device gusmax0 at isa? port 0x32c + +# MS Sound System +device mss0 at isa? port 0x530 irq 10 drq 1 vector adintr + +# 6850 UART Midi +device uart0 at isa? port 0x330 irq 5 vector "m6850intr" device pca0 at isa? tty diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index c767bd5f1212..7f15d119cbbe 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.152 1995/03/06 10:33:34 ugen Exp $ +# $Id: LINT,v 1.153 1995/03/12 12:18:43 bde Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -543,28 +543,45 @@ pseudo-device ispy 1 # pca: PCM audio through your PC speaker # -options AUDIO_PAS -options AUDIO_SB -options AUDIO_ADLIB -options AUDIO_GUS -options "AUDIO_MPU401" -options "AUDIO_UART6850" -options AUDIO_PSS -options "AUDIO_GUS16" -options AUDIO_GUSMAX -options AUDIO_MSS -options AUDIO_SBPRO -options "AUDIO_SB16" -options "AUDIO_YM3812" +# SB = SoundBlaster; PAS = ProAudioSpectrum; GUS = Gravis UltraSound +# Controls all sound devices +controller snd0 -device snd10 at isa? port 0x530 irq 10 drq 1 vector adintr -device snd5 at isa? port 0x330 irq 6 vector mpuintr -device snd4 at isa? port 0x220 irq 15 drq 6 vector gusintr -device snd3 at isa? port 0x388 irq 10 drq 6 vector pasintr -device snd2 at isa? port 0x220 irq 7 drq 1 vector sbintr -device snd6 at isa? port 0x220 irq 7 drq 5 vector sbintr -device snd7 at isa? port 0x300 -device snd1 at isa? port 0x388 +# Yamaha OPL-3 FM - for SB, SB Pro, SB16, PAS +device opl0 at isa? port 0x388 + +# Yamaha OPL-3 FM - for PAS +#device opl0 at isa? port 0x38a + +# SoundBlaster DSP driver - for SB, SB Pro, SB16, PAS(emulating SB) +device sb0 at isa? port 0x220 irq 7 drq 1 vector sbintr + +# SoundBlaster 16 DSP driver - for SB16 - requires sb0 device +device sbxvi0 at isa? drq 5 + +# SoundBlaster 16 MIDI - for SB16 - requires sb0 device +device sbmidi0 at isa? port 0x300 + +# ProAudioSpectrum PCM and Midi - for PAS +device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr + +# MPU-401 - for MPU-401 standalone card +device mpu0 at isa? port 0x330 irq 6 drq 0 + +# Gravis UltraSound - for GUS, GUS16, GUSMAX +device gus0 at isa? port 0x220 irq 11 drq 1 vector gusintr + +# Gravis UltraSound 16 bit option - for GUS16 - requires gus0 +device gusxvi0 at isa? port 0x530 irq 7 drq 3 vector adintr + +# Gravis UltraSound MAX - for GUSMAX - requires gus0 +device gusmax0 at isa? port 0x32c + +# MS Sound System +device mss0 at isa? port 0x530 irq 10 drq 1 vector adintr + +# 6850 UART Midi +device uart0 at isa? port 0x330 irq 5 vector "m6850intr" device pca0 at isa? tty diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 0e443ca11703..e88984573438 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -107,38 +107,49 @@ i386/isa/psm.c optional psm device-driver i386/isa/readMBR.c standard i386/isa/seagate.c optional sea device-driver i386/isa/sio.c optional sio device-driver -i386/isa/sound/ad1848.c optional snd device-driver -i386/isa/sound/adlib_card.c optional snd device-driver -i386/isa/sound/audio.c optional snd device-driver i386/isa/sound/dev_table.c optional snd device-driver -i386/isa/sound/dmabuf.c optional snd device-driver -i386/isa/sound/gus_card.c optional snd device-driver -i386/isa/sound/gus_midi.c optional snd device-driver -i386/isa/sound/gus_vol.c optional snd device-driver -i386/isa/sound/gus_wave.c optional snd device-driver -i386/isa/sound/ics2101.c optional snd device-driver -i386/isa/sound/midi_synth.c optional snd device-driver -i386/isa/sound/midibuf.c optional snd device-driver -i386/isa/sound/mpu401.c optional snd device-driver -i386/isa/sound/opl3.c optional snd device-driver -i386/isa/sound/pas2_card.c optional snd device-driver -i386/isa/sound/pas2_midi.c optional snd device-driver -i386/isa/sound/pas2_mixer.c optional snd device-driver -i386/isa/sound/pas2_pcm.c optional snd device-driver -i386/isa/sound/patmgr.c optional snd device-driver -i386/isa/sound/pss.c optional snd device-driver -i386/isa/sound/sb16_dsp.c optional snd device-driver -i386/isa/sound/sb16_midi.c optional snd device-driver -i386/isa/sound/sb_card.c optional snd device-driver -i386/isa/sound/sb_dsp.c optional snd device-driver -i386/isa/sound/sb_midi.c optional snd device-driver -i386/isa/sound/sb_mixer.c optional snd device-driver -i386/isa/sound/sequencer.c optional snd device-driver -i386/isa/sound/sound_switch.c optional snd device-driver -i386/isa/sound/sound_timer.c optional snd device-driver i386/isa/sound/soundcard.c optional snd device-driver +i386/isa/sound/sound_switch.c optional snd device-driver +i386/isa/sound/audio.c optional snd device-driver +i386/isa/sound/dmabuf.c optional snd device-driver i386/isa/sound/sys_timer.c optional snd device-driver -i386/isa/sound/uart6850.c optional snd device-driver +i386/isa/sound/sequencer.c optional snd device-driver +i386/isa/sound/patmgr.c optional snd device-driver +i386/isa/sound/adlib_card.c optional opl device-driver +i386/isa/sound/opl3.c optional opl device-driver +i386/isa/sound/gus_card.c optional gus device-driver +i386/isa/sound/gus_midi.c optional gus device-driver +i386/isa/sound/gus_vol.c optional gus device-driver +i386/isa/sound/gus_wave.c optional gus device-driver +i386/isa/sound/ics2101.c optional gus device-driver +i386/isa/sound/sound_timer.c optional gus device-driver +i386/isa/sound/midi_synth.c optional gus device-driver +i386/isa/sound/midibuf.c optional gus device-driver +i386/isa/sound/ad1848.c optional gusxvi device-driver +i386/isa/sound/ad1848.c optional gusmax device-driver +i386/isa/sound/ad1848.c optional mss device-driver +i386/isa/sound/midi_synth.c optional mss device-driver +i386/isa/sound/midibuf.c optional mss device-driver +i386/isa/sound/mpu401.c optional mpu device-driver +i386/isa/sound/midi_synth.c optional mpu device-driver +i386/isa/sound/midibuf.c optional mpu device-driver +i386/isa/sound/pas2_card.c optional pas device-driver +i386/isa/sound/pas2_midi.c optional pas device-driver +i386/isa/sound/pas2_mixer.c optional pas device-driver +i386/isa/sound/pas2_pcm.c optional pas device-driver +i386/isa/sound/midi_synth.c optional pas device-driver +i386/isa/sound/midibuf.c optional pas device-driver +i386/isa/sound/sb_card.c optional sb device-driver +i386/isa/sound/sb_dsp.c optional sb device-driver +i386/isa/sound/sb_midi.c optional sb device-driver +i386/isa/sound/sb_mixer.c optional sb device-driver +i386/isa/sound/midi_synth.c optional sb device-driver +i386/isa/sound/midibuf.c optional sb device-driver +i386/isa/sound/sb16_dsp.c optional sbxvi device-driver +i386/isa/sound/sb16_midi.c optional sbmidi device-driver +i386/isa/sound/uart6850.c optional uart device-driver +i386/isa/sound/midi_synth.c optional uart device-driver +i386/isa/sound/midibuf.c optional uart device-driver i386/isa/sound/vat_audio.c optional vat_audio i386/isa/spigot.c optional spigot device-driver i386/isa/spkr.c optional speaker