[src/netbsd-1-5]: src/sys/arch/sh3/include Pull up revision 1.4 (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/a8930b1e7335
branches:  netbsd-1-5
changeset: 488340:a8930b1e7335
user:      simonb <simonb%NetBSD.org@localhost>
date:      Fri Jun 30 16:27:36 2000 +0000

description:
Pull up revision 1.4 (requested by simonb):
  Pull up mmap paddr_t/off_t changes from trunk.

diffstat:

 sys/arch/sh3/include/bus.h |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r e27531718cd1 -r a8930b1e7335 sys/arch/sh3/include/bus.h
--- a/sys/arch/sh3/include/bus.h        Fri Jun 30 16:27:12 2000 +0000
+++ b/sys/arch/sh3/include/bus.h        Fri Jun 30 16:27:36 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.3 2000/02/24 23:32:26 msaitoh Exp $  */
+/*     $NetBSD: bus.h,v 1.3.4.1 2000/06/30 16:27:37 simonb Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -904,8 +904,8 @@
        int     (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *,
                    int, size_t, caddr_t *, int));
        void    (*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t));
-       int     (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
-                   int, int, int, int));
+       paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
+                   int, off_t, int, int));
 };
 
 #define        bus_dmamap_create(t, s, n, m, b, f, p)                  \
@@ -985,8 +985,8 @@
            int nsegs, size_t size, caddr_t *kvap, int flags));
 void   _bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva,
            size_t size));
-int    _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-           int nsegs, int off, int prot, int flags));
+paddr_t        _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
+           int nsegs, off_t off, int prot, int flags));
 
 int    _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
            bus_size_t alignment, bus_size_t boundary,