Module Name: src
Committed By: dyoung
Date: Tue Jul 19 15:52:31 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.dreamcast
src/sys/arch/dreamcast/dev: pvr.c
src/sys/arch/dreamcast/dev/g2: aica.c g2bus_bus_mem.c g2busvar.h
g2rtc.c gapspci.c gapspci_dma.c gapspci_pci.c if_mbe_g2.c
src/sys/arch/dreamcast/dev/maple: maple.c mkbd.c
src/sys/arch/dreamcast/include: Makefile
Added Files:
src/sys/arch/dreamcast/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/dreamcast/include: bus.h
Log Message:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
Mark dreamcast/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/comp/md.dreamcast
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/dreamcast/dev/pvr.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/dreamcast/dev/g2/aica.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/dreamcast/dev/g2/g2busvar.h \
src/sys/arch/dreamcast/dev/g2/g2rtc.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/dreamcast/dev/g2/gapspci.c \
src/sys/arch/dreamcast/dev/g2/gapspci_dma.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/dreamcast/dev/g2/gapspci_pci.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/dreamcast/dev/maple/maple.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/dreamcast/dev/maple/mkbd.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/dreamcast/include/Makefile
cvs rdiff -u -r1.15 -r0 src/sys/arch/dreamcast/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/dreamcast/include/bus_defs.h \
src/sys/arch/dreamcast/include/bus_funcs.h
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.dreamcast
diff -u src/distrib/sets/lists/comp/md.dreamcast:1.16 src/distrib/sets/lists/comp/md.dreamcast:1.17
--- src/distrib/sets/lists/comp/md.dreamcast:1.16 Mon Jul 18 17:42:34 2011
+++ src/distrib/sets/lists/comp/md.dreamcast Tue Jul 19 15:52:29 2011
@@ -1,11 +1,11 @@
-# $NetBSD: md.dreamcast,v 1.16 2011/07/18 17:42:34 dyoung Exp $
+# $NetBSD: md.dreamcast,v 1.17 2011/07/19 15:52:29 dyoung Exp $
./usr/include/dreamcast comp-c-include
./usr/include/dreamcast/_G_config.h comp-obsolete obsolete
./usr/include/dreamcast/ansi.h comp-c-include
./usr/include/dreamcast/aout_machdep.h comp-c-include
./usr/include/dreamcast/asm.h comp-c-include
./usr/include/dreamcast/bswap.h comp-c-include
-./usr/include/dreamcast/bus.h comp-c-include
+./usr/include/dreamcast/bus.h comp-obsolete obsolete
./usr/include/dreamcast/cdefs.h comp-c-include
./usr/include/dreamcast/coff_machdep.h comp-c-include
./usr/include/dreamcast/conf.h comp-obsolete obsolete
Index: src/sys/arch/dreamcast/dev/pvr.c
diff -u src/sys/arch/dreamcast/dev/pvr.c:1.32 src/sys/arch/dreamcast/dev/pvr.c:1.33
--- src/sys/arch/dreamcast/dev/pvr.c:1.32 Sat May 21 12:00:18 2011
+++ src/sys/arch/dreamcast/dev/pvr.c Tue Jul 19 15:52:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pvr.c,v 1.32 2011/05/21 12:00:18 tsutsui Exp $ */
+/* $NetBSD: pvr.c,v 1.33 2011/07/19 15:52:29 dyoung Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.32 2011/05/21 12:00:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.33 2011/07/19 15:52:29 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,10 +44,10 @@
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/ioctl.h>
+#include <sys/bus.h>
#include <machine/vmparam.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
#include <dev/cons.h>
Index: src/sys/arch/dreamcast/dev/g2/aica.c
diff -u src/sys/arch/dreamcast/dev/g2/aica.c:1.20 src/sys/arch/dreamcast/dev/g2/aica.c:1.21
--- src/sys/arch/dreamcast/dev/g2/aica.c:1.20 Sun Nov 21 16:11:32 2010
+++ src/sys/arch/dreamcast/dev/g2/aica.c Tue Jul 19 15:52:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aica.c,v 1.20 2010/11/21 16:11:32 tsutsui Exp $ */
+/* $NetBSD: aica.c,v 1.21 2011/07/19 15:52:29 dyoung Exp $ */
/*
* Copyright (c) 2003 SHIMIZU Ryo <[email protected]>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.20 2010/11/21 16:11:32 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.21 2011/07/19 15:52:29 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,12 +37,12 @@
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/audioio.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/mulaw.h>
#include <dev/auconv.h>
-#include <machine/bus.h>
#include <machine/sysasicvar.h>
#include <dreamcast/dev/g2/g2busvar.h>
Index: src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c
diff -u src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.15 src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.16
--- src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.15 Sun Aug 23 14:28:09 2009
+++ src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c Tue Jul 19 15:52:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: g2bus_bus_mem.c,v 1.15 2009/08/23 14:28:09 tsutsui Exp $ */
+/* $NetBSD: g2bus_bus_mem.c,v 1.16 2011/07/19 15:52:29 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,14 +39,14 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: g2bus_bus_mem.c,v 1.15 2009/08/23 14:28:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g2bus_bus_mem.c,v 1.16 2011/07/19 15:52:29 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
#include <dreamcast/dev/g2/g2busvar.h>
Index: src/sys/arch/dreamcast/dev/g2/g2busvar.h
diff -u src/sys/arch/dreamcast/dev/g2/g2busvar.h:1.5 src/sys/arch/dreamcast/dev/g2/g2busvar.h:1.6
--- src/sys/arch/dreamcast/dev/g2/g2busvar.h:1.5 Sun Nov 21 16:11:32 2010
+++ src/sys/arch/dreamcast/dev/g2/g2busvar.h Tue Jul 19 15:52:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: g2busvar.h,v 1.5 2010/11/21 16:11:32 tsutsui Exp $ */
+/* $NetBSD: g2busvar.h,v 1.6 2011/07/19 15:52:29 dyoung Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -35,7 +35,7 @@
#ifndef _DREAMCAST_G2BUSVAR_H_
#define _DREAMCAST_G2BUSVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* G2 driver attach arguments
Index: src/sys/arch/dreamcast/dev/g2/g2rtc.c
diff -u src/sys/arch/dreamcast/dev/g2/g2rtc.c:1.5 src/sys/arch/dreamcast/dev/g2/g2rtc.c:1.6
--- src/sys/arch/dreamcast/dev/g2/g2rtc.c:1.5 Wed Sep 1 17:06:00 2010
+++ src/sys/arch/dreamcast/dev/g2/g2rtc.c Tue Jul 19 15:52:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: g2rtc.c,v 1.5 2010/09/01 17:06:00 tsutsui Exp $ */
+/* $NetBSD: g2rtc.c,v 1.6 2011/07/19 15:52:29 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,15 +27,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g2rtc.c,v 1.5 2010/09/01 17:06:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g2rtc.c,v 1.6 2011/07/19 15:52:29 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
-#include <machine/bus.h>
#include <dreamcast/dev/g2/g2busvar.h>
Index: src/sys/arch/dreamcast/dev/g2/gapspci.c
diff -u src/sys/arch/dreamcast/dev/g2/gapspci.c:1.18 src/sys/arch/dreamcast/dev/g2/gapspci.c:1.19
--- src/sys/arch/dreamcast/dev/g2/gapspci.c:1.18 Tue May 17 17:34:49 2011
+++ src/sys/arch/dreamcast/dev/g2/gapspci.c Tue Jul 19 15:52:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gapspci.c,v 1.18 2011/05/17 17:34:49 dyoung Exp $ */
+/* $NetBSD: gapspci.c,v 1.19 2011/07/19 15:52:29 dyoung Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gapspci.c,v 1.18 2011/05/17 17:34:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gapspci.c,v 1.19 2011/07/19 15:52:29 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,9 +42,9 @@
#include <sys/malloc.h>
#include <sys/conf.h>
#include <sys/mbuf.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/dreamcast/dev/g2/gapspci_dma.c
diff -u src/sys/arch/dreamcast/dev/g2/gapspci_dma.c:1.18 src/sys/arch/dreamcast/dev/g2/gapspci_dma.c:1.19
--- src/sys/arch/dreamcast/dev/g2/gapspci_dma.c:1.18 Fri Nov 12 13:18:56 2010
+++ src/sys/arch/dreamcast/dev/g2/gapspci_dma.c Tue Jul 19 15:52:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gapspci_dma.c,v 1.18 2010/11/12 13:18:56 uebayasi Exp $ */
+/* $NetBSD: gapspci_dma.c,v 1.19 2011/07/19 15:52:29 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gapspci_dma.c,v 1.18 2010/11/12 13:18:56 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gapspci_dma.c,v 1.19 2011/07/19 15:52:29 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,9 +47,9 @@
#include <sys/mbuf.h>
#include <sys/extent.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/dreamcast/dev/g2/gapspci_pci.c
diff -u src/sys/arch/dreamcast/dev/g2/gapspci_pci.c:1.12 src/sys/arch/dreamcast/dev/g2/gapspci_pci.c:1.13
--- src/sys/arch/dreamcast/dev/g2/gapspci_pci.c:1.12 Sun Nov 21 16:11:32 2010
+++ src/sys/arch/dreamcast/dev/g2/gapspci_pci.c Tue Jul 19 15:52:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gapspci_pci.c,v 1.12 2010/11/21 16:11:32 tsutsui Exp $ */
+/* $NetBSD: gapspci_pci.c,v 1.13 2011/07/19 15:52:30 dyoung Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@@ -38,15 +38,15 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gapspci_pci.c,v 1.12 2010/11/21 16:11:32 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gapspci_pci.c,v 1.13 2011/07/19 15:52:30 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
#include <machine/sysasicvar.h>
#include <dev/pci/pcivar.h>
Index: src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c
diff -u src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c:1.7 src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c:1.8
--- src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c:1.7 Sat Apr 12 06:27:01 2008
+++ src/sys/arch/dreamcast/dev/g2/if_mbe_g2.c Tue Jul 19 15:52:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mbe_g2.c,v 1.7 2008/04/12 06:27:01 tsutsui Exp $ */
+/* $NetBSD: if_mbe_g2.c,v 1.8 2011/07/19 15:52:30 dyoung Exp $ */
/*
* Copyright (c) 2002 Christian Groessler
@@ -64,17 +64,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mbe_g2.c,v 1.7 2008/04/12 06:27:01 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mbe_g2.c,v 1.8 2011/07/19 15:52:30 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>
#include <net/if_media.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/sysasicvar.h>
#include <machine/cpu.h>
Index: src/sys/arch/dreamcast/dev/maple/maple.c
diff -u src/sys/arch/dreamcast/dev/maple/maple.c:1.43 src/sys/arch/dreamcast/dev/maple/maple.c:1.44
--- src/sys/arch/dreamcast/dev/maple/maple.c:1.43 Fri Nov 12 13:18:57 2010
+++ src/sys/arch/dreamcast/dev/maple/maple.c Tue Jul 19 15:52:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: maple.c,v 1.43 2010/11/12 13:18:57 uebayasi Exp $ */
+/* $NetBSD: maple.c,v 1.44 2011/07/19 15:52:30 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.43 2010/11/12 13:18:57 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.44 2011/07/19 15:52:30 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -75,11 +75,11 @@
#include <sys/signalvar.h>
#include <sys/systm.h>
#include <sys/conf.h>
+#include <sys/bus.h>
#include <uvm/uvm.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
#include <machine/sysasicvar.h>
#include <sh3/pmap.h>
Index: src/sys/arch/dreamcast/dev/maple/mkbd.c
diff -u src/sys/arch/dreamcast/dev/maple/mkbd.c:1.28 src/sys/arch/dreamcast/dev/maple/mkbd.c:1.29
--- src/sys/arch/dreamcast/dev/maple/mkbd.c:1.28 Sun Oct 17 14:13:44 2010
+++ src/sys/arch/dreamcast/dev/maple/mkbd.c Tue Jul 19 15:52:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkbd.c,v 1.28 2010/10/17 14:13:44 tsutsui Exp $ */
+/* $NetBSD: mkbd.c,v 1.29 2011/07/19 15:52:30 dyoung Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mkbd.c,v 1.28 2010/10/17 14:13:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkbd.c,v 1.29 2011/07/19 15:52:30 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -43,6 +43,7 @@
#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/systm.h>
+#include <sys/bus.h>
#include "wskbd.h"
@@ -52,7 +53,6 @@
#include <dev/wscons/wsksymvar.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
#include <dreamcast/dev/maple/maple.h>
#include <dreamcast/dev/maple/mapleconf.h>
Index: src/sys/arch/dreamcast/include/Makefile
diff -u src/sys/arch/dreamcast/include/Makefile:1.17 src/sys/arch/dreamcast/include/Makefile:1.18
--- src/sys/arch/dreamcast/include/Makefile:1.17 Sun Jul 17 20:54:38 2011
+++ src/sys/arch/dreamcast/include/Makefile Tue Jul 19 15:52:30 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2011/07/17 20:54:38 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2011/07/19 15:52:30 dyoung Exp $
INCSDIR= /usr/include/dreamcast
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 \
Added files:
Index: src/sys/arch/dreamcast/include/bus_defs.h
diff -u /dev/null src/sys/arch/dreamcast/include/bus_defs.h:1.1
--- /dev/null Tue Jul 19 15:52:31 2011
+++ src/sys/arch/dreamcast/include/bus_defs.h Tue Jul 19 15:52:30 2011
@@ -0,0 +1,349 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:52:30 dyoung Exp $ */
+
+/*-
+ * Copyright (c) 1997, 1998, 2000, 2001 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 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ *
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ * Software Distribution Coordinator or [email protected]
+ * School of Computer Science
+ * Carnegie Mellon University
+ * Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+#ifndef _DREAMCAST_BUS_DEFS_H_
+#define _DREAMCAST_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 */
+
+/*
+ * Addresses (in bus space).
+ */
+typedef u_long bus_addr_t;
+typedef u_long bus_size_t;
+
+/*
+ * Access methods for bus space.
+ */
+typedef struct dreamcast_bus_space *bus_space_tag_t;
+typedef u_long bus_space_handle_t;
+
+struct dreamcast_bus_space {
+ /* cookie */
+ void *dbs_cookie;
+
+ /* mapping/unmapping */
+ int (*dbs_map)(void *, bus_addr_t, bus_size_t,
+ int, bus_space_handle_t *);
+ void (*dbs_unmap)(void *, bus_space_handle_t,
+ bus_size_t);
+ int (*dbs_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+ paddr_t (*dbs_mmap)(void *, bus_addr_t, off_t, int, int);
+
+ /* allocation/deallocation */
+ int (*dbs_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 (*dbs_free)(void *, bus_space_handle_t,
+ bus_size_t);
+
+ /* get kernel virtual address */
+ void * (*dbs_vaddr)(void *, bus_space_handle_t);
+
+ /* read (single) */
+ uint8_t (*dbs_r_1)(void *, bus_space_handle_t,
+ bus_size_t);
+ uint16_t (*dbs_r_2)(void *, bus_space_handle_t,
+ bus_size_t);
+ uint32_t (*dbs_r_4)(void *, bus_space_handle_t,
+ bus_size_t);
+ uint64_t (*dbs_r_8)(void *, bus_space_handle_t,
+ bus_size_t);
+
+ /* read multiple */
+ void (*dbs_rm_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t *, bus_size_t);
+ void (*dbs_rm_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t *, bus_size_t);
+ void (*dbs_rm_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t *, bus_size_t);
+ void (*dbs_rm_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t *, bus_size_t);
+
+ /* read region */
+ void (*dbs_rr_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t *, bus_size_t);
+ void (*dbs_rr_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t *, bus_size_t);
+ void (*dbs_rr_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t *, bus_size_t);
+ void (*dbs_rr_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t *, bus_size_t);
+
+ /* write (single) */
+ void (*dbs_w_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t);
+ void (*dbs_w_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t);
+ void (*dbs_w_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t);
+ void (*dbs_w_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t);
+
+ /* write multiple */
+ void (*dbs_wm_1)(void *, bus_space_handle_t,
+ bus_size_t, const uint8_t *, bus_size_t);
+ void (*dbs_wm_2)(void *, bus_space_handle_t,
+ bus_size_t, const uint16_t *, bus_size_t);
+ void (*dbs_wm_4)(void *, bus_space_handle_t,
+ bus_size_t, const uint32_t *, bus_size_t);
+ void (*dbs_wm_8)(void *, bus_space_handle_t,
+ bus_size_t, const uint64_t *, bus_size_t);
+
+ /* write region */
+ void (*dbs_wr_1)(void *, bus_space_handle_t,
+ bus_size_t, const uint8_t *, bus_size_t);
+ void (*dbs_wr_2)(void *, bus_space_handle_t,
+ bus_size_t, const uint16_t *, bus_size_t);
+ void (*dbs_wr_4)(void *, bus_space_handle_t,
+ bus_size_t, const uint32_t *, bus_size_t);
+ void (*dbs_wr_8)(void *, bus_space_handle_t,
+ bus_size_t, const uint64_t *, bus_size_t);
+
+ /* set multiple */
+ void (*dbs_sm_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t, bus_size_t);
+ void (*dbs_sm_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t, bus_size_t);
+ void (*dbs_sm_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t, bus_size_t);
+ void (*dbs_sm_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t, bus_size_t);
+
+ /* set region */
+ void (*dbs_sr_1)(void *, bus_space_handle_t,
+ bus_size_t, uint8_t, bus_size_t);
+ void (*dbs_sr_2)(void *, bus_space_handle_t,
+ bus_size_t, uint16_t, bus_size_t);
+ void (*dbs_sr_4)(void *, bus_space_handle_t,
+ bus_size_t, uint32_t, bus_size_t);
+ void (*dbs_sr_8)(void *, bus_space_handle_t,
+ bus_size_t, uint64_t, bus_size_t);
+
+ /* copy */
+ void (*dbs_c_1)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*dbs_c_2)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*dbs_c_4)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*dbs_c_8)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+};
+
+#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
+
+#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 dreamcast_bus_dma_tag *bus_dma_tag_t;
+typedef struct dreamcast_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 dreamcast_bus_dma_segment {
+ bus_addr_t ds_addr; /* DMA address */
+ bus_size_t ds_len; /* length of transfer */
+};
+typedef struct dreamcast_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 dreamcast_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 dreamcast_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_maxmaxsegsz; /* fixed 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.
+ */
+ int dm_nsegs; /* # valid segments in mapping */
+ bus_dma_segment_t dm_segs[1]; /* segments; variable length */
+ bus_size_t dm_mapsize; /* size of the mapping */
+ bus_size_t dm_maxsegsz; /* largest possible segment */
+};
+
+#endif /* _DREAMCAST_BUS_DEFS_H_ */
Index: src/sys/arch/dreamcast/include/bus_funcs.h
diff -u /dev/null src/sys/arch/dreamcast/include/bus_funcs.h:1.1
--- /dev/null Tue Jul 19 15:52:31 2011
+++ src/sys/arch/dreamcast/include/bus_funcs.h Tue Jul 19 15:52:31 2011
@@ -0,0 +1,309 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:52:31 dyoung Exp $ */
+
+/*-
+ * Copyright (c) 1997, 1998, 2000, 2001 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 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ *
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ * Software Distribution Coordinator or [email protected]
+ * School of Computer Science
+ * Carnegie Mellon University
+ * Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+#ifndef _DREAMCAST_BUS_FUNCS_H_
+#define _DREAMCAST_BUS_FUNCS_H_
+
+#ifdef _KERNEL
+/*
+ * Utility macros; INTERNAL USE ONLY.
+ */
+#define __dbs_c(a,b) __CONCAT(a,b)
+#define __dbs_opname(op,size) __dbs_c(__dbs_c(__dbs_c(dbs_,op),_),size)
+
+#define __dbs_rs(sz, tn, t, h, o) \
+ (__BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"), \
+ (*(t)->__dbs_opname(r,sz))((t)->dbs_cookie, h, o))
+
+#define __dbs_ws(sz, tn, t, h, o, v) \
+do { \
+ __BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"); \
+ (*(t)->__dbs_opname(w,sz))((t)->dbs_cookie, h, o, v); \
+} while (0)
+
+#define __dbs_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)->__dbs_opname(type,sz))((t)->dbs_cookie, h, o, a, c); \
+} while (0)
+
+#define __dbs_set(type, sz, tn, t, h, o, v, c) \
+do { \
+ __BUS_SPACE_ADDRESS_SANITY((h) + (o), tn, "bus addr"); \
+ (*(t)->__dbs_opname(type,sz))((t)->dbs_cookie, h, o, v, c); \
+} while (0)
+
+#define __dbs_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)->__dbs_opname(c,sz))((t)->dbs_cookie, h1, o1, h2, o2, cnt); \
+} while (0)
+
+
+/*
+ * Mapping and unmapping operations.
+ */
+#define bus_space_map(t, a, s, f, hp) \
+ (*(t)->dbs_map)((t)->dbs_cookie, (a), (s), (f), (hp))
+#define bus_space_unmap(t, h, s) \
+ (*(t)->dbs_unmap)((t)->dbs_cookie, (h), (s))
+#define bus_space_subregion(t, h, o, s, hp) \
+ (*(t)->dbs_subregion)((t)->dbs_cookie, (h), (o), (s), (hp))
+#define bus_space_mmap(t, a, o, p, f) \
+ (*(t)->dbs_mmap)((t)->dbs_cookie, (a), (o), (p), (f))
+
+#endif /* _KERNEL */
+
+#ifdef _KERNEL
+/*
+ * Allocation and deallocation operations.
+ */
+#define bus_space_alloc(t, rs, re, s, a, b, f, ap, hp) \
+ (*(t)->dbs_alloc)((t)->dbs_cookie, (rs), (re), (s), (a), (b), \
+ (f), (ap), (hp))
+#define bus_space_free(t, h, s) \
+ (*(t)->dbs_free)((t)->dbs_cookie, (h), (s))
+
+/*
+ * Get kernel virtual address for ranges mapped BUS_SPACE_MAP_LINEAR.
+ */
+#define bus_space_vaddr(t, h) \
+ (*(t)->dbs_vaddr)((t)->dbs_cookie, (h))
+
+/*
+ * Bus barrier operations. The Dreamcast 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) __dbs_rs(1,uint8_t,(t),(h),(o))
+#define bus_space_read_2(t, h, o) __dbs_rs(2,uint16_t,(t),(h),(o))
+#define bus_space_read_4(t, h, o) __dbs_rs(4,uint32_t,(t),(h),(o))
+#define bus_space_read_8(t, h, o) __dbs_rs(8,uint64_t,(t),(h),(o))
+
+
+/*
+ * Bus read multiple operations.
+ */
+#define bus_space_read_multi_1(t, h, o, a, c) \
+ __dbs_nonsingle(rm,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_read_multi_2(t, h, o, a, c) \
+ __dbs_nonsingle(rm,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_read_multi_4(t, h, o, a, c) \
+ __dbs_nonsingle(rm,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_read_multi_8(t, h, o, a, c) \
+ __dbs_nonsingle(rm,8,uint64_t,(t),(h),(o),(a),(c))
+
+
+/*
+ * Bus read region operations.
+ */
+#define bus_space_read_region_1(t, h, o, a, c) \
+ __dbs_nonsingle(rr,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_read_region_2(t, h, o, a, c) \
+ __dbs_nonsingle(rr,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_read_region_4(t, h, o, a, c) \
+ __dbs_nonsingle(rr,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_read_region_8(t, h, o, a, c) \
+ __dbs_nonsingle(rr,8,uint64_t,(t),(h),(o),(a),(c))
+
+
+/*
+ * Bus write (single) operations.
+ */
+#define bus_space_write_1(t, h, o, v) __dbs_ws(1,uint8_t,(t),(h),(o),(v))
+#define bus_space_write_2(t, h, o, v) __dbs_ws(2,uint16_t,(t),(h),(o),(v))
+#define bus_space_write_4(t, h, o, v) __dbs_ws(4,uint32_t,(t),(h),(o),(v))
+#define bus_space_write_8(t, h, o, v) __dbs_ws(8,uint64_t,(t),(h),(o),(v))
+
+
+/*
+ * Bus write multiple operations.
+ */
+#define bus_space_write_multi_1(t, h, o, a, c) \
+ __dbs_nonsingle(wm,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_write_multi_2(t, h, o, a, c) \
+ __dbs_nonsingle(wm,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_write_multi_4(t, h, o, a, c) \
+ __dbs_nonsingle(wm,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_write_multi_8(t, h, o, a, c) \
+ __dbs_nonsingle(wm,8,uint64_t,(t),(h),(o),(a),(c))
+
+
+/*
+ * Bus write region operations.
+ */
+#define bus_space_write_region_1(t, h, o, a, c) \
+ __dbs_nonsingle(wr,1,uint8_t,(t),(h),(o),(a),(c))
+#define bus_space_write_region_2(t, h, o, a, c) \
+ __dbs_nonsingle(wr,2,uint16_t,(t),(h),(o),(a),(c))
+#define bus_space_write_region_4(t, h, o, a, c) \
+ __dbs_nonsingle(wr,4,uint32_t,(t),(h),(o),(a),(c))
+#define bus_space_write_region_8(t, h, o, a, c) \
+ __dbs_nonsingle(wr,8,uint64_t,(t),(h),(o),(a),(c))
+
+
+/*
+ * Set multiple operations.
+ */
+#define bus_space_set_multi_1(t, h, o, v, c) \
+ __dbs_set(sm,1,uint8_t,(t),(h),(o),(v),(c))
+#define bus_space_set_multi_2(t, h, o, v, c) \
+ __dbs_set(sm,2,uint16_t,(t),(h),(o),(v),(c))
+#define bus_space_set_multi_4(t, h, o, v, c) \
+ __dbs_set(sm,4,uint32_t,(t),(h),(o),(v),(c))
+#define bus_space_set_multi_8(t, h, o, v, c) \
+ __dbs_set(sm,8,uint64_t,(t),(h),(o),(v),(c))
+
+
+/*
+ * Set region operations.
+ */
+#define bus_space_set_region_1(t, h, o, v, c) \
+ __dbs_set(sr,1,uint8_t,(t),(h),(o),(v),(c))
+#define bus_space_set_region_2(t, h, o, v, c) \
+ __dbs_set(sr,2,uint16_t,(t),(h),(o),(v),(c))
+#define bus_space_set_region_4(t, h, o, v, c) \
+ __dbs_set(sr,4,uint32_t,(t),(h),(o),(v),(c))
+#define bus_space_set_region_8(t, h, o, v, c) \
+ __dbs_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) \
+ __dbs_copy(1, uint8_t, (t), (h1), (o1), (h2), (o2), (c))
+#define bus_space_copy_region_2(t, h1, o1, h2, o2, c) \
+ __dbs_copy(2, uint16_t, (t), (h1), (o1), (h2), (o2), (c))
+#define bus_space_copy_region_4(t, h1, o1, h2, o2, c) \
+ __dbs_copy(4, uint32_t, (t), (h1), (o1), (h2), (o2), (c))
+#define bus_space_copy_region_8(t, h1, o1, h2, o2, c) \
+ __dbs_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 1
+#define bus_space_read_stream_1 bus_space_read_1
+#define bus_space_read_stream_2 bus_space_read_2
+#define bus_space_read_stream_4 bus_space_read_4
+#define bus_space_read_stream_8 bus_space_read_8
+#define bus_space_read_multi_stream_1 bus_space_read_multi_1
+#define bus_space_read_multi_stream_2 bus_space_read_multi_2
+#define bus_space_read_multi_stream_4 bus_space_read_multi_4
+#define bus_space_read_multi_stream_8 bus_space_read_multi_8
+#define bus_space_read_region_stream_1 bus_space_read_region_1
+#define bus_space_read_region_stream_2 bus_space_read_region_2
+#define bus_space_read_region_stream_4 bus_space_read_region_4
+#define bus_space_read_region_stream_8 bus_space_read_region_8
+#define bus_space_write_stream_1 bus_space_write_1
+#define bus_space_write_stream_2 bus_space_write_2
+#define bus_space_write_stream_4 bus_space_write_4
+#define bus_space_write_stream_8 bus_space_write_8
+#define bus_space_write_multi_stream_1 bus_space_write_multi_1
+#define bus_space_write_multi_stream_2 bus_space_write_multi_2
+#define bus_space_write_multi_stream_4 bus_space_write_multi_4
+#define bus_space_write_multi_stream_8 bus_space_write_multi_8
+#define bus_space_write_region_stream_1 bus_space_write_region_1
+#define bus_space_write_region_stream_2 bus_space_write_region_2
+#define bus_space_write_region_stream_4 bus_space_write_region_4
+#define bus_space_write_region_stream_8 bus_space_write_region_8
+
+#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)
+
+#endif /* _DREAMCAST_BUS_FUNCS_H_ */
