diff options
author | peter <peter@FreeBSD.org> | 2000-01-29 17:28:48 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-01-29 17:28:48 +0000 |
commit | 46956a66e77a285428bc335f7ba46acbe9237643 (patch) | |
tree | 62d0923fe77ad62d44d98eeff36acefe18a5e487 | |
parent | e72f2900e8b7d8d9f36f6cea459ecad732becaff (diff) | |
download | FreeBSD-src-46956a66e77a285428bc335f7ba46acbe9237643.zip FreeBSD-src-46956a66e77a285428bc335f7ba46acbe9237643.tar.gz |
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.
-rw-r--r-- | sys/conf/NOTES | 50 | ||||
-rw-r--r-- | sys/conf/files | 6 | ||||
-rw-r--r-- | sys/i386/conf/LINT | 50 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 50 |
4 files changed, 73 insertions, 83 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index b86aa23..3d82a4d 100644 --- a/sys/conf/NOTES +++ b/sys/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 diff --git a/sys/conf/files b/sys/conf/files index 947f16a..e8f3fe5 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -959,8 +959,10 @@ isa/pnpparse.c optional isa dev/sound/isa/ad1816.c optional pcm isa dev/sound/isa/es1888.c optional pcm isa dev/sound/isa/gusc.c optional gusc pcm isa +dev/sound/isa/gusc.c optional pcm isa dev/sound/isa/mss.c optional pcm isa dev/sound/isa/sb.c optional pcm isa +dev/sound/isa/sbc.c optional pcm isa dev/sound/isa/sbc.c optional sbc pcm isa dev/sound/pcm/sound.c optional pcm dev/sound/pcm/ac97.c optional pcm @@ -969,8 +971,8 @@ dev/sound/pcm/channel.c optional pcm dev/sound/pcm/feeder.c optional pcm dev/sound/pcm/fake.c optional pcm dev/sound/pcm/mixer.c optional pcm -dev/sound/pci/csa.c optional csa pcm pci -dev/sound/pci/csapcm.c optional csa pcm pci +dev/sound/pci/csa.c optional pcm pci +dev/sound/pci/csapcm.c optional pcm pci dev/sound/pci/es137x.c optional pcm pci dev/sound/pci/neomagic.c optional pcm pci dev/sound/pci/t4dwave.c optional pcm pci 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 |