Something got spammed in my 2.2 work tree (don't know how :( ) and
had a 2.1 tag, thus sending these two changes into the 2.1 branch instead of -current. Argh. I may bring these changes into the 2.1 anyway (they're benign there) so I'm not going to admin them out of 2.1 for the time being.
This commit is contained in:
Jordan K. Hubbard
parent
4fb1d90a95
commit
d1a599c2de
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=10518
@ -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.196 1995/08/27 14:13:04 joerg Exp $
|
||||
# $Id: LINT,v 1.197 1995/08/28 17:03:09 jkh 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
|
||||
@ -614,7 +614,6 @@ device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr
|
||||
# pas: ProAudioSpectrum PCM and MIDI
|
||||
# gus: Gravis Ultrasound - Ultrasound, Ultrasound 16, Ultrasound MAX
|
||||
# gusxvi: Gravis Ultrasound 16-bit PCM (do not use)
|
||||
# gusmax: Gravis Ultrasound MAX (currently broken)
|
||||
# mss: Microsoft Sound System
|
||||
# opl: Yamaha OPL-2 and OPL-3 FM - SB, SB Pro, SB 16, ProAudioSpectrum
|
||||
# uart: stand-alone 6850 UART for MIDI
|
||||
@ -629,23 +628,31 @@ device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr
|
||||
# If you don't have a lpt0 device at IRQ 7, you can remove the
|
||||
# ``conflicts'' specification in the appropriate device entries below.
|
||||
#
|
||||
|
||||
# Use this if you have a Gravis Ultrasound MAX card.
|
||||
options GUSMAX
|
||||
# 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.
|
||||
#
|
||||
# The i386/isa/sound/sound.doc has more information.
|
||||
|
||||
# Controls all sound devices
|
||||
controller snd0
|
||||
device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr
|
||||
device sb0 at isa? port 0x220 irq 7 conflicts drq 1 vector sbintr
|
||||
device sbxvi0 at isa? drq 5
|
||||
device sbmidi0 at isa? port 0x330
|
||||
device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr
|
||||
device gus0 at isa? port 0x220 irq 11 drq 1 vector gusintr
|
||||
# The following two apparently do not work and may never. Use GUSMAX option
|
||||
# above, instead.
|
||||
#device gusxvi0 at isa? port 0x530 irq 7 conflicts drq 3 vector adintr
|
||||
#device gusmax0 at isa? port 0x32c
|
||||
device gus0 at isa? port 0x220 irq 10 drq 1 vector gusintr
|
||||
#device gus0 at isa? port 0x220 irq 10 drq 1 flags 0x3 vector gusintr
|
||||
device mss0 at isa? port 0x530 irq 10 drq 1 vector adintr
|
||||
device opl0 at isa? port 0x388
|
||||
device opl0 at isa? port 0x388 conflicts
|
||||
device mpu0 at isa? port 0x330 irq 6 drq 0
|
||||
device uart0 at isa? port 0x330 irq 5 vector "m6850intr"
|
||||
|
||||
|
||||
@ -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.103 1995/08/05 21:32:52 peter Exp $
|
||||
# $Id: files.i386,v 1.104 1995/08/18 11:26:19 jkh Exp $
|
||||
#
|
||||
aic7xxx_asm optional ahc device-driver \
|
||||
dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \
|
||||
@ -135,7 +135,7 @@ i386/isa/sound/sound_timer.c optional gus 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 gusmax device-driver
|
||||
i386/isa/sound/ad1848.c optional gus device-driver
|
||||
i386/isa/sound/ad1848.c optional mss device-driver
|
||||
i386/isa/sound/midi_synth.c optional mss device-driver
|
||||
i386/isa/sound/midibuf.c optional mss device-driver
|
||||
|
||||
@ -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.196 1995/08/27 14:13:04 joerg Exp $
|
||||
# $Id: LINT,v 1.197 1995/08/28 17:03:09 jkh 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
|
||||
@ -614,7 +614,6 @@ device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr
|
||||
# pas: ProAudioSpectrum PCM and MIDI
|
||||
# gus: Gravis Ultrasound - Ultrasound, Ultrasound 16, Ultrasound MAX
|
||||
# gusxvi: Gravis Ultrasound 16-bit PCM (do not use)
|
||||
# gusmax: Gravis Ultrasound MAX (currently broken)
|
||||
# mss: Microsoft Sound System
|
||||
# opl: Yamaha OPL-2 and OPL-3 FM - SB, SB Pro, SB 16, ProAudioSpectrum
|
||||
# uart: stand-alone 6850 UART for MIDI
|
||||
@ -629,23 +628,31 @@ device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr
|
||||
# If you don't have a lpt0 device at IRQ 7, you can remove the
|
||||
# ``conflicts'' specification in the appropriate device entries below.
|
||||
#
|
||||
|
||||
# Use this if you have a Gravis Ultrasound MAX card.
|
||||
options GUSMAX
|
||||
# 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.
|
||||
#
|
||||
# The i386/isa/sound/sound.doc has more information.
|
||||
|
||||
# Controls all sound devices
|
||||
controller snd0
|
||||
device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr
|
||||
device sb0 at isa? port 0x220 irq 7 conflicts drq 1 vector sbintr
|
||||
device sbxvi0 at isa? drq 5
|
||||
device sbmidi0 at isa? port 0x330
|
||||
device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr
|
||||
device gus0 at isa? port 0x220 irq 11 drq 1 vector gusintr
|
||||
# The following two apparently do not work and may never. Use GUSMAX option
|
||||
# above, instead.
|
||||
#device gusxvi0 at isa? port 0x530 irq 7 conflicts drq 3 vector adintr
|
||||
#device gusmax0 at isa? port 0x32c
|
||||
device gus0 at isa? port 0x220 irq 10 drq 1 vector gusintr
|
||||
#device gus0 at isa? port 0x220 irq 10 drq 1 flags 0x3 vector gusintr
|
||||
device mss0 at isa? port 0x530 irq 10 drq 1 vector adintr
|
||||
device opl0 at isa? port 0x388
|
||||
device opl0 at isa? port 0x388 conflicts
|
||||
device mpu0 at isa? port 0x330 irq 6 drq 0
|
||||
device uart0 at isa? port 0x330 irq 5 vector "m6850intr"
|
||||
|
||||
|
||||
@ -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.196 1995/08/27 14:13:04 joerg Exp $
|
||||
# $Id: LINT,v 1.197 1995/08/28 17:03:09 jkh 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
|
||||
@ -614,7 +614,6 @@ device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr
|
||||
# pas: ProAudioSpectrum PCM and MIDI
|
||||
# gus: Gravis Ultrasound - Ultrasound, Ultrasound 16, Ultrasound MAX
|
||||
# gusxvi: Gravis Ultrasound 16-bit PCM (do not use)
|
||||
# gusmax: Gravis Ultrasound MAX (currently broken)
|
||||
# mss: Microsoft Sound System
|
||||
# opl: Yamaha OPL-2 and OPL-3 FM - SB, SB Pro, SB 16, ProAudioSpectrum
|
||||
# uart: stand-alone 6850 UART for MIDI
|
||||
@ -629,23 +628,31 @@ device nnic0 at isa? port 0x150 iomem 0xe0000 tty irq 12 vector nnicintr
|
||||
# If you don't have a lpt0 device at IRQ 7, you can remove the
|
||||
# ``conflicts'' specification in the appropriate device entries below.
|
||||
#
|
||||
|
||||
# Use this if you have a Gravis Ultrasound MAX card.
|
||||
options GUSMAX
|
||||
# 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.
|
||||
#
|
||||
# The i386/isa/sound/sound.doc has more information.
|
||||
|
||||
# Controls all sound devices
|
||||
controller snd0
|
||||
device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr
|
||||
device sb0 at isa? port 0x220 irq 7 conflicts drq 1 vector sbintr
|
||||
device sbxvi0 at isa? drq 5
|
||||
device sbmidi0 at isa? port 0x330
|
||||
device pas0 at isa? port 0x388 irq 10 drq 6 vector pasintr
|
||||
device gus0 at isa? port 0x220 irq 11 drq 1 vector gusintr
|
||||
# The following two apparently do not work and may never. Use GUSMAX option
|
||||
# above, instead.
|
||||
#device gusxvi0 at isa? port 0x530 irq 7 conflicts drq 3 vector adintr
|
||||
#device gusmax0 at isa? port 0x32c
|
||||
device gus0 at isa? port 0x220 irq 10 drq 1 vector gusintr
|
||||
#device gus0 at isa? port 0x220 irq 10 drq 1 flags 0x3 vector gusintr
|
||||
device mss0 at isa? port 0x530 irq 10 drq 1 vector adintr
|
||||
device opl0 at isa? port 0x388
|
||||
device opl0 at isa? port 0x388 conflicts
|
||||
device mpu0 at isa? port 0x330 irq 6 drq 0
|
||||
device uart0 at isa? port 0x330 irq 5 vector "m6850intr"
|
||||
|
||||
|
||||
@ -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.103 1995/08/05 21:32:52 peter Exp $
|
||||
# $Id: files.i386,v 1.104 1995/08/18 11:26:19 jkh Exp $
|
||||
#
|
||||
aic7xxx_asm optional ahc device-driver \
|
||||
dependency "$S/dev/aic7xxx/aic7xxx_asm.c" \
|
||||
@ -135,7 +135,7 @@ i386/isa/sound/sound_timer.c optional gus 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 gusmax device-driver
|
||||
i386/isa/sound/ad1848.c optional gus device-driver
|
||||
i386/isa/sound/ad1848.c optional mss device-driver
|
||||
i386/isa/sound/midi_synth.c optional mss device-driver
|
||||
i386/isa/sound/midibuf.c optional mss device-driver
|
||||
|
||||
Loading…
Reference in New Issue
Block a user