Pre 3.0 branch cleanup sos#2: sound

Superceded by the snd driver...

3 files changed, 5 insertions, 134 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 2781547..ce72ee1 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.517 1998/12/27 13:40:55 phk Exp $
+#	$Id: LINT,v 1.518 1998/12/27 13:55:47 sos 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
@@ -1142,28 +1142,6 @@ device en0
 device en1
 options		NATM			#native ATM
 
-#
-# Audio drivers: `snd', `sb', `pas', `gus', `pca'
-#
-# snd: Voxware sound support code
-# sb: SoundBlaster PCM - SoundBlaster, SB Pro, SB16, ProAudioSpectrum
-# sbxvi: SoundBlaster 16
-# sbmidi: SoundBlaster 16 MIDI interface
-# pas: ProAudioSpectrum PCM and MIDI
-# gus: Gravis Ultrasound - Ultrasound, Ultrasound 16, Ultrasound MAX
-# gusxvi: Gravis Ultrasound 16-bit PCM	(do not use)
-# mss: Microsoft Sound System
-# css: Crystal Sound System (CSS 423x PnP)
-# sscape: Ensoniq Soundscape MIDI interface
-# sscape_mss: Ensoniq Soundscape PCM (requires sscape)
-# opl: Yamaha OPL-2 and OPL-3 FM - SB, SB Pro, SB 16, ProAudioSpectrum
-# uart: stand-alone 6850 UART for MIDI
-# mpu: Roland MPU-401 stand-alone card
-# 
-# Beware!  The addresses specified below are also hard-coded in
-# i386/isa/sound/sound_config.h.  If you change the values here, you
-# must also change the values in the include file.
-#
 # pcm: PCM audio through various sound cards.
 #
 # This is the work in progress from Luigi Rizzo.  This has support for
@@ -1181,48 +1159,8 @@ options		NATM			#native ATM
 # This driver will use the new PnP code if it's available.
 #
 # pca: PCM audio through your PC speaker
-#
-# If you have a GUS-MAX card and want to use the CS4231 codec on the
-# card the drqs for the gus max must be 8 bit (1, 2, or 3).
-# 
-# If you would like to use the full duplex option on the gus, then define
-# flags to be the ``read dma channel''.
-#
-# options BROKEN_BUS_CLOCK	#PAS-16 isn't working and OPTI chipset
-# options SYMPHONY_PAS		#PAS-16 isn't working and SYMPHONY chipset
-# options EXCLUDE_SBPRO		#PAS-16
-# options SBC_IRQ=5		#PAS-16. Must match irq on sb0 line.
-# PAS16: The order of the pas0/sb0/opl0 is important since the
-#	sb emulation is enabled in the pas-16 attach.
-#
-# To overide the GUS defaults use:
-# options GUS_DMA2
-# options GUS_DMA
-# options GUS_IRQ
-#
-# The i386/isa/sound/sound.doc has more information.
-
-# Controls all "VOXWARE" driver sound devices.  See Luigi's driver
-# below for an alternate which may work better for some cards.
-#
-controller	snd0
-device pas0     at isa? port 0x388 irq 10 drq 6
-device sb0      at isa? port 0x220 irq 5 drq 1
-device sbxvi0   at isa? drq 5
-device sbmidi0  at isa? port 0x330
-device awe0     at isa? port 0x620
-device gus0 at isa? port 0x220 irq 12 drq 1
-#device gus0 at isa? port 0x220 irq 12 drq 1 flags 0x3
-device mss0 at isa? port 0x530 irq 10 drq 1
-device css0	at isa? port 0x534 irq 5 drq 1 flags 0x08
-device sscape0  at isa? port 0x330 irq 9 drq 0
-device trix0    at isa? port 0x330 irq 6 drq 0
-device sscape_mss0  at isa? port 0x534 irq 5 drq 1
-device opl0     at isa? port 0x388
-device mpu0     at isa? port 0x330 irq 6 drq 0
-device uart0 at isa? port 0x330 irq 5
-
-# Luigi's snd code (use INSTEAD of snd0 and all VOXWARE drivers!).
+
+# Luigi's snd code.
 # You may also wish to enable the pnp controller with this, for pnp
 # sound cards.
 #
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 0ef6faa..e32ce13 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.212 1998/12/27 13:40:56 phk Exp $
+#	$Id: files.i386,v 1.213 1998/12/27 13:55:48 sos Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -165,67 +165,6 @@ i386/isa/snd/dmabuf.c		optional	pcm	device-driver
 i386/isa/snd/ad1848.c		optional	pcm	device-driver
 i386/isa/snd/sb_dsp.c		optional	pcm	device-driver
 i386/isa/snd/clones.c		optional	pcm	device-driver
-i386/isa/sound/dev_table.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/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/sound_timer.c	optional	css	device-driver
-i386/isa/sound/sound_timer.c	optional	mss	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	gus	device-driver
-i386/isa/sound/ad1848.c		optional	mss	device-driver
-i386/isa/sound/ad1848.c		optional	css	device-driver
-i386/isa/sound/sound_timer.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/midi_synth.c	optional	css	device-driver
-i386/isa/sound/midibuf.c	optional	uart	device-driver
-i386/isa/sound/midibuf.c	optional	css	device-driver
-i386/isa/sound/trix.c		optional	trix	device-driver
-i386/isa/sound/adlib_card.c     optional        trix    device-driver
-i386/isa/sound/opl3.c           optional        trix    device-driver
-i386/isa/sound/ad1848.c         optional        trix    device-driver
-i386/isa/sound/sound_timer.c    optional        trix    device-driver  
-i386/isa/sound/sscape.c		optional	sscape	device-driver
-i386/isa/sound/ad1848.c		optional	sscape	device-driver
-i386/isa/sound/sound_timer.c	optional	sscape	device-driver
-i386/isa/sound/mpu401.c		optional	sscape	device-driver
-i386/isa/sound/midi_synth.c	optional	sscape	device-driver
-i386/isa/sound/midibuf.c	optional	sscape	device-driver
-i386/isa/sound/cs4232.c		optional	css	device-driver
 i386/isa/spigot.c		optional	spigot	device-driver
 i386/isa/spkr.c			optional	speaker	device-driver
 i386/isa/stallion.c		optional	stl	device-driver
@@ -309,5 +248,4 @@ gnu/i386/fpemul/wm_shrx.s	optional	gpl_math_emulate
 gnu/i386/fpemul/wm_sqrt.s	optional	gpl_math_emulate
 gnu/i386/isa/dgb.c		optional	dgb	device-driver
 gnu/i386/isa/dgm.c		optional	dgm	device-driver
-gnu/i386/isa/sound/awe_wave.c	optional	awe	device-driver
 pci/ide_pci.c			optional	wd	device-driver
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index b46c6f3..e1b95b9 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.96 1998/12/19 23:07:51 msmith Exp $
+#	$Id: options.i386,v 1.97 1998/12/27 13:36:44 phk Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -100,10 +100,5 @@ FDC_DEBUG			opt_fdc.h
 FDC_PRINT_BOGUS_CHIPTYPE	opt_fdc.h
 FDC_YE				opt_fdc.h
 
-# voxware options
-GUS_DMA2		opt_sound.h
-GUS_DMA			opt_sound.h
-GUS_IRQ			opt_sound.h
-
 # Video spigot
 SPIGOT_UNSECURE		opt_spigot.h