diff options
author | peter <peter@FreeBSD.org> | 1999-01-01 08:09:58 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-01-01 08:09:58 +0000 |
commit | cfef427a396353878f1fdad225686030324bda8e (patch) | |
tree | 4c2a132a1d388243f6c1c5a716be84ea093a8d05 /sys/i386 | |
parent | 59c8ef1b2ef3ef0e5ae19d3704e0d998e525a9ee (diff) | |
download | FreeBSD-src-cfef427a396353878f1fdad225686030324bda8e.zip FreeBSD-src-cfef427a396353878f1fdad225686030324bda8e.tar.gz |
Part 1 of pcvt/voxware revival. I hope I have not clobbered any other
deltas, but it is possible since I had a few merge conflicts over the last
few days while this has been sitting ready to go.
Approved by: core
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/conf/GENERIC | 9 | ||||
-rw-r--r-- | sys/i386/conf/LINT | 93 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 93 | ||||
-rw-r--r-- | sys/i386/conf/files.i386 | 72 | ||||
-rw-r--r-- | sys/i386/conf/options.i386 | 22 |
5 files changed, 275 insertions, 14 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 1d2cc2c..ef57d0a 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.139 1998/12/27 13:40:55 phk Exp $ +# $Id: GENERIC,v 1.140 1998/12/27 13:55:47 sos Exp $ machine "i386" cpu "I386_CPU" @@ -108,7 +108,14 @@ controller matcd0 at isa? port 0x230 bio device scd0 at isa? port 0x230 bio +# syscons is the default console driver, resembling an SCO console device sc0 at isa? port IO_KBD conflicts tty irq 1 +# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver +#device vt0 at isa? port IO_KBD conflicts tty irq 1 +#options XSERVER # support for X server +#options FAT_CURSOR # start with block cursor +# If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines +#options PCVT_SCANSET=2 # IBM keyboards are non-std device npx0 at isa? port IO_NPX irq 13 diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 98efea8..4dd4be2 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -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.524 1998/12/31 08:03:52 luigi Exp $ +# $Id: LINT,v 1.525 1999/01/01 04:16:32 peter 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 @@ -824,6 +824,13 @@ options "NTIMECOUNTER=20" # configure cards from USERCONFIG. See pnp(4) for more info. controller pnp0 +# The pcvt console driver (vt220 compatible). +device vt0 at isa? port IO_KBD conflicts tty irq 1 +options XSERVER # support for running an X server. +options FAT_CURSOR # start with block cursor +# This PCVT option is for keyboards such as those used on IBM ThinkPad laptops +options PCVT_SCANSET=2 # IBM keyboards are non-std + # The syscons console driver (sco color console compatible). device sc0 at isa? port IO_KBD conflicts tty irq 1 options MAXCONS=16 # number of virtual consoles @@ -1148,6 +1155,28 @@ device en0 device en1 options NATM #native ATM +# +# Audio drivers: `snd', `sb', `pas', `gus', `pca' +# +# snd: Voxware sound support code +# sb: SoundBlaster PCM - SoundBlaster, SB Pro, SB16, ProAudioSpectrum +# sbxvi: SoundBlaster 16 +# sbmidi: SoundBlaster 16 MIDI interface +# pas: ProAudioSpectrum PCM and MIDI +# gus: Gravis Ultrasound - Ultrasound, Ultrasound 16, Ultrasound MAX +# gusxvi: Gravis Ultrasound 16-bit PCM (do not use) +# mss: Microsoft Sound System +# css: Crystal Sound System (CSS 423x PnP) +# sscape: Ensoniq Soundscape MIDI interface +# sscape_mss: Ensoniq Soundscape PCM (requires sscape) +# opl: Yamaha OPL-2 and OPL-3 FM - SB, SB Pro, SB 16, ProAudioSpectrum +# uart: stand-alone 6850 UART for MIDI +# mpu: Roland MPU-401 stand-alone card +# +# Beware! The addresses specified below are also hard-coded in +# i386/isa/sound/sound_config.h. If you change the values here, you +# must also change the values in the include file. +# # pcm: PCM audio through various sound cards. # # This has support for a large number of new audio cards, based on @@ -1163,12 +1192,56 @@ options NATM #native ATM # zero if don't know what to put in (and you don't, # since this is unsupported at the moment...). # -# This driver will use the PnP code if it's available. -# See the "controller pnp" option and pnp.4 man page. -device pcm0 at isa? port ? tty irq 5 drq 1 flags 0x15 - +# This driver will use the new PnP code if it's available. +# # pca: PCM audio through your PC speaker # +# 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. +# +# To overide the GUS defaults use: +# options GUS_DMA2 +# options GUS_DMA +# options GUS_IRQ +# +# The i386/isa/sound/sound.doc has more information. + +# Controls all "VOXWARE" driver sound devices. See Luigi's driver +# below for an alternate which may work better for some cards. +# +controller snd0 +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 + +# Luigi's snd code (use INSTEAD of snd0 and all VOXWARE drivers!). +# You may also wish to enable the pnp controller with this, for pnp +# sound cards. +# +#device pcm0 at isa? port ? tty irq 10 drq 1 flags 0x0 + # Not controlled by `snd' device pca0 at isa? port "IO_TIMER1" tty @@ -1760,6 +1833,16 @@ options NETATALKDEBUG options NMBCLUSTERS=1024 options NPX_DEBUG options PANIC_REBOOT_WAIT_TIME=16 +options "PCVT_24LINESDEF" +options PCVT_CTRL_ALT_DEL +options PCVT_EMU_MOUSE +options PCVT_FREEBSD=211 +options PCVT_META_ESC +options PCVT_NSCREENS=9 +options PCVT_PRETTYSCRNS +options PCVT_SCREENSAVER +options PCVT_USEKBDSEC +options "PCVT_VT220KEYB" options PSM_DEBUG=1 options SCSI_NCR_DEBUG options SCSI_NCR_DFLT_TAGS=4 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 98efea8..4dd4be2 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -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.524 1998/12/31 08:03:52 luigi Exp $ +# $Id: LINT,v 1.525 1999/01/01 04:16:32 peter 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 @@ -824,6 +824,13 @@ options "NTIMECOUNTER=20" # configure cards from USERCONFIG. See pnp(4) for more info. controller pnp0 +# The pcvt console driver (vt220 compatible). +device vt0 at isa? port IO_KBD conflicts tty irq 1 +options XSERVER # support for running an X server. +options FAT_CURSOR # start with block cursor +# This PCVT option is for keyboards such as those used on IBM ThinkPad laptops +options PCVT_SCANSET=2 # IBM keyboards are non-std + # The syscons console driver (sco color console compatible). device sc0 at isa? port IO_KBD conflicts tty irq 1 options MAXCONS=16 # number of virtual consoles @@ -1148,6 +1155,28 @@ device en0 device en1 options NATM #native ATM +# +# Audio drivers: `snd', `sb', `pas', `gus', `pca' +# +# snd: Voxware sound support code +# sb: SoundBlaster PCM - SoundBlaster, SB Pro, SB16, ProAudioSpectrum +# sbxvi: SoundBlaster 16 +# sbmidi: SoundBlaster 16 MIDI interface +# pas: ProAudioSpectrum PCM and MIDI +# gus: Gravis Ultrasound - Ultrasound, Ultrasound 16, Ultrasound MAX +# gusxvi: Gravis Ultrasound 16-bit PCM (do not use) +# mss: Microsoft Sound System +# css: Crystal Sound System (CSS 423x PnP) +# sscape: Ensoniq Soundscape MIDI interface +# sscape_mss: Ensoniq Soundscape PCM (requires sscape) +# opl: Yamaha OPL-2 and OPL-3 FM - SB, SB Pro, SB 16, ProAudioSpectrum +# uart: stand-alone 6850 UART for MIDI +# mpu: Roland MPU-401 stand-alone card +# +# Beware! The addresses specified below are also hard-coded in +# i386/isa/sound/sound_config.h. If you change the values here, you +# must also change the values in the include file. +# # pcm: PCM audio through various sound cards. # # This has support for a large number of new audio cards, based on @@ -1163,12 +1192,56 @@ options NATM #native ATM # zero if don't know what to put in (and you don't, # since this is unsupported at the moment...). # -# This driver will use the PnP code if it's available. -# See the "controller pnp" option and pnp.4 man page. -device pcm0 at isa? port ? tty irq 5 drq 1 flags 0x15 - +# This driver will use the new PnP code if it's available. +# # pca: PCM audio through your PC speaker # +# 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. +# +# To overide the GUS defaults use: +# options GUS_DMA2 +# options GUS_DMA +# options GUS_IRQ +# +# The i386/isa/sound/sound.doc has more information. + +# Controls all "VOXWARE" driver sound devices. See Luigi's driver +# below for an alternate which may work better for some cards. +# +controller snd0 +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 + +# Luigi's snd code (use INSTEAD of snd0 and all VOXWARE drivers!). +# You may also wish to enable the pnp controller with this, for pnp +# sound cards. +# +#device pcm0 at isa? port ? tty irq 10 drq 1 flags 0x0 + # Not controlled by `snd' device pca0 at isa? port "IO_TIMER1" tty @@ -1760,6 +1833,16 @@ options NETATALKDEBUG options NMBCLUSTERS=1024 options NPX_DEBUG options PANIC_REBOOT_WAIT_TIME=16 +options "PCVT_24LINESDEF" +options PCVT_CTRL_ALT_DEL +options PCVT_EMU_MOUSE +options PCVT_FREEBSD=211 +options PCVT_META_ESC +options PCVT_NSCREENS=9 +options PCVT_PRETTYSCRNS +options PCVT_SCREENSAVER +options PCVT_USEKBDSEC +options "PCVT_VT220KEYB" options PSM_DEBUG=1 options SCSI_NCR_DEBUG options SCSI_NCR_DFLT_TAGS=4 diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 4f727b3..f955863 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.215 1998/12/27 21:46:55 phk Exp $ +# $Id: files.i386,v 1.216 1998/12/31 08:17:08 luigi Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -147,6 +147,12 @@ i386/isa/matcd/matcd.c optional matcd device-driver i386/isa/pcibus.c optional pci device-driver i386/isa/pcicx.c optional ze device-driver i386/isa/pcicx.c optional zp device-driver +i386/isa/pcvt/pcvt_drv.c optional vt device-driver +i386/isa/pcvt/pcvt_ext.c optional vt device-driver +i386/isa/pcvt/pcvt_kbd.c optional vt device-driver +i386/isa/pcvt/pcvt_out.c optional vt device-driver +i386/isa/pcvt/pcvt_sup.c optional vt device-driver +i386/isa/pcvt/pcvt_vtf.c optional vt device-driver i386/isa/pnp.c optional pnp device-driver i386/isa/prof_machdep.c optional profiling-routine i386/isa/ppc.c optional ppc device-driver @@ -165,7 +171,67 @@ i386/isa/snd/dmabuf.c optional pcm device-driver i386/isa/snd/ad1848.c optional pcm device-driver i386/isa/snd/sb_dsp.c optional pcm device-driver i386/isa/snd/clones.c optional pcm device-driver -pci/es1370.c optional pcm device-driver +i386/isa/sound/dev_table.c optional snd device-driver +i386/isa/sound/soundcard.c optional snd device-driver +i386/isa/sound/sound_switch.c optional snd device-driver +i386/isa/sound/audio.c optional snd device-driver +i386/isa/sound/dmabuf.c optional snd device-driver +i386/isa/sound/sys_timer.c optional snd device-driver +i386/isa/sound/sequencer.c optional snd device-driver +i386/isa/sound/patmgr.c optional snd device-driver +i386/isa/sound/adlib_card.c optional opl device-driver +i386/isa/sound/opl3.c optional opl device-driver +i386/isa/sound/gus_card.c optional gus device-driver +i386/isa/sound/gus_midi.c optional gus device-driver +i386/isa/sound/gus_vol.c optional gus device-driver +i386/isa/sound/gus_wave.c optional gus device-driver +i386/isa/sound/ics2101.c optional gus device-driver +i386/isa/sound/sound_timer.c optional gus device-driver +i386/isa/sound/sound_timer.c optional css device-driver +i386/isa/sound/sound_timer.c optional mss 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 gus device-driver +i386/isa/sound/ad1848.c optional mss device-driver +i386/isa/sound/ad1848.c optional css device-driver +i386/isa/sound/sound_timer.c optional mss device-driver +i386/isa/sound/midi_synth.c optional mss device-driver +i386/isa/sound/midibuf.c optional mss device-driver +i386/isa/sound/mpu401.c optional mpu device-driver +i386/isa/sound/midi_synth.c optional mpu device-driver +i386/isa/sound/midibuf.c optional mpu device-driver +i386/isa/sound/pas2_card.c optional pas device-driver +i386/isa/sound/pas2_midi.c optional pas device-driver +i386/isa/sound/pas2_mixer.c optional pas device-driver +i386/isa/sound/pas2_pcm.c optional pas device-driver +i386/isa/sound/midi_synth.c optional pas device-driver +i386/isa/sound/midibuf.c optional pas device-driver +i386/isa/sound/sb_card.c optional sb device-driver +i386/isa/sound/sb_dsp.c optional sb device-driver +i386/isa/sound/sb_midi.c optional sb device-driver +i386/isa/sound/sb_mixer.c optional sb device-driver +i386/isa/sound/midi_synth.c optional sb device-driver +i386/isa/sound/midibuf.c optional sb device-driver +i386/isa/sound/sb16_dsp.c optional sbxvi device-driver +i386/isa/sound/sb16_midi.c optional sbmidi device-driver +i386/isa/sound/uart6850.c optional uart device-driver +i386/isa/sound/midi_synth.c optional uart device-driver +i386/isa/sound/midi_synth.c optional css device-driver +i386/isa/sound/midibuf.c optional uart device-driver +i386/isa/sound/midibuf.c optional css device-driver +i386/isa/sound/trix.c optional trix device-driver +i386/isa/sound/adlib_card.c optional trix device-driver +i386/isa/sound/opl3.c optional trix device-driver +i386/isa/sound/ad1848.c optional trix device-driver +i386/isa/sound/sound_timer.c optional trix device-driver +i386/isa/sound/sscape.c optional sscape device-driver +i386/isa/sound/ad1848.c optional sscape device-driver +i386/isa/sound/sound_timer.c optional sscape device-driver +i386/isa/sound/mpu401.c optional sscape device-driver +i386/isa/sound/midi_synth.c optional sscape device-driver +i386/isa/sound/midibuf.c optional sscape device-driver +i386/isa/sound/cs4232.c optional css device-driver i386/isa/spigot.c optional spigot device-driver i386/isa/spkr.c optional speaker device-driver i386/isa/stallion.c optional stl device-driver @@ -273,4 +339,6 @@ gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate gnu/i386/isa/dgb.c optional dgb device-driver gnu/i386/isa/dgm.c optional dgm device-driver +gnu/i386/isa/sound/awe_wave.c optional awe device-driver +pci/es1370.c optional pcm device-driver pci/ide_pci.c optional wd device-driver diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 3a706ab..d9c3cad 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.99 1998/12/27 21:46:55 phk Exp $ +# $Id: options.i386,v 1.100 1998/12/27 23:23:19 msmith Exp $ DISABLE_PSE IDE_DELAY @@ -101,6 +101,26 @@ FDC_DEBUG opt_fdc.h FDC_PRINT_BOGUS_CHIPTYPE opt_fdc.h FDC_YE opt_fdc.h +# pcvt(4) has a bunch of options +FAT_CURSOR opt_pcvt.h +XSERVER opt_pcvt.h +PCVT_24LINESDEF opt_pcvt.h +PCVT_CTRL_ALT_DEL opt_pcvt.h +PCVT_EMU_MOUSE opt_pcvt.h +PCVT_FREEBSD opt_pcvt.h +PCVT_META_ESC opt_pcvt.h +PCVT_NSCREENS opt_pcvt.h +PCVT_PRETTYSCRNS opt_pcvt.h +PCVT_SCANSET opt_pcvt.h +PCVT_SCREENSAVER opt_pcvt.h +PCVT_USEKBDSEC opt_pcvt.h +PCVT_VT220KEYB opt_pcvt.h + +# voxware options +GUS_DMA2 opt_sound.h +GUS_DMA opt_sound.h +GUS_IRQ opt_sound.h + # Video spigot SPIGOT_UNSECURE opt_spigot.h # ------------------------------- |