diff options
| author |   deraadt <deraadt@openbsd.org> | 1996-04-21 22:14:33 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1996-04-21 22:14:33 +0000 |
| commit | d724e01ae4dac35949585b9083e28ff2ba35b0b5 (patch) | |
| tree | 37282f1ae947a4e9508b73ff86cad13f75eb9860 /sys/dev/isa/gus.c | |
| parent | no need to remove limits.h; another workaround exists (diff) | |
| download | wireguard-openbsd-d724e01ae4dac35949585b9083e28ff2ba35b0b5.tar.xz wireguard-openbsd-d724e01ae4dac35949585b9083e28ff2ba35b0b5.zip | |
partial sync with netbsd 960418, more to come
Diffstat (limited to 'sys/dev/isa/gus.c')
| -rw-r--r-- | sys/dev/isa/gus.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c index a2c1b4f2014..9a72f7a6182 100644 --- a/sys/dev/isa/gus.c +++ b/sys/dev/isa/gus.c @@ -1,5 +1,5 @@ -/* $OpenBSD: gus.c,v 1.8 1996/04/18 23:47:34 niklas Exp $ */ -/* $NetBSD: gus.c,v 1.10 1996/03/01 04:08:31 mycroft Exp $ */ +/* $OpenBSD: gus.c,v 1.9 1996/04/21 22:23:28 deraadt Exp $ */ +/* $NetBSD: gus.c,v 1.13 1996/04/11 22:28:42 cgd Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -126,6 +126,7 @@ #include <dev/ic/ad1848reg.h> #include <dev/isa/ics2101var.h> #include <dev/isa/ad1848var.h> +#include <dev/isa/cs4231var.h> #include "gusreg.h" #ifdef AUDIO_DEBUG @@ -458,8 +459,12 @@ STATIC void gusics_cd_mute __P((struct ics2101_softc *, int)); 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) +struct cfattach gus_ca = { + sizeof(struct gus_softc), gusprobe, gusattach, +}; + +struct cfdriver gus_cd = { + NULL, "gus", DV_DULL }; @@ -927,8 +932,8 @@ gusattach(parent, self, aux) /* XXX we shouldn't have to use splgus == splclock, nor should * we use IPL_CLOCK. */ - sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, gusintr, - sc /* sc->sc_gusdsp */, sc->sc_dev.dv_xname); + sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE, + IPL_AUDIO, gusintr, sc /* sc->sc_gusdsp */, sc->sc_dev.dv_xname); /* * Set some default values @@ -974,9 +979,9 @@ gusopen(dev, flags) DPRINTF(("gusopen() called\n")); - if (unit >= guscd.cd_ndevs) + if (unit >= gus_cd.cd_ndevs) return ENXIO; - sc = guscd.cd_devs[unit]; + sc = gus_cd.cd_devs[unit]; if (!sc) return ENXIO; |