diff options
author | jmg <jmg@FreeBSD.org> | 1997-09-14 21:45:05 +0000 |
---|---|---|
committer | jmg <jmg@FreeBSD.org> | 1997-09-14 21:45:05 +0000 |
commit | 4a126fdd3454c164615722680e6876c285ebdfef (patch) | |
tree | c5333ba5a94b96caef39a71d9694e6d44aad2853 | |
parent | 64076aad209f864727924b5824ed94cd4e26f875 (diff) | |
download | FreeBSD-src-4a126fdd3454c164615722680e6876c285ebdfef.zip FreeBSD-src-4a126fdd3454c164615722680e6876c285ebdfef.tar.gz |
docment the new sound drivers in LINT and add the necessary files to
files.i386.
We aren't sure if this new code and the old sound code will co-exist in a
kernel, so the device pcm0 line is left commented out in LINT.
Submitted-by: Luigi Rizzo
-rw-r--r-- | sys/conf/NOTES | 21 | ||||
-rw-r--r-- | sys/conf/files.i386 | 7 | ||||
-rw-r--r-- | sys/i386/conf/LINT | 21 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 21 | ||||
-rw-r--r-- | sys/i386/conf/files.i386 | 7 |
5 files changed, 72 insertions, 5 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index e470f53..669dcff 100644 --- a/sys/conf/NOTES +++ b/sys/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.363 1997/09/09 12:40:53 jmg Exp $ +# $Id: LINT,v 1.364 1997/09/10 03:07:13 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 @@ -950,6 +950,22 @@ options NATM #native ATM # 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 is the work in progress from Luigi Rizzo. This has support for +# CS423x based cards, OPTi931, SB16 PnP, GusPnP. For more information +# about this driver, take a look at sys/i386/isa/snd/README. +# +# The flags of the device tells the device a bit more info about the +# device that normally is obtained through the PnP interface. +# bit 2..0 secondary DMA channel; +# bit 4 set if the board uses two dma channels; +# bit 15..8 board type, overrides autodetection; leave it +# 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 new PnP code if it's available. +# # pca: PCM audio through your PC speaker # # If you don't have a lpt0 device at IRQ 7, you can remove the @@ -989,6 +1005,9 @@ device uart0 at isa? port 0x330 irq 5 vector "m6850intr" #device sscape0 at isa? port 0x330 irq 6 drq 0 #device trix0 at isa? port 0x330 irq 6 drq 0 vector sscapeintr +# Luigi's snd code +# device pcm0 at isa? port ? tty irq 10 drq 1 flags 0x0 vector pcmintr + # Not controlled by `snd' device pca0 at isa? port IO_TIMER1 tty diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index b1e9c983..33cdb15 100644 --- a/sys/conf/files.i386 +++ b/sys/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.174 1997/09/03 03:44:58 gibbs Exp $ +# $Id: files.i386,v 1.175 1997/09/09 12:40:54 jmg Exp $ # aicasm optional ahc device-driver \ dependency "$S/dev/aic7xxx/*.[chyl]" \ @@ -173,6 +173,11 @@ i386/isa/seagate.c optional sea device-driver i386/isa/si.c optional si device-driver i386/isa/si_code.c optional si device-driver i386/isa/sio.c optional sio device-driver +i386/isa/snd/sound.c optional pcm device-driver +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 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 diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index e470f53..669dcff 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.363 1997/09/09 12:40:53 jmg Exp $ +# $Id: LINT,v 1.364 1997/09/10 03:07:13 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 @@ -950,6 +950,22 @@ options NATM #native ATM # 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 is the work in progress from Luigi Rizzo. This has support for +# CS423x based cards, OPTi931, SB16 PnP, GusPnP. For more information +# about this driver, take a look at sys/i386/isa/snd/README. +# +# The flags of the device tells the device a bit more info about the +# device that normally is obtained through the PnP interface. +# bit 2..0 secondary DMA channel; +# bit 4 set if the board uses two dma channels; +# bit 15..8 board type, overrides autodetection; leave it +# 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 new PnP code if it's available. +# # pca: PCM audio through your PC speaker # # If you don't have a lpt0 device at IRQ 7, you can remove the @@ -989,6 +1005,9 @@ device uart0 at isa? port 0x330 irq 5 vector "m6850intr" #device sscape0 at isa? port 0x330 irq 6 drq 0 #device trix0 at isa? port 0x330 irq 6 drq 0 vector sscapeintr +# Luigi's snd code +# device pcm0 at isa? port ? tty irq 10 drq 1 flags 0x0 vector pcmintr + # Not controlled by `snd' device pca0 at isa? port IO_TIMER1 tty diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index e470f53..669dcff 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.363 1997/09/09 12:40:53 jmg Exp $ +# $Id: LINT,v 1.364 1997/09/10 03:07:13 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 @@ -950,6 +950,22 @@ options NATM #native ATM # 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 is the work in progress from Luigi Rizzo. This has support for +# CS423x based cards, OPTi931, SB16 PnP, GusPnP. For more information +# about this driver, take a look at sys/i386/isa/snd/README. +# +# The flags of the device tells the device a bit more info about the +# device that normally is obtained through the PnP interface. +# bit 2..0 secondary DMA channel; +# bit 4 set if the board uses two dma channels; +# bit 15..8 board type, overrides autodetection; leave it +# 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 new PnP code if it's available. +# # pca: PCM audio through your PC speaker # # If you don't have a lpt0 device at IRQ 7, you can remove the @@ -989,6 +1005,9 @@ device uart0 at isa? port 0x330 irq 5 vector "m6850intr" #device sscape0 at isa? port 0x330 irq 6 drq 0 #device trix0 at isa? port 0x330 irq 6 drq 0 vector sscapeintr +# Luigi's snd code +# device pcm0 at isa? port ? tty irq 10 drq 1 flags 0x0 vector pcmintr + # Not controlled by `snd' device pca0 at isa? port IO_TIMER1 tty diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index b1e9c983..33cdb15 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.174 1997/09/03 03:44:58 gibbs Exp $ +# $Id: files.i386,v 1.175 1997/09/09 12:40:54 jmg Exp $ # aicasm optional ahc device-driver \ dependency "$S/dev/aic7xxx/*.[chyl]" \ @@ -173,6 +173,11 @@ i386/isa/seagate.c optional sea device-driver i386/isa/si.c optional si device-driver i386/isa/si_code.c optional si device-driver i386/isa/sio.c optional sio device-driver +i386/isa/snd/sound.c optional pcm device-driver +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 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 |