diff options
| author | Niels Provos <provos@cvs.openbsd.org> | 1998-04-26 21:03:19 +0000 |
|---|---|---|
| committer | Niels Provos <provos@cvs.openbsd.org> | 1998-04-26 21:03:19 +0000 |
| commit | 74d8ccd39b9fa27c65fe29abc88e61deea50b102 (patch) | |
| tree | ad8b9504a859efe3f96a8cc68f4c3e76f16886a0 /sys/dev/isa/ics2101var.h | |
| parent | db97ee572f05c64c35bd40855c1b415a3b4f08ab (diff) | |
update audio from NetBSD, mostly by Lennart Augustsson <augustss@cs.chalmers.se>
Diffstat (limited to 'sys/dev/isa/ics2101var.h')
| -rw-r--r-- | sys/dev/isa/ics2101var.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/isa/ics2101var.h b/sys/dev/isa/ics2101var.h index b9a61a63758..26d88f71717 100644 --- a/sys/dev/isa/ics2101var.h +++ b/sys/dev/isa/ics2101var.h @@ -1,5 +1,5 @@ -/* $OpenBSD: ics2101var.h,v 1.2 1996/03/08 16:42:58 niklas Exp $ */ -/* $NetBSD: ics2101var.h,v 1.3 1996/02/05 02:22:12 jtc Exp $ */ +/* $OpenBSD: ics2101var.h,v 1.3 1998/04/26 21:02:45 provos Exp $ */ +/* $NetBSD: ics2101var.h,v 1.5 1997/10/09 07:57:24 jtc Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -27,8 +27,8 @@ * 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 + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION 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 @@ -41,6 +41,9 @@ #define ICSMIX_RIGHT 1 /* Value for right channel */ struct ics2101_softc { + bus_space_tag_t sc_iot; /* tag */ + bus_space_handle_t sc_selio_ioh; + bus_space_handle_t sc_dataio_ioh; u_short sc_selio; /* select I/O address */ u_short sc_dataio; /* data I/O address */ int sc_flags; /* Various flags */ |