diff options
Diffstat (limited to 'sys/dev/isa/gus.c')
| -rw-r--r-- | sys/dev/isa/gus.c | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c index 231d61e7dcc..bdf18af3edf 100644 --- a/sys/dev/isa/gus.c +++ b/sys/dev/isa/gus.c @@ -1,8 +1,12 @@ -/* $NetBSD: gus.c,v 1.3 1995/11/10 04:30:44 mycroft Exp $ */ +/* $OpenBSD: gus.c,v 1.5 1996/03/08 16:42:54 niklas Exp $ */ +/* $NetBSD: gus.c,v 1.7 1996/02/16 08:18:37 mycroft Exp $ */ -/* - * Copyright (c) 1994, 1995 Ken Hornstein. All rights reserved. - * Copyright (c) 1995 John T. Kohl. All rights reserved. +/*- + * Copyright (c) 1996 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Ken Hornstein and John Kohl. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -14,20 +18,23 @@ * 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 Ken Hornstein. - * 4. The name of the authors may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * 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 + * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. */ /* @@ -336,8 +343,6 @@ int dmarecord_index = 0; int gusopen __P((dev_t, int)); void gusclose __P((void *)); void gusmax_close __P((void *)); -int gusprobe ()/*__P((struct device *, struct device *, void *))*/; -void gusattach __P((struct device *, struct device *, void *)); int gusintr __P((void *)); int gus_set_in_gain __P((caddr_t, u_int, u_char)); int gus_get_in_gain __P((caddr_t)); @@ -444,6 +449,9 @@ static void gusics_cd_mute __P((struct ics2101_softc *, int)); * ISA bus driver routines */ +int gusprobe __P((struct device *, void *, void *)); +void gusattach __P((struct device *, struct device *, void *)); + struct cfdriver guscd = { NULL, "gus", gusprobe, gusattach, DV_DULL, sizeof(struct gus_softc) }; @@ -653,11 +661,11 @@ struct audio_device gus_device = { int -gusprobe(parent, self, aux) +gusprobe(parent, match, aux) struct device *parent, *self; - void *aux; + void *match, *aux; { - register struct gus_softc *sc = (void *) self; + register struct gus_softc *sc = match; register struct isa_attach_args *ia = aux; struct cfdata *cf = sc->sc_dev.dv_cfdata; register int iobase = ia->ia_iobase; |