diff options
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/if_tr_isa.c | 3 | ||||
| -rw-r--r-- | sys/dev/isa/if_tribm_isa.c | 3 | ||||
| -rw-r--r-- | sys/dev/isa/if_trtcm_isa.c | 3 | ||||
| -rw-r--r-- | sys/dev/isa/isadma.c | 13 |
4 files changed, 15 insertions, 7 deletions
diff --git a/sys/dev/isa/if_tr_isa.c b/sys/dev/isa/if_tr_isa.c index bfd9bcfe485..48e1452366f 100644 --- a/sys/dev/isa/if_tr_isa.c +++ b/sys/dev/isa/if_tr_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tr_isa.c,v 1.1 1999/12/27 21:51:35 fgsch Exp $ */ +/* $OpenBSD: if_tr_isa.c,v 1.2 2001/11/05 17:25:58 art Exp $ */ /* $NetBSD: if_tr_isa.c,v 1.4 1999/04/30 15:29:24 bad Exp $ */ #undef TRISADEBUG @@ -42,6 +42,7 @@ #include <sys/systm.h> #include <sys/socket.h> #include <sys/device.h> +#include <sys/timeout.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/isa/if_tribm_isa.c b/sys/dev/isa/if_tribm_isa.c index 69f92b688f9..c07d221a102 100644 --- a/sys/dev/isa/if_tribm_isa.c +++ b/sys/dev/isa/if_tribm_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tribm_isa.c,v 1.1 1999/12/27 21:51:35 fgsch Exp $ */ +/* $OpenBSD: if_tribm_isa.c,v 1.2 2001/11/05 17:25:58 art Exp $ */ /* $NetBSD: if_tribm_isa.c,v 1.2 1999/03/22 23:01:37 bad Exp $ */ /* @@ -41,6 +41,7 @@ #include <sys/systm.h> #include <sys/socket.h> #include <sys/device.h> +#include <sys/timeout.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/isa/if_trtcm_isa.c b/sys/dev/isa/if_trtcm_isa.c index 3fb6063b675..cef9b1cfa85 100644 --- a/sys/dev/isa/if_trtcm_isa.c +++ b/sys/dev/isa/if_trtcm_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trtcm_isa.c,v 1.1 1999/12/27 21:51:35 fgsch Exp $ */ +/* $OpenBSD: if_trtcm_isa.c,v 1.2 2001/11/05 17:25:58 art Exp $ */ /* $NetBSD: if_trtcm_isa.c,v 1.3 1999/04/30 15:29:24 bad Exp $ */ #undef TRTCMISADEBUG @@ -43,6 +43,7 @@ #include <sys/socket.h> #include <sys/device.h> #include <sys/malloc.h> +#include <sys/timeout.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c index 80efb570834..b108e4d52ae 100644 --- a/sys/dev/isa/isadma.c +++ b/sys/dev/isa/isadma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isadma.c,v 1.23 2001/10/31 11:00:24 art Exp $ */ +/* $OpenBSD: isadma.c,v 1.24 2001/11/05 17:25:58 art Exp $ */ /* $NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $ */ /*- @@ -352,10 +352,14 @@ isa_dmastart(isadev, chan, addr, nbytes, p, flags, busdmaflags) #endif if (flags & DMAMODE_READ) { - bus_dmamap_sync(sc->sc_dmat, dmam, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(sc->sc_dmat, dmam, 0, + dmam->dm_mapsize, + BUS_DMASYNC_PREREAD); sc->sc_dmareads |= (1 << chan); } else { - bus_dmamap_sync(sc->sc_dmat, dmam, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->sc_dmat, dmam, 0, + dmam->dm_mapsize, + BUS_DMASYNC_PREWRITE); sc->sc_dmareads &= ~(1 << chan); } @@ -531,7 +535,8 @@ isa_dmadone(isadev, chan) printf("%s: isa_dmadone: channel %d not finished\n", sc->sc_dev.dv_xname, chan); - bus_dmamap_sync(sc->sc_dmat, dmam, + bus_dmamap_sync(sc->sc_dmat, dmam, 0, + dmam->dm_mapsize, (sc->sc_dmareads & (1 << chan)) ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE); |