[src/trunk]: src/sys/arch/i386/isa NBPG -> PAGE_SIZE.

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

details:   https://anonhg.NetBSD.org/src/rev/77c1bad2f1e0
branches:  trunk
changeset: 499240:77c1bad2f1e0
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Nov 14 22:55:51 2000 +0000

description:
NBPG -> PAGE_SIZE.

diffstat:

 sys/arch/i386/isa/isa_machdep.c |  43 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 4 deletions(-)

diffs (78 lines):

diff -r e19a62599599 -r 77c1bad2f1e0 sys/arch/i386/isa/isa_machdep.c
--- a/sys/arch/i386/isa/isa_machdep.c   Tue Nov 14 22:55:05 2000 +0000
+++ b/sys/arch/i386/isa/isa_machdep.c   Tue Nov 14 22:55:51 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_machdep.c,v 1.49 2000/06/29 08:44:57 mrg Exp $     */
+/*     $NetBSD: isa_machdep.c,v 1.50 2000/11/14 22:55:51 thorpej Exp $ */
 
 #define ISA_DMA_STATS
 
@@ -120,6 +120,41 @@
 static int mca_clockfakeintr __P((void *));
 #endif
 
+/*
+ * Cookie used by ISA dma.  A pointer to one of these it stashed in
+ * the DMA map.
+ */
+struct i386_isa_dma_cookie {
+       int     id_flags;               /* flags; see below */
+
+       /*
+        * Information about the original buffer used during
+        * DMA map syncs.  Note that origibuflen is only used
+        * for ID_BUFTYPE_LINEAR.
+        */
+       void    *id_origbuf;            /* pointer to orig buffer if
+                                          bouncing */
+       bus_size_t id_origbuflen;       /* ...and size */
+       int     id_buftype;             /* type of buffer */
+
+       void    *id_bouncebuf;          /* pointer to the bounce buffer */
+       bus_size_t id_bouncebuflen;     /* ...and size */
+       int     id_nbouncesegs;         /* number of valid bounce segs */
+       bus_dma_segment_t id_bouncesegs[0]; /* array of bounce buffer
+                                              physical memory segments */
+};
+
+/* id_flags */
+#define        ID_MIGHT_NEED_BOUNCE    0x01    /* map could need bounce buffers */
+#define        ID_HAS_BOUNCE           0x02    /* map currently has bounce buffers */
+#define        ID_IS_BOUNCING          0x04    /* map is bouncing current xfer */
+
+/* id_buftype */
+#define        ID_BUFTYPE_INVALID      0
+#define        ID_BUFTYPE_LINEAR       1
+#define        ID_BUFTYPE_MBUF         2
+#define        ID_BUFTYPE_UIO          3
+#define        ID_BUFTYPE_RAW          4
 
 int    _isa_bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int,
            bus_size_t, bus_size_t, int, bus_dmamap_t *));
@@ -690,7 +725,7 @@
         * 32-bit DMA, and indicate that here.
         *
         * ...or, there is an opposite case.  The most segments
-        * a transfer will require is (maxxfer / NBPG) + 1.  If
+        * a transfer will require is (maxxfer / PAGE_SIZE) + 1.  If
         * the caller can't handle that many segments (e.g. the
         * ISA DMA controller), we may have to bounce it as well.
         */
@@ -701,7 +736,7 @@
        }
        cookieflags = 0;
        if (map->_dm_bounce_thresh != 0 ||
-           ((map->_dm_size / NBPG) + 1) > map->_dm_segcnt) {
+           ((map->_dm_size / PAGE_SIZE) + 1) > map->_dm_segcnt) {
                cookieflags |= ID_MIGHT_NEED_BOUNCE;
                cookiesize += (sizeof(bus_dma_segment_t) * map->_dm_segcnt);
        }
@@ -1136,7 +1171,7 @@
 
        cookie->id_bouncebuflen = round_page(size);
        error = _isa_bus_dmamem_alloc(t, cookie->id_bouncebuflen,
-           NBPG, map->_dm_boundary, cookie->id_bouncesegs,
+           PAGE_SIZE, map->_dm_boundary, cookie->id_bouncesegs,
            map->_dm_segcnt, &cookie->id_nbouncesegs, flags);
        if (error)
                goto out;