Module Name: src
Committed By: dyoung
Date: Tue Jul 19 15:17:20 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.mmeye
src/sys/arch/mmeye/dev: com_mainbus.c mmeyepcmcia.c
src/sys/arch/mmeye/include: Makefile autoconf.h
Added Files:
src/sys/arch/mmeye/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/mmeye/include: bus.h
Log Message:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
Mark mmeye/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/comp/md.mmeye
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mmeye/dev/com_mainbus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mmeye/dev/mmeyepcmcia.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mmeye/include/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mmeye/include/autoconf.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/mmeye/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/mmeye/include/bus_defs.h \
src/sys/arch/mmeye/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.mmeye
diff -u src/distrib/sets/lists/comp/md.mmeye:1.29 src/distrib/sets/lists/comp/md.mmeye:1.30
--- src/distrib/sets/lists/comp/md.mmeye:1.29 Mon Jul 18 17:39:05 2011
+++ src/distrib/sets/lists/comp/md.mmeye Tue Jul 19 15:17:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.mmeye,v 1.29 2011/07/18 17:39:05 dyoung Exp $
+# $NetBSD: md.mmeye,v 1.30 2011/07/19 15:17:20 dyoung Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/mmeye comp-c-include
./usr/include/mmeye/_G_config.h comp-obsolete obsolete
@@ -7,7 +7,7 @@
./usr/include/mmeye/asm.h comp-c-include
./usr/include/mmeye/bootinfo.h comp-obsolete obsolete
./usr/include/mmeye/bswap.h comp-c-include
-./usr/include/mmeye/bus.h comp-c-include
+./usr/include/mmeye/bus.h comp-obsolete obsolete
./usr/include/mmeye/cdefs.h comp-c-include
./usr/include/mmeye/coff_machdep.h comp-c-include
./usr/include/mmeye/conf.h comp-obsolete obsolete
Index: src/sys/arch/mmeye/dev/com_mainbus.c
diff -u src/sys/arch/mmeye/dev/com_mainbus.c:1.11 src/sys/arch/mmeye/dev/com_mainbus.c:1.12
--- src/sys/arch/mmeye/dev/com_mainbus.c:1.11 Sat Feb 19 10:46:28 2011
+++ src/sys/arch/mmeye/dev/com_mainbus.c Tue Jul 19 15:17:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mainbus.c,v 1.11 2011/02/19 10:46:28 kiyohara Exp $ */
+/* $NetBSD: com_mainbus.c,v 1.12 2011/07/19 15:17:20 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.11 2011/02/19 10:46:28 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.12 2011/07/19 15:17:20 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,8 +36,8 @@
#include <sys/termios.h>
#include <dev/cons.h>
#include <sys/conf.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
#include <machine/mmeye.h>
Index: src/sys/arch/mmeye/dev/mmeyepcmcia.c
diff -u src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.19 src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.20
--- src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.19 Sat Feb 19 10:46:28 2011
+++ src/sys/arch/mmeye/dev/mmeyepcmcia.c Tue Jul 19 15:17:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mmeyepcmcia.c,v 1.19 2011/02/19 10:46:28 kiyohara Exp $ */
+/* $NetBSD: mmeyepcmcia.c,v 1.20 2011/07/19 15:17:20 dyoung Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.19 2011/02/19 10:46:28 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.20 2011/07/19 15:17:20 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -48,11 +48,11 @@
#include <sys/extent.h>
#include <sys/malloc.h>
#include <sys/kthread.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/mmeye.h>
Index: src/sys/arch/mmeye/include/Makefile
diff -u src/sys/arch/mmeye/include/Makefile:1.24 src/sys/arch/mmeye/include/Makefile:1.25
--- src/sys/arch/mmeye/include/Makefile:1.24 Sun Jul 17 20:54:44 2011
+++ src/sys/arch/mmeye/include/Makefile Tue Jul 19 15:17:20 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2011/07/17 20:54:44 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2011/07/19 15:17:20 dyoung Exp $
INCSDIR= /usr/include/mmeye
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/mmeye/include/autoconf.h
diff -u src/sys/arch/mmeye/include/autoconf.h:1.4 src/sys/arch/mmeye/include/autoconf.h:1.5
--- src/sys/arch/mmeye/include/autoconf.h:1.4 Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mmeye/include/autoconf.h Tue Jul 19 15:17:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.4 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: autoconf.h,v 1.5 2011/07/19 15:17:20 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct mainbus_attach_args {
const char *ma_name;
Added files:
Index: src/sys/arch/mmeye/include/bus_defs.h
diff -u /dev/null src/sys/arch/mmeye/include/bus_defs.h:1.1
--- /dev/null Tue Jul 19 15:17:20 2011
+++ src/sys/arch/mmeye/include/bus_defs.h Tue Jul 19 15:17:20 2011
@@ -0,0 +1,26 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:17:20 dyoung Exp $ */
+
+#ifndef _MMEYE_BUS_DEFS_H_
+#define _MMEYE_BUS_DEFS_H_
+
+#include <sh3/bus_defs.h>
+
+/*
+ * Dummy bus_dma(9)
+ * XXX: mmeye doesn't use bus_dma.
+ */
+typedef void *bus_dma_tag_t;
+
+typedef struct bus_dma_segment {
+ bus_addr_t ds_addr;
+ bus_size_t ds_len;
+} bus_dma_segment_t;
+
+typedef struct bus_dmamap {
+ bus_size_t dm_maxsegsz;
+ bus_size_t dm_mapsize;
+ int dm_nsegs;
+ bus_dma_segment_t *dm_segs;
+} *bus_dmamap_t;
+
+#endif /* _MMEYE_BUS_DEFS_H_ */
Index: src/sys/arch/mmeye/include/bus_funcs.h
diff -u /dev/null src/sys/arch/mmeye/include/bus_funcs.h:1.1
--- /dev/null Tue Jul 19 15:17:20 2011
+++ src/sys/arch/mmeye/include/bus_funcs.h Tue Jul 19 15:17:20 2011
@@ -0,0 +1,3 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:17:20 dyoung Exp $ */
+
+#include <sh3/bus_funcs.h>
