diff options
Diffstat (limited to 'sys/dev/isa/gus_isa.c')
| -rw-r--r-- | sys/dev/isa/gus_isa.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/isa/gus_isa.c b/sys/dev/isa/gus_isa.c index b7e213b7ade..3bba9839f1d 100644 --- a/sys/dev/isa/gus_isa.c +++ b/sys/dev/isa/gus_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gus_isa.c,v 1.1 1999/07/05 20:08:37 deraadt Exp $ */ +/* $OpenBSD: gus_isa.c,v 1.2 2001/01/29 05:30:31 mickey Exp $ */ /* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */ /*- @@ -18,10 +18,10 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: - * This product includes software developed by the NetBSD + * This product includes software developed by the NetBSD * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS @@ -42,7 +42,7 @@ * TODO: * . figure out why mixer activity while sound is playing causes problems * (phantom interrupts?) - * . figure out a better deinterleave strategy that avoids sucking up + * . figure out a better deinterleave strategy that avoids sucking up * CPU, memory and cache bandwidth. (Maybe a special encoding? * Maybe use the double-speed sampling/hardware deinterleave trick * from the GUS SDK?) A 486/33 isn't quite fast enough to keep @@ -58,7 +58,7 @@ * available on the net at: * * ftp://freedom.nmsu.edu/pub/ultrasound/gravis/util/ - * gusdkXXX.zip (developers' kit--get rev 2.22 or later) + * gusdkXXX.zip (developers' kit--get rev 2.22 or later) * See ultrawrd.doc inside--it's MS Word (ick), but it's the bible * */ @@ -78,17 +78,17 @@ * | | play (dram) | +----+ | | * | |--------------(------|-\ | | +-+ | * +---------+ | | >-|----|---|C|--|------ dma chan 1 - * | +---|-/ | | +-+ | + * | +---|-/ | | +-+ | * | | +----+ | | | * | | +----+ | | | * +---------+ +-+ +--(---|-\ | | | | * | | play |8| | | >-|----|----+---|------ dma chan 2 * | ---C----|--------|/|------(---|-/ | | | * | ^ |record |1| | +----+ | | - * | | | /----|6|------+ +--------+ + * | | | /----|6|------+ +--------+ * | ---+----|--/ +-+ * +---------+ - * CS4231 8-to-16 bit bus conversion, if needed + * CS4231 8-to-16 bit bus conversion, if needed * * * "C" is an optional combiner. @@ -106,6 +106,7 @@ #include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/kernel.h> +#include <sys/timeout.h> #include <machine/cpu.h> #include <machine/intr.h> |