[src/netbsd-1-5]: src/sys/arch/next68k/dev Pull up revisions 1.17, 1.19 (reque...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c78dbfd0d1db
branches:  netbsd-1-5
changeset: 491124:c78dbfd0d1db
user:      he <he%NetBSD.org@localhost>
date:      Thu Apr 05 12:27:32 2001 +0000

description:
Pull up revisions 1.17,1.19 (requested by dbj):
  Purge/flush by pages when possible instead of just cache lines.
  Purge cache on BUS_DMASYNC_PREREAD instead of BUS_DMASYNC_POSTREAD.

diffstat:

 sys/arch/next68k/dev/bus_dma.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r e14a8947136c -r c78dbfd0d1db sys/arch/next68k/dev/bus_dma.c
--- a/sys/arch/next68k/dev/bus_dma.c    Thu Apr 05 12:25:03 2001 +0000
+++ b/sys/arch/next68k/dev/bus_dma.c    Thu Apr 05 12:27:32 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.13.4.1 2000/06/30 16:27:32 simonb Exp $ */
+/* $NetBSD: bus_dma.c,v 1.13.4.2 2001/04/05 12:27:32 he Exp $ */
 
 /*
  * This file was taken from from alpha/common/bus_dma.c
@@ -46,7 +46,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.13.4.1 2000/06/30 16:27:32 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.13.4.2 2001/04/05 12:27:32 he Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -464,7 +464,7 @@
                                                "address=0x%08x, end=0x%08x, ops=0x%x",p,e,ops);
                        }
 #endif
-                       while((p<e)&&(!p%NBPG)) {
+                       while((p<e)&&(p%NBPG)) {
                                DCFL(p);                                                        /* flush cache line */
                                p += 16;
                        }
@@ -485,7 +485,7 @@
                }
        }
 
-       if (ops & BUS_DMASYNC_POSTREAD) {
+       if (ops & BUS_DMASYNC_PREREAD) {
                int i;
                for(i=0;i<map->dm_nsegs;i++) {
                        bus_addr_t p = map->dm_segs[i].ds_addr;
@@ -496,7 +496,7 @@
                                                "address=0x%08x, end=0x%08x, ops=0x%x", p,e,ops);
                        }
 #endif
-                       while((p<e)&&(!p%NBPG)) {
+                       while((p<e)&&(p%NBPG)) {
                                DCPL(p);                                                        /* purge cache line */
                                p += 16;
                        }