Added appropriate entries into files.i386 for snd drivers in /sys/i386/isa/sound

Added new snd drivers and EXCLUDE_<driver> options to LINT.

5 files changed, 72 insertions, 52 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index ef6f814..45e1e4e 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.53 1994/02/09 05:35:57 nate Exp $
+#	$Id: LINT,v 1.54 1994/02/27 21:53:53 phk Exp $
 #
 
 machine		"i386"
@@ -58,6 +58,8 @@ options		EXCLUDE_CHIP_MIDI	# \  sound driver options
 options		"EXCLUDE_MPU401"	#  \ exclude specified
 options		EXCLUDE_GUS		#  / device or chip
 options		EXCLUDE_SBPRO		# /  from driver
+options		EXCLUDE_SB16		# |
+options		EXCLUDE_PAS		# |
 
 options		USER_LDT		#allow user-level control of i386 ldt
 
@@ -168,8 +170,10 @@ device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
 # See /sys/i386/doc/sound.doc for more information.
 device snd5 at isa? port 0x330 irq 6 drq 0 vector mpuintr
 device snd4 at isa? port 0x220 irq 15 drq 6 vector gusintr
-device snd3 at isa? port 0x388 irq 12 drq 3 vector pasintr
+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 irq 7 drq 0 vector sbintr
 device snd1 at isa? port 0x388 irq 0 drq 0 vector sbintr
 #
 #
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 0352f52..7da6458 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.25 1994/02/07 04:27:59 alm Exp $
+#	$Id: files.i386,v 1.26 1994/02/27 21:53:54 phk Exp $
 #
 i386/i386/autoconf.c		standard		device-driver
 i386/i386/cons.c		standard
@@ -41,28 +41,32 @@ i386/isa/psm.c			optional	psm	device-driver
 i386/isa/sb.c			optional	sb	device-driver
 i386/isa/sg.c			optional	sg	device-driver
 i386/isa/sio.c			optional	sio	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/dsp.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/midi.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/pro_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/sequencer.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/midi.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/pro_midi.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/soundcard.c	optional	snd	device-driver
 i386/isa/spkr.c			optional	speaker
 i386/isa/tw.c			optional	tw	device-driver
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index ef6f814..45e1e4e 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.53 1994/02/09 05:35:57 nate Exp $
+#	$Id: LINT,v 1.54 1994/02/27 21:53:53 phk Exp $
 #
 
 machine		"i386"
@@ -58,6 +58,8 @@ options		EXCLUDE_CHIP_MIDI	# \  sound driver options
 options		"EXCLUDE_MPU401"	#  \ exclude specified
 options		EXCLUDE_GUS		#  / device or chip
 options		EXCLUDE_SBPRO		# /  from driver
+options		EXCLUDE_SB16		# |
+options		EXCLUDE_PAS		# |
 
 options		USER_LDT		#allow user-level control of i386 ldt
 
@@ -168,8 +170,10 @@ device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
 # See /sys/i386/doc/sound.doc for more information.
 device snd5 at isa? port 0x330 irq 6 drq 0 vector mpuintr
 device snd4 at isa? port 0x220 irq 15 drq 6 vector gusintr
-device snd3 at isa? port 0x388 irq 12 drq 3 vector pasintr
+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 irq 7 drq 0 vector sbintr
 device snd1 at isa? port 0x388 irq 0 drq 0 vector sbintr
 #
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index ef6f814..45e1e4e 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.53 1994/02/09 05:35:57 nate Exp $
+#	$Id: LINT,v 1.54 1994/02/27 21:53:53 phk Exp $
 #
 
 machine		"i386"
@@ -58,6 +58,8 @@ options		EXCLUDE_CHIP_MIDI	# \  sound driver options
 options		"EXCLUDE_MPU401"	#  \ exclude specified
 options		EXCLUDE_GUS		#  / device or chip
 options		EXCLUDE_SBPRO		# /  from driver
+options		EXCLUDE_SB16		# |
+options		EXCLUDE_PAS		# |
 
 options		USER_LDT		#allow user-level control of i386 ldt
 
@@ -168,8 +170,10 @@ device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
 # See /sys/i386/doc/sound.doc for more information.
 device snd5 at isa? port 0x330 irq 6 drq 0 vector mpuintr
 device snd4 at isa? port 0x220 irq 15 drq 6 vector gusintr
-device snd3 at isa? port 0x388 irq 12 drq 3 vector pasintr
+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 irq 7 drq 0 vector sbintr
 device snd1 at isa? port 0x388 irq 0 drq 0 vector sbintr
 #
 #
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 0352f52..7da6458 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/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.25 1994/02/07 04:27:59 alm Exp $
+#	$Id: files.i386,v 1.26 1994/02/27 21:53:54 phk Exp $
 #
 i386/i386/autoconf.c		standard		device-driver
 i386/i386/cons.c		standard
@@ -41,28 +41,32 @@ i386/isa/psm.c			optional	psm	device-driver
 i386/isa/sb.c			optional	sb	device-driver
 i386/isa/sg.c			optional	sg	device-driver
 i386/isa/sio.c			optional	sio	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/dsp.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/midi.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/pro_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/sequencer.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/midi.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/pro_midi.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/soundcard.c	optional	snd	device-driver
 i386/isa/spkr.c			optional	speaker
 i386/isa/tw.c			optional	tw	device-driver