From 2fba0f875bddb23d8bff98b12b33e0d0df5c0aa0 Mon Sep 17 00:00:00 2001 From: mycroft Date: Mon, 22 Mar 1999 07:50:29 +0000 Subject: [PATCH] More sound cards for testing... --- sys/arch/i386/conf/BIKINI | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/arch/i386/conf/BIKINI b/sys/arch/i386/conf/BIKINI index 3846960533d9..ec405f5d1ac7 100644 --- a/sys/arch/i386/conf/BIKINI +++ b/sys/arch/i386/conf/BIKINI @@ -1,4 +1,4 @@ -# $NetBSD: BIKINI,v 1.8 1999/03/14 10:34:18 mycroft Exp $ +# $NetBSD: BIKINI,v 1.9 1999/03/22 07:50:29 mycroft Exp $ # From: GENERIC,v 1.220 1999/02/16 17:46:17 abs Exp # # BIKINI -- Mycroft's development machine @@ -360,7 +360,7 @@ st* at scsibus? target ? lun ? # SCSI tape drives pciide* at pci ? dev ? function ? flags 0x0000 # ISA Plug-and-Play IDE controllers -#wdc* at isapnp? +wdc* at isapnp? # PCMCIA IDE controllers #wdc* at pcmcia? function ? @@ -380,11 +380,11 @@ pciide* at pci ? dev ? function ? flags 0x0000 # 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'. # (0xc=1100, 0xa=1010, 0xf=1111) # 0x0000 means "use whatever the drive claims to support". -#wd* at wdc? channel ? drive ? flags 0x0000 +wd* at wdc? channel ? drive ? flags 0x0000 wd* at pciide? channel ? drive ? flags 0x0000 # ATAPI bus support -#atapibus* at wdc? channel ? +atapibus* at wdc? channel ? atapibus* at pciide? channel ? # ATAPI devices @@ -519,8 +519,9 @@ sv* at pci? dev ? function ? # S3 SonicVibes # ISA Plug-and-Play audio devices #ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio #guspnp* at isapnp? # Gravis Ultra Sound PnP audio +#mpu* at isapnp? # MPU401 clones sb* at isapnp? # SoundBlaster-compatible audio -#wss* at isapnp? # Windows Sound System +wss* at isapnp? # Windows Sound System #ym* at isapnp? # Yamaha OPL3-SA3 audio # ISA audio devices @@ -529,7 +530,8 @@ sb* at isapnp? # SoundBlaster-compatible audio #pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum #pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System #sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver -#sb0 at isa? port 0x220 irq 5 drq 1 drq2 5 # SoundBlaster +sb0 at isa? port 0x260 irq 5 drq 1 # SoundBlaster 1 +sb1 at isa? port 0x240 irq 7 drq 1 # SoundBlaster 2 #wss0 at isa? port 0x530 irq 10 drq 0 drq2 1 # Windows Sound System # OPL[23] FM syntheziers @@ -552,13 +554,14 @@ audio* at sb? #audio* at sp? audio* at sv? #audio* at uaudio? -#audio* at wss? +audio* at wss? #audio* at ym? # MIDI support midi* at pcppi? # MIDI interface to the PC speaker midi* at sb? # SB MPU401 port midi* at opl? # OPL FM synth +#midi* at mpu? # MPU401 UARTs # The spkr driver provides a simple tone interface to the built in speaker. #spkr0 at pcppi? # PC speaker @@ -588,7 +591,7 @@ midi* at opl? # OPL FM synth joy* at isapnp? # Game ports (usually on audio cards) # ISA joysticks. Probe is a little strange; add only if you have one. -#joy0 at isa? port 0x201 +joy0 at isa? port 0x201 # Miscellaneous Devices