Module Name: src
Committed By: dyoung
Date: Tue Jul 19 15:44:53 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.evbsh3
src/sys/arch/evbsh3/ap_ms104_sh4: if_sm_mainbus.c
src/sys/arch/evbsh3/evbsh3: bus_dma.c machdep.c
src/sys/arch/evbsh3/include: Makefile
src/sys/arch/evbsh3/t_sh7706lan: if_ne_mainbus.c
Added Files:
src/sys/arch/evbsh3/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/evbsh3/include: bus.h
Log Message:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
Mark evbsh3/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/comp/md.evbsh3
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbsh3/evbsh3/bus_dma.c
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/evbsh3/evbsh3/machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbsh3/include/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/arch/evbsh3/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbsh3/include/bus_defs.h \
src/sys/arch/evbsh3/include/bus_funcs.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.evbsh3
diff -u src/distrib/sets/lists/comp/md.evbsh3:1.27 src/distrib/sets/lists/comp/md.evbsh3:1.28
--- src/distrib/sets/lists/comp/md.evbsh3:1.27 Sun Jul 17 20:54:31 2011
+++ src/distrib/sets/lists/comp/md.evbsh3 Tue Jul 19 15:44:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbsh3,v 1.27 2011/07/17 20:54:31 joerg Exp $
+# $NetBSD: md.evbsh3,v 1.28 2011/07/19 15:44:52 dyoung Exp $
./usr/include/evbsh3 comp-c-include
./usr/include/evbsh3/_G_config.h comp-obsolete obsolete
./usr/include/evbsh3/ansi.h comp-c-include
@@ -6,7 +6,7 @@
./usr/include/evbsh3/asm.h comp-c-include
./usr/include/evbsh3/bootinfo.h comp-obsolete obsolete
./usr/include/evbsh3/bswap.h comp-c-include
-./usr/include/evbsh3/bus.h comp-c-include
+./usr/include/evbsh3/bus.h comp-obsolete obsolete
./usr/include/evbsh3/cdefs.h comp-c-include
./usr/include/evbsh3/coff_machdep.h comp-c-include
./usr/include/evbsh3/conf.h comp-obsolete obsolete
Index: src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c
diff -u src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c:1.1 src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c:1.2
--- src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c:1.1 Tue Apr 6 15:54:29 2010
+++ src/sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c Tue Jul 19 15:44:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_mainbus.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $ */
+/* $NetBSD: if_sm_mainbus.c,v 1.2 2011/07/19 15:44:52 dyoung Exp $ */
/*-
* Copyright (c) 2009 NONAKA Kimihiro <non...@netbsd.org>
@@ -27,11 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_mainbus.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_mainbus.c,v 1.2 2011/07/19 15:44:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_ether.h>
@@ -39,7 +40,6 @@
#include <machine/autoconf.h>
#include <machine/intr.h>
-#include <machine/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: src/sys/arch/evbsh3/evbsh3/bus_dma.c
diff -u src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.2 src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.3
--- src/sys/arch/evbsh3/evbsh3/bus_dma.c:1.2 Fri Nov 12 13:18:57 2010
+++ src/sys/arch/evbsh3/evbsh3/bus_dma.c Tue Jul 19 15:44:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.2 2010/11/12 13:18:57 uebayasi Exp $ */
+/* $NetBSD: bus_dma.c,v 1.3 2011/07/19 15:44:52 dyoung Exp $ */
/*
* Copyright (c) 2005 NONAKA Kimihiro <non...@netbsd.org>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.2 2010/11/12 13:18:57 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.3 2011/07/19 15:44:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -34,14 +34,14 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
+#define _EVBSH3_BUS_DMA_PRIVATE
+#include <sys/bus.h>
#include <uvm/uvm.h>
#include <sh3/cache.h>
#include <machine/autoconf.h>
-#define _EVBSH3_BUS_DMA_PRIVATE
-#include <machine/bus.h>
#if defined(DEBUG) && defined(BUSDMA_DEBUG)
int busdma_debug = 0;
Index: src/sys/arch/evbsh3/evbsh3/machdep.c
diff -u src/sys/arch/evbsh3/evbsh3/machdep.c:1.73 src/sys/arch/evbsh3/evbsh3/machdep.c:1.74
--- src/sys/arch/evbsh3/evbsh3/machdep.c:1.73 Wed Jan 19 09:36:33 2011
+++ src/sys/arch/evbsh3/evbsh3/machdep.c Tue Jul 19 15:44:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.73 2011/01/19 09:36:33 he Exp $ */
+/* $NetBSD: machdep.c,v 1.74 2011/07/19 15:44:52 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.73 2011/01/19 09:36:33 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.74 2011/07/19 15:44:52 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -82,6 +82,7 @@
#include <sys/sysctl.h>
#include <sys/ksyms.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
@@ -93,7 +94,6 @@
#include <sh3/cache_sh4.h>
#include <sh3/exception.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/pcb.h>
Index: src/sys/arch/evbsh3/include/Makefile
diff -u src/sys/arch/evbsh3/include/Makefile:1.25 src/sys/arch/evbsh3/include/Makefile:1.26
--- src/sys/arch/evbsh3/include/Makefile:1.25 Sun Jul 17 20:54:40 2011
+++ src/sys/arch/evbsh3/include/Makefile Tue Jul 19 15:44:52 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2011/07/17 20:54:40 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2011/07/19 15:44:52 dyoung Exp $
INCSDIR= /usr/include/evbsh3
INCS= ansi.h aout_machdep.h asm.h \
- bswap.h bus.h \
+ bswap.h \
cdefs.h coff_machdep.h cpu.h cputypes.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c
diff -u src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c:1.1 src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c:1.2
--- src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c:1.1 Tue Apr 6 15:54:31 2010
+++ src/sys/arch/evbsh3/t_sh7706lan/if_ne_mainbus.c Tue Jul 19 15:44:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_mainbus.c,v 1.1 2010/04/06 15:54:31 nonaka Exp $ */
+/* $NetBSD: if_ne_mainbus.c,v 1.2 2011/07/19 15:44:53 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -42,6 +42,7 @@
#include <sys/syslog.h>
#include <sys/select.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_dl.h>
@@ -49,7 +50,6 @@
#include <net/if_media.h>
#include <sys/intr.h>
-#include <sys/bus.h>
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
Added files:
Index: src/sys/arch/evbsh3/include/bus_defs.h
diff -u /dev/null src/sys/arch/evbsh3/include/bus_defs.h:1.1
--- /dev/null Tue Jul 19 15:44:53 2011
+++ src/sys/arch/evbsh3/include/bus_defs.h Tue Jul 19 15:44:53 2011
@@ -0,0 +1,419 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:44:53 dyoung Exp $ */
+
+/*-
+ * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1996 Charles M. Hannum. All rights reserved.
+ * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Christopher G. Demetriou
+ * for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _EVBSH3_BUS_DEFS_H_
+#define _EVBSH3_BUS_DEFS_H_
+
+#ifdef _KERNEL
+/*
+ * Turn on BUS_SPACE_DEBUG if the global DEBUG option is enabled.
+ */
+#if defined(DEBUG) && !defined(BUS_SPACE_DEBUG)
+#define BUS_SPACE_DEBUG
+#endif
+
+#ifdef BUS_SPACE_DEBUG
+#include <sys/systm.h> /* for printf() prototype */
+/*
+ * Macros for checking the aligned-ness of pointers passed to bus
+ * space ops. Strict alignment is required by the Alpha architecture,
+ * and a trap will occur if unaligned access is performed. These
+ * may aid in the debugging of a broken device driver by displaying
+ * useful information about the problem.
+ */
+#define __BUS_SPACE_ALIGNED_ADDRESS(p, t) \
+ ((((u_long)(p)) & (sizeof(t)-1)) == 0)
+
+#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) \
+({ \
+ if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) { \
+ printf("%s 0x%lx not aligned to %lu bytes %s:%d\n", \
+ d, (u_long)(p), (u_long)sizeof(t), __FILE__, __LINE__); \
+ } \
+ (void) 0; \
+})
+
+#define BUS_SPACE_ALIGNED_POINTER(p, t) __BUS_SPACE_ALIGNED_ADDRESS(p, t)
+#else
+#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) (void) 0
+#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
+#endif /* BUS_SPACE_DEBUG */
+#endif /* _KERNEL */
+
+typedef u_long bus_addr_t;
+typedef u_long bus_size_t;
+
+typedef struct _bus_space *bus_space_tag_t;
+typedef u_long bus_space_handle_t;
+
+struct _bus_space {
+ /* cookie */
+ void *bs_cookie;
+
+ /* mapping/unmapping */
+ int (*bs_map)(void *, bus_addr_t, bus_size_t,
+ int, bus_space_handle_t *);
+ void (*bs_unmap)(void *, bus_space_handle_t,
+ bus_size_t);
+ int (*bs_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+
+ /* allocation/deallocation */
+ int (*bs_alloc)(void *, bus_addr_t, bus_addr_t,
+ bus_size_t, bus_size_t, bus_size_t, int,
+ bus_addr_t *, bus_space_handle_t *);
+ void (*bs_free)(void *, bus_space_handle_t,
+ bus_size_t);
+
+ /* get kernel virtual address */
+ void * (*bs_vaddr)(void *, bus_space_handle_t);
+
+ /* read (single) */
+ uint8_t (*bs_r_1)(void *, bus_space_handle_t,
+ bus_size_t);
+ uint16_t (*bs_r_2)(void *, bus_space_handle_t,
+ bus_size_t);
+ uint32_t (*bs_r_4)(void *, bus_space_handle_t,
+ bus_size_t);
+ uint64_t (*bs_r_8)(void *, bus_space_handle_t,
+ bus_size_t);
+
+ /* read multiple */
+ void (*bs_rm_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t *, bus_size_t);
+ void (*bs_rm_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t *, bus_size_t);
+ void (*bs_rm_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t *, bus_size_t);
+ void (*bs_rm_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t *, bus_size_t);
+
+ /* read region */
+ void (*bs_rr_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t *, bus_size_t);
+ void (*bs_rr_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t *, bus_size_t);
+ void (*bs_rr_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t *, bus_size_t);
+ void (*bs_rr_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t *, bus_size_t);
+
+ /* read stream (single) */
+ uint8_t (*bs_rs_1)(void *, bus_space_handle_t,
+ bus_size_t);
+ uint16_t (*bs_rs_2)(void *, bus_space_handle_t,
+ bus_size_t);
+ uint32_t (*bs_rs_4)(void *, bus_space_handle_t,
+ bus_size_t);
+ uint64_t (*bs_rs_8)(void *, bus_space_handle_t,
+ bus_size_t);
+
+ /* read multiple stream */
+ void (*bs_rms_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t *, bus_size_t);
+ void (*bs_rms_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t *, bus_size_t);
+ void (*bs_rms_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t *, bus_size_t);
+ void (*bs_rms_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t *, bus_size_t);
+
+ /* read region stream */
+ void (*bs_rrs_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t *, bus_size_t);
+ void (*bs_rrs_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t *, bus_size_t);
+ void (*bs_rrs_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t *, bus_size_t);
+ void (*bs_rrs_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t *, bus_size_t);
+
+ /* write (single) */
+ void (*bs_w_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t);
+ void (*bs_w_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t);
+ void (*bs_w_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t);
+ void (*bs_w_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t);
+
+ /* write multiple */
+ void (*bs_wm_1)(void *, bus_space_handle_t,
+ bus_size_t, const uint8_t *, bus_size_t);
+ void (*bs_wm_2)(void *, bus_space_handle_t,
+ bus_size_t, const uint16_t *, bus_size_t);
+ void (*bs_wm_4)(void *, bus_space_handle_t,
+ bus_size_t, const uint32_t *, bus_size_t);
+ void (*bs_wm_8)(void *, bus_space_handle_t,
+ bus_size_t, const uint64_t *, bus_size_t);
+
+ /* write region */
+ void (*bs_wr_1)(void *, bus_space_handle_t,
+ bus_size_t, const uint8_t *, bus_size_t);
+ void (*bs_wr_2)(void *, bus_space_handle_t,
+ bus_size_t, const uint16_t *, bus_size_t);
+ void (*bs_wr_4)(void *, bus_space_handle_t,
+ bus_size_t, const uint32_t *, bus_size_t);
+ void (*bs_wr_8)(void *, bus_space_handle_t,
+ bus_size_t, const uint64_t *, bus_size_t);
+
+ /* write stream (single) */
+ void (*bs_ws_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t);
+ void (*bs_ws_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t);
+ void (*bs_ws_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t);
+ void (*bs_ws_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t);
+
+ /* write multiple stream */
+ void (*bs_wms_1)(void *, bus_space_handle_t,
+ bus_size_t, const uint8_t *, bus_size_t);
+ void (*bs_wms_2)(void *, bus_space_handle_t,
+ bus_size_t, const uint16_t *, bus_size_t);
+ void (*bs_wms_4)(void *, bus_space_handle_t,
+ bus_size_t, const uint32_t *, bus_size_t);
+ void (*bs_wms_8)(void *, bus_space_handle_t,
+ bus_size_t, const uint64_t *, bus_size_t);
+
+ /* write region stream */
+ void (*bs_wrs_1)(void *, bus_space_handle_t,
+ bus_size_t, const uint8_t *, bus_size_t);
+ void (*bs_wrs_2)(void *, bus_space_handle_t,
+ bus_size_t, const uint16_t *, bus_size_t);
+ void (*bs_wrs_4)(void *, bus_space_handle_t,
+ bus_size_t, const uint32_t *, bus_size_t);
+ void (*bs_wrs_8)(void *, bus_space_handle_t,
+ bus_size_t, const uint64_t *, bus_size_t);
+
+ /* set multiple */
+ void (*bs_sm_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t, bus_size_t);
+ void (*bs_sm_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t, bus_size_t);
+ void (*bs_sm_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t, bus_size_t);
+ void (*bs_sm_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t, bus_size_t);
+
+ /* set region */
+ void (*bs_sr_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t, bus_size_t);
+ void (*bs_sr_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t, bus_size_t);
+ void (*bs_sr_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t, bus_size_t);
+ void (*bs_sr_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t, bus_size_t);
+
+ /* copy */
+ void (*bs_c_1)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*bs_c_2)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*bs_c_4)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*bs_c_8)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+};
+
+#ifdef _KERNEL
+
+extern struct _bus_space evbsh3_bus_space;
+
+#endif /* _KERNEL */
+
+#define BUS_SPACE_MAP_CACHEABLE 0x01
+#define BUS_SPACE_MAP_LINEAR 0x02
+#define BUS_SPACE_MAP_PREFETCHABLE 0x04
+
+#ifdef _KERNEL
+
+#define BUS_SPACE_BARRIER_READ 0x01
+#define BUS_SPACE_BARRIER_WRITE 0x02
+
+/*
+ * Bus stream operations--defined in terms of non-stream counterparts
+ */
+#define __BUS_SPACE_HAS_STREAM_METHODS
+
+#endif /* _KERNEL */
+
+/*
+ * Flags used in various bus DMA methods.
+ */
+#define BUS_DMA_WAITOK 0x000 /* safe to sleep (pseudo-flag) */
+#define BUS_DMA_NOWAIT 0x001 /* not safe to sleep */
+#define BUS_DMA_ALLOCNOW 0x002 /* perform resource allocation now */
+#define BUS_DMA_COHERENT 0x004 /* map memory to not require sync */
+#define BUS_DMA_STREAMING 0x008 /* hint: sequential, unidirectional */
+#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
+#define BUS_DMA_BUS2 0x020
+#define BUS_DMA_BUS3 0x040
+#define BUS_DMA_BUS4 0x080
+#define BUS_DMA_READ 0x100 /* mapping is device -> memory only */
+#define BUS_DMA_WRITE 0x200 /* mapping is memory -> device only */
+#define BUS_DMA_NOCACHE 0x400 /* hint: map non-cached memory */
+
+/* Forwards needed by prototypes below. */
+struct mbuf;
+struct uio;
+
+/*
+ * Operations performed by bus_dmamap_sync().
+ */
+#define BUS_DMASYNC_PREREAD 0x01
+#define BUS_DMASYNC_POSTREAD 0x02
+#define BUS_DMASYNC_PREWRITE 0x04
+#define BUS_DMASYNC_POSTWRITE 0x08
+
+typedef struct _bus_dma_tag *bus_dma_tag_t;
+typedef struct _bus_dmamap *bus_dmamap_t;
+
+#define BUS_DMA_TAG_VALID(t) ((t) != (bus_dma_tag_t)0)
+
+/*
+ * bus_dma_segment_t
+ *
+ * Describes a single contiguous DMA transaction. Values
+ * are suitable for programming into DMA registers.
+ */
+struct _bus_dma_segment {
+ bus_addr_t ds_addr; /* DMA address */
+ bus_size_t ds_len; /* length of transfer */
+
+ /* private section */
+ bus_addr_t _ds_vaddr; /* virtual address */
+};
+typedef struct _bus_dma_segment bus_dma_segment_t;
+
+/*
+ * bus_dma_tag_t
+ *
+ * A machine-dependent opaque type describing the implementation of
+ * DMA for a given bus.
+ */
+
+struct _bus_dma_tag {
+ void *_cookie; /* cookie used in the guts */
+
+ /*
+ * DMA mapping methods.
+ */
+ int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
+ void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
+ int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+ int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+ int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+ int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+ void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
+ void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
+
+ /*
+ * DMA memory utility functions.
+ */
+ int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
+ bus_size_t, bus_dma_segment_t *, int, int *, int);
+ void (*_dmamem_free)(bus_dma_tag_t,
+ bus_dma_segment_t *, int);
+ int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, size_t, void **, int);
+ void (*_dmamem_unmap)(bus_dma_tag_t, void *, size_t);
+ paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, off_t, int, int);
+};
+
+/*
+ * bus_dmamap_t
+ *
+ * Describes a DMA mapping.
+ */
+struct _bus_dmamap {
+ /*
+ * PRIVATE MEMBERS: not for use my machine-independent code.
+ */
+ bus_size_t _dm_size; /* largest DMA transfer mappable */
+ int _dm_segcnt; /* number of segs this map can map */
+ bus_size_t _dm_maxsegsz; /* largest possible segment */
+ bus_size_t _dm_boundary; /* don't cross this */
+ int _dm_flags; /* misc. flags */
+
+ void *_dm_cookie; /* cookie for bus-specific functions */
+
+ /*
+ * PUBLIC MEMBERS: these are used by machine-independent code.
+ */
+ bus_size_t dm_mapsize; /* size of the mapping */
+ int dm_nsegs; /* # valid segments in mapping */
+ bus_dma_segment_t dm_segs[1]; /* segments; variable length */
+};
+
+#endif /* _EVBSH3_BUS_DEFS_H_ */
Index: src/sys/arch/evbsh3/include/bus_funcs.h
diff -u /dev/null src/sys/arch/evbsh3/include/bus_funcs.h:1.1
--- /dev/null Tue Jul 19 15:44:53 2011
+++ src/sys/arch/evbsh3/include/bus_funcs.h Tue Jul 19 15:44:53 2011
@@ -0,0 +1,366 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:44:53 dyoung Exp $ */
+
+/*-
+ * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1996 Charles M. Hannum. All rights reserved.
+ * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Christopher G. Demetriou
+ * for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _EVBSH3_BUS_FUNCS_H_
+#define _EVBSH3_BUS_FUNCS_H_
+
+#ifdef _KERNEL
+
+/*
+ * Utility macros; INTERNAL USE ONLY.
+ */
+#define __bs_c(a,b) __CONCAT(a,b)
+#define __bs_opname(op,size) __bs_c(__bs_c(__bs_c(bs_,op),_),size)
+
+#define __bs_rs(sz, tn, t, h, o) \
+ (__BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"), \
+ (*(t)->__bs_opname(r,sz))((t)->bs_cookie, h, o))
+#define __bs_rss(sz, tn, t, h, o) \
+ (__BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"), \
+ (*(t)->__bs_opname(rs,sz))((t)->bs_cookie, h, o))
+
+#define __bs_ws(sz, tn, t, h, o, v) \
+do { \
+ __BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"); \
+ (*(t)->__bs_opname(w,sz))((t)->bs_cookie, h, o, v); \
+} while (0)
+#define __bs_wss(sz, tn, t, h, o, v) \
+do { \
+ __BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"); \
+ (*(t)->__bs_opname(ws,sz))((t)->bs_cookie, h, o, v); \
+} while (0)
+
+#define __bs_nonsingle(type, sz, tn, t, h, o, a, c) \
+do { \
+ __BUS_SPACE_ADDRESS_SANITY((a), tn, "buffer"); \
+ __BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"); \
+ (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, a, c); \
+} while (0)
+
+#define __bs_set(type, sz, tn, t, h, o, v, c) \
+do { \
+ __BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"); \
+ (*(t)->__bs_opname(type,sz))((t)->bs_cookie, h, o, v, c); \
+} while (0)
+
+#define __bs_copy(sz, tn, t, h1, o1, h2, o2, cnt) \
+do { \
+ __BUS_SPACE_ADDRESS_SANITY((h1) + (o1), tn, "bus addr 1"); \
+ __BUS_SPACE_ADDRESS_SANITY((h2) + (o2), tn, "bus addr 2"); \
+ (*(t)->__bs_opname(c,sz))((t)->bs_cookie, h1, o1, h2, o2, cnt); \
+} while (0)
+
+
+/*
+ * Mapping and unmapping operations.
+ */
+#define bus_space_map(t, a, s, f, hp) \
+ (*(t)->bs_map)((t)->bs_cookie, (a), (s), (f), (hp))
+#define bus_space_unmap(t, h, s) \
+ (*(t)->bs_unmap)((t)->bs_cookie, (h), (s))
+#define bus_space_subregion(t, h, o, s, hp) \
+ (*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp))
+
+#endif /* _KERNEL */
+
+#ifdef _KERNEL
+/*
+ * Allocation and deallocation operations.
+ */
+#define bus_space_alloc(t, rs, re, s, a, b, f, ap, hp) \
+ (*(t)->bs_alloc)((t)->bs_cookie, (rs), (re), (s), (a), (b), \
+ (f), (ap), (hp))
+#define bus_space_free(t, h, s) \
+ (*(t)->bs_free)((t)->bs_cookie, (h), (s))
+
+/*
+ * Get kernel virtual address for ranges mapped BUS_SPACE_MAP_LINEAR.
+ */
+#define bus_space_vaddr(t, h) \
+ (*(t)->bs_vaddr)((t)->bs_cookie, (h))
+
+/*
+ * Bus barrier operations. The SH3 does not currently require
+ * barriers, but we must provide the flags to MI code.
+ */
+#define bus_space_barrier(t, h, o, l, f) \
+ ((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f)))
+
+/*
+ * Bus read (single) operations.
+ */
+#define bus_space_read_1(t, h, o) __bs_rs(1,uint8_t,(t),(h),(o))
+#define bus_space_read_2(t, h, o) __bs_rs(2,uint16_t,(t),(h),(o))
+#define bus_space_read_4(t, h, o) __bs_rs(4,uint32_t,(t),(h),(o))
+#define bus_space_read_8(t, h, o) __bs_rs(8,uint64_t,(t),(h),(o))
+#define bus_space_read_stream_1(t, h, o) __bs_rss(1,uint8_t,(t),(h),(o))
+#define bus_space_read_stream_2(t, h, o) __bs_rss(2,uint16_t,(t),(h),(o))
+#define bus_space_read_stream_4(t, h, o) __bs_rss(4,uint32_t,(t),(h),(o))
+#define bus_space_read_stream_8(t, h, o) __bs_rss(8,uint64_t,(t),(h),(o))
+
+
+/*
+ * Bus read multiple operations.
+ */
+#define bus_space_read_multi_1(t, h, o, a, c) \
+ __bs_nonsingle(rm,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_read_multi_2(t, h, o, a, c) \
+ __bs_nonsingle(rm,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_read_multi_4(t, h, o, a, c) \
+ __bs_nonsingle(rm,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_read_multi_8(t, h, o, a, c) \
+ __bs_nonsingle(rm,8,uint64_t,(t),(h),(o),(a),(c))
+#define bus_space_read_multi_stream_1(t, h, o, a, c) \
+ __bs_nonsingle(rms,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_read_multi_stream_2(t, h, o, a, c) \
+ __bs_nonsingle(rms,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_read_multi_stream_4(t, h, o, a, c) \
+ __bs_nonsingle(rms,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_read_multi_stream_8(t, h, o, a, c) \
+ __bs_nonsingle(rms,8,uint64_t,(t),(h),(o),(a),(c))
+
+
+/*
+ * Bus read region operations.
+ */
+#define bus_space_read_region_1(t, h, o, a, c) \
+ __bs_nonsingle(rr,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_read_region_2(t, h, o, a, c) \
+ __bs_nonsingle(rr,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_read_region_4(t, h, o, a, c) \
+ __bs_nonsingle(rr,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_read_region_8(t, h, o, a, c) \
+ __bs_nonsingle(rr,8,uint64_t,(t),(h),(o),(a),(c))
+#define bus_space_read_region_stream_1(t, h, o, a, c) \
+ __bs_nonsingle(rrs,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_read_region_stream_2(t, h, o, a, c) \
+ __bs_nonsingle(rrs,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_read_region_stream_4(t, h, o, a, c) \
+ __bs_nonsingle(rrs,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_read_region_stream_8(t, h, o, a, c) \
+ __bs_nonsingle(rrs,8,uint64_t,(t),(h),(o),(a),(c))
+
+
+/*
+ * Bus write (single) operations.
+ */
+#define bus_space_write_1(t, h, o, v) __bs_ws(1,uint8_t,(t),(h),(o),(v))
+#define bus_space_write_2(t, h, o, v) __bs_ws(2,uint16_t,(t),(h),(o),(v))
+#define bus_space_write_4(t, h, o, v) __bs_ws(4,uint32_t,(t),(h),(o),(v))
+#define bus_space_write_8(t, h, o, v) __bs_ws(8,uint64_t,(t),(h),(o),(v))
+#define bus_space_write_stream_1(t, h, o, v) \
+ __bs_wss(1,uint8_t,(t),(h),(o),(v))
+#define bus_space_write_stream_2(t, h, o, v) \
+ __bs_wss(2,uint16_t,(t),(h),(o),(v))
+#define bus_space_write_stream_4(t, h, o, v) \
+ __bs_wss(4,uint32_t,(t),(h),(o),(v))
+#define bus_space_write_stream_8(t, h, o, v) \
+ __bs_wss(8,uint64_t,(t),(h),(o),(v))
+
+
+/*
+ * Bus write multiple operations.
+ */
+#define bus_space_write_multi_1(t, h, o, a, c) \
+ __bs_nonsingle(wm,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_write_multi_2(t, h, o, a, c) \
+ __bs_nonsingle(wm,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_write_multi_4(t, h, o, a, c) \
+ __bs_nonsingle(wm,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_write_multi_8(t, h, o, a, c) \
+ __bs_nonsingle(wm,8,uint64_t,(t),(h),(o),(a),(c))
+#define bus_space_write_multi_stream_1(t, h, o, a, c) \
+ __bs_nonsingle(wms,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_write_multi_stream_2(t, h, o, a, c) \
+ __bs_nonsingle(wms,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_write_multi_stream_4(t, h, o, a, c) \
+ __bs_nonsingle(wms,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_write_multi_stream_8(t, h, o, a, c) \
+ __bs_nonsingle(wms,8,uint64_t,(t),(h),(o),(a),(c))
+
+
+/*
+ * Bus write region operations.
+ */
+#define bus_space_write_region_1(t, h, o, a, c) \
+ __bs_nonsingle(wr,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_write_region_2(t, h, o, a, c) \
+ __bs_nonsingle(wr,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_write_region_4(t, h, o, a, c) \
+ __bs_nonsingle(wr,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_write_region_8(t, h, o, a, c) \
+ __bs_nonsingle(wr,8,uint64_t,(t),(h),(o),(a),(c))
+#define bus_space_write_region_stream_1(t, h, o, a, c) \
+ __bs_nonsingle(wrs,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_write_region_stream_2(t, h, o, a, c) \
+ __bs_nonsingle(wrs,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_write_region_stream_4(t, h, o, a, c) \
+ __bs_nonsingle(wrs,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_write_region_stream_8(t, h, o, a, c) \
+ __bs_nonsingle(wrs,8,uint64_t,(t),(h),(o),(a),(c))
+
+
+/*
+ * Set multiple operations.
+ */
+#define bus_space_set_multi_1(t, h, o, v, c) \
+ __bs_set(sm,1,uint8_t,(t),(h),(o),(v),(c))
+#define bus_space_set_multi_2(t, h, o, v, c) \
+ __bs_set(sm,2,uint16_t,(t),(h),(o),(v),(c))
+#define bus_space_set_multi_4(t, h, o, v, c) \
+ __bs_set(sm,4,uint32_t,(t),(h),(o),(v),(c))
+#define bus_space_set_multi_8(t, h, o, v, c) \
+ __bs_set(sm,8,uint64_t,(t),(h),(o),(v),(c))
+
+
+/*
+ * Set region operations.
+ */
+#define bus_space_set_region_1(t, h, o, v, c) \
+ __bs_set(sr,1,uint8_t,(t),(h),(o),(v),(c))
+#define bus_space_set_region_2(t, h, o, v, c) \
+ __bs_set(sr,2,uint16_t,(t),(h),(o),(v),(c))
+#define bus_space_set_region_4(t, h, o, v, c) \
+ __bs_set(sr,4,uint32_t,(t),(h),(o),(v),(c))
+#define bus_space_set_region_8(t, h, o, v, c) \
+ __bs_set(sr,8,uint64_t,(t),(h),(o),(v),(c))
+
+
+/*
+ * Copy region operations.
+ */
+#define bus_space_copy_region_1(t, h1, o1, h2, o2, c) \
+ __bs_copy(1, uint8_t, (t), (h1), (o1), (h2), (o2), (c))
+#define bus_space_copy_region_2(t, h1, o1, h2, o2, c) \
+ __bs_copy(2, uint16_t, (t), (h1), (o1), (h2), (o2), (c))
+#define bus_space_copy_region_4(t, h1, o1, h2, o2, c) \
+ __bs_copy(4, uint32_t, (t), (h1), (o1), (h2), (o2), (c))
+#define bus_space_copy_region_8(t, h1, o1, h2, o2, c) \
+ __bs_copy(8, uint64_t, (t), (h1), (o1), (h2), (o2), (c))
+
+/*
+ * Bus stream operations--defined in terms of non-stream counterparts
+ */
+#define __BUS_SPACE_HAS_STREAM_METHODS
+
+#endif /* _KERNEL */
+
+#define bus_dmamap_create(t, s, n, m, b, f, p) \
+ (*(t)->_dmamap_create)((t), (s), (n), (m), (b), (f), (p))
+#define bus_dmamap_destroy(t, p) \
+ (*(t)->_dmamap_destroy)((t), (p))
+#define bus_dmamap_load(t, m, b, s, p, f) \
+ (*(t)->_dmamap_load)((t), (m), (b), (s), (p), (f))
+#define bus_dmamap_load_mbuf(t, m, b, f) \
+ (*(t)->_dmamap_load_mbuf)((t), (m), (b), (f))
+#define bus_dmamap_load_uio(t, m, u, f) \
+ (*(t)->_dmamap_load_uio)((t), (m), (u), (f))
+#define bus_dmamap_load_raw(t, m, sg, n, s, f) \
+ (*(t)->_dmamap_load_raw)((t), (m), (sg), (n), (s), (f))
+#define bus_dmamap_unload(t, p) \
+ (*(t)->_dmamap_unload)((t), (p))
+#define bus_dmamap_sync(t, m, o, l, op) \
+ (void)((t)->_dmamap_sync ? \
+ (*(t)->_dmamap_sync)((t), (m), (o), (l), (op)) : (void)0)
+
+#define bus_dmamem_alloc(t, s, a, b, sg, n, r, f) \
+ (*(t)->_dmamem_alloc)((t), (s), (a), (b), (sg), (n), (r), (f))
+#define bus_dmamem_free(t, sg, n) \
+ (*(t)->_dmamem_free)((t), (sg), (n))
+#define bus_dmamem_map(t, sg, n, s, k, f) \
+ (*(t)->_dmamem_map)((t), (sg), (n), (s), (k), (f))
+#define bus_dmamem_unmap(t, k, s) \
+ (*(t)->_dmamem_unmap)((t), (k), (s))
+#define bus_dmamem_mmap(t, sg, n, o, p, f) \
+ (*(t)->_dmamem_mmap)((t), (sg), (n), (o), (p), (f))
+
+#define bus_dmatag_subregion(t, mna, mxa, nt, f) EOPNOTSUPP
+#define bus_dmatag_destroy(t)
+
+#if defined(_EVBSH3_BUS_DMA_PRIVATE)
+int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
+ bus_size_t, int, bus_dmamap_t *);
+void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t,
+ struct proc *, int);
+int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, struct mbuf *,int);
+int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t, struct uio *, int);
+int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, bus_dma_segment_t *,
+ int, bus_size_t, int);
+void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+ bus_size_t, int);
+
+int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
+ bus_size_t alignment, bus_size_t boundary, bus_dma_segment_t *segs,
+ int nsegs, int *rsegs, int flags);
+void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs);
+int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs, int nsegs,
+ size_t size, void **kvap, int flags);
+void _bus_dmamem_unmap(bus_dma_tag_t tag, void *kva, size_t size);
+paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, off_t off, int prot, int flags);
+#endif /* _EVBSH3_BUS_DMA_PRIVATE */
+
+#endif /* _EVBSH3_BUS_FUNCS_H_ */
