Allow the pnp and pci cards to be attached with just a 'device pcm' in

the user's config file.  Based on an idea/suggestion from Cameron (cg).

Change LINT to build newpcm instead of the old Voxware derived stuff.
That's much more useful in the longer term.

2 files changed, 46 insertions, 54 deletions

diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index b86aa23..3d82a4d 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -1393,47 +1393,43 @@ options 	NATM			#native ATM
 # Controls all "VOXWARE" driver sound devices.  See Luigi's driver
 # below for an alternate which may work better for some cards.
 #
-device		snd
-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
+#device		snd
+#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
 
 # The newpcm driver (use INSTEAD of snd0 and all VOXWARE drivers!).
 # Note that motherboard sound devices may require options PNPBIOS.
 #
 # For non-pnp sound cards with no bridge drivers only:
-#device		pcm0 at isa? irq 10 drq 1 flags 0x0
+device		pcm0 at isa? irq 10 drq 1 flags 0x0
 #
-# For pnp sound cards:
-#device		pcm
+# For PnP/PCI sound cards:
+device		pcm
 
 # The bridge drivers for sound cards. Do not forget pcm as well.
 #
 # 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 PnP or PCI cards:
-#device		sbc
-#device		gusc
-#device		csa
+# pcm:  Crystal Semiconductor CS461x/428x PCI
+# pcm:  Neomagic 256AV (ac97 version)
 
 # For non-PnP cards:
-#device		sbc0	at isa? port 0x220 irq 5 drq 1 flags 0x15
-#device		gusc0	at isa? port 0x220 irq 5 drq 1 flags 0x13
+device		sbc0	at isa? port 0x220 irq 5 drq 1 flags 0x15
+device		gusc0	at isa? port 0x220 irq 5 drq 1 flags 0x13
 
 # Not controlled by `snd'
 device		pca0 at isa? port IO_TIMER1
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index b86aa23..3d82a4d 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1393,47 +1393,43 @@ options 	NATM			#native ATM
 # Controls all "VOXWARE" driver sound devices.  See Luigi's driver
 # below for an alternate which may work better for some cards.
 #
-device		snd
-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
+#device		snd
+#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
 
 # The newpcm driver (use INSTEAD of snd0 and all VOXWARE drivers!).
 # Note that motherboard sound devices may require options PNPBIOS.
 #
 # For non-pnp sound cards with no bridge drivers only:
-#device		pcm0 at isa? irq 10 drq 1 flags 0x0
+device		pcm0 at isa? irq 10 drq 1 flags 0x0
 #
-# For pnp sound cards:
-#device		pcm
+# For PnP/PCI sound cards:
+device		pcm
 
 # The bridge drivers for sound cards. Do not forget pcm as well.
 #
 # 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 PnP or PCI cards:
-#device		sbc
-#device		gusc
-#device		csa
+# pcm:  Crystal Semiconductor CS461x/428x PCI
+# pcm:  Neomagic 256AV (ac97 version)
 
 # For non-PnP cards:
-#device		sbc0	at isa? port 0x220 irq 5 drq 1 flags 0x15
-#device		gusc0	at isa? port 0x220 irq 5 drq 1 flags 0x13
+device		sbc0	at isa? port 0x220 irq 5 drq 1 flags 0x15
+device		gusc0	at isa? port 0x220 irq 5 drq 1 flags 0x13
 
 # Not controlled by `snd'
 device		pca0 at isa? port IO_TIMER1