diff --git a/sys/dev/ic/interwave.c b/sys/dev/ic/interwave.c index d968b94a6263..e3802066408d 100644 --- a/sys/dev/ic/interwave.c +++ b/sys/dev/ic/interwave.c @@ -1,4 +1,4 @@ -/* $NetBSD: interwave.c,v 1.6 1998/04/20 20:58:05 augustss Exp $ */ +/* $NetBSD: interwave.c,v 1.7 1998/06/10 10:24:13 bouyer Exp $ */ /* * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -1015,7 +1015,7 @@ iw_init_output(addr, buf, cc) DPRINTF(("iw_init_output\n")); - isa_dmastart(sc->sc_isa, sc->sc_playdrq, buf, + isa_dmastart(sc->sc_ic, sc->sc_playdrq, buf, cc, NULL, DMAMODE_WRITE | DMAMODE_LOOP, BUS_DMA_NOWAIT); return 0; } @@ -1030,7 +1030,7 @@ iw_init_input(addr, buf, cc) DPRINTF(("iw_init_input\n")); - isa_dmastart(sc->sc_isa, sc->sc_playdrq, buf, + isa_dmastart(sc->sc_ic, sc->sc_playdrq, buf, cc, NULL, DMAMODE_READ | DMAMODE_LOOP, BUS_DMA_NOWAIT); return 0; } @@ -1069,7 +1069,7 @@ iw_start_output(addr, p, cc, intr, arg) counter = 0; - isa_dmastart(sc->sc_isa, sc->sc_playdrq, sc->sc_playdma_bp, + isa_dmastart(sc->sc_ic, sc->sc_playdrq, sc->sc_playdma_bp, cc, NULL, DMAMODE_WRITE, BUS_DMA_NOWAIT); @@ -1136,7 +1136,7 @@ iw_start_input(addr, p, cc, intr, arg) counter = 0; - isa_dmastart(sc->sc_isa, sc->sc_recdrq, sc->sc_recdma_bp, + isa_dmastart(sc->sc_ic, sc->sc_recdrq, sc->sc_recdma_bp, cc, NULL, DMAMODE_READ, BUS_DMA_NOWAIT); @@ -1619,7 +1619,7 @@ iw_malloc(addr, size, pool, flags) { struct iw_softc *sc = addr; - return isa_malloc(sc->sc_isa, 4, size, pool, flags); + return isa_malloc(sc->sc_ic, 4, size, pool, flags); } void diff --git a/sys/dev/ic/interwavevar.h b/sys/dev/ic/interwavevar.h index 0f69387f9fb1..a1936df174bb 100644 --- a/sys/dev/ic/interwavevar.h +++ b/sys/dev/ic/interwavevar.h @@ -1,7 +1,7 @@ #ifndef INTERWAVEVAR_H #define INTERWAVEVAR_H -/* $NetBSD: interwavevar.h,v 1.3 1997/10/19 07:42:11 augustss Exp $ */ +/* $NetBSD: interwavevar.h,v 1.4 1998/06/10 10:24:13 bouyer Exp $ */ /* * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -84,7 +84,7 @@ typedef struct iw_port_info { struct iw_softc { struct device sc_dev; bus_space_tag_t sc_iot; /* bus cookie */ - struct device *sc_isa; + isa_chipset_tag_t sc_ic; int vers; int revision;