Module Name: src
Committed By: dyoung
Date: Tue Jul 19 15:59:54 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.acorn32
src/sys/arch/acorn32/acorn32: rpc_machdep.c
src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c if_cs.c rsbus.c
rsbus.h rsbus_io.c rside.c
src/sys/arch/acorn32/include: Makefile podulebus_machdep.h
src/sys/arch/acorn32/mainbus: atppc_pioc.c com_pioc.c fd.c lpt_pioc.c
pioc.c piocvar.h wdc_pioc.c
src/sys/arch/acorn32/podulebus: amps.c asc.c icside.c if_ne_pbus.c
podulebus_io.c rapide.c sbic.c simide.c
Added Files:
src/sys/arch/acorn32/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/acorn32/include: bus.h
Log Message:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
Mark acorn32/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/comp/md.acorn32
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/acorn32/eb7500atx/if_cs.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/acorn32/eb7500atx/rsbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/acorn32/eb7500atx/rsbus.h \
src/sys/arch/acorn32/eb7500atx/rsbus_io.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/acorn32/eb7500atx/rside.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn32/include/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/acorn32/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/acorn32/include/bus_defs.h \
src/sys/arch/acorn32/include/bus_funcs.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/acorn32/include/podulebus_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn32/mainbus/atppc_pioc.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn32/mainbus/com_pioc.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/acorn32/mainbus/fd.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/acorn32/mainbus/lpt_pioc.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/acorn32/mainbus/pioc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/acorn32/mainbus/piocvar.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/acorn32/mainbus/wdc_pioc.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/acorn32/podulebus/amps.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/acorn32/podulebus/asc.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/acorn32/podulebus/icside.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn32/podulebus/if_ne_pbus.c \
src/sys/arch/acorn32/podulebus/sbic.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/acorn32/podulebus/podulebus_io.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn32/podulebus/rapide.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/acorn32/podulebus/simide.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.acorn32
diff -u src/distrib/sets/lists/comp/md.acorn32:1.25 src/distrib/sets/lists/comp/md.acorn32:1.26
--- src/distrib/sets/lists/comp/md.acorn32:1.25 Sun Jul 17 20:54:31 2011
+++ src/distrib/sets/lists/comp/md.acorn32 Tue Jul 19 15:59:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.acorn32,v 1.25 2011/07/17 20:54:31 joerg Exp $
+# $NetBSD: md.acorn32,v 1.26 2011/07/19 15:59:51 dyoung Exp $
#./usr/include/acorn32/devmap.h comp-c-include
./usr/include/acorn32 comp-c-include
./usr/include/acorn32/ansi.h comp-c-include
@@ -6,7 +6,7 @@
./usr/include/acorn32/asm.h comp-c-include
./usr/include/acorn32/beep.h comp-obsolete obsolete
./usr/include/acorn32/bswap.h comp-c-include
-./usr/include/acorn32/bus.h comp-c-include
+./usr/include/acorn32/bus.h comp-obsolete obsolete
./usr/include/acorn32/cdefs.h comp-c-include
./usr/include/acorn32/conf.h comp-obsolete obsolete
./usr/include/acorn32/cpu.h comp-c-include
Index: src/sys/arch/acorn32/acorn32/rpc_machdep.c
diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.81 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.82
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.81 Thu Jun 30 20:09:16 2011
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c Tue Jul 19 15:59:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.81 2011/06/30 20:09:16 wiz Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.82 2011/07/19 15:59:52 dyoung Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.81 2011/06/30 20:09:16 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.82 2011/07/19 15:59:52 dyoung Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -65,6 +65,7 @@
#include <sys/exec.h>
#include <sys/exec_aout.h>
#include <sys/ksyms.h>
+#include <sys/bus.h>
#include <dev/cons.h>
@@ -85,7 +86,6 @@
#include <arm/arm32/machdep.h>
#include <arm/undefined.h>
#include <machine/rtc.h>
-#include <machine/bus.h>
#include <arm/iomd/vidc.h>
#include <arm/iomd/iomdreg.h>
Index: src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
diff -u src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.20 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.21
--- src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.20 Thu Jun 30 20:09:17 2011
+++ src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Tue Jul 19 15:59:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eb7500atx_machdep.c,v 1.20 2011/06/30 20:09:17 wiz Exp $ */
+/* $NetBSD: eb7500atx_machdep.c,v 1.21 2011/07/19 15:59:52 dyoung Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.20 2011/06/30 20:09:17 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.21 2011/07/19 15:59:52 dyoung Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -65,6 +65,7 @@
#include <sys/exec.h>
#include <sys/exec_aout.h>
#include <sys/ksyms.h>
+#include <sys/bus.h>
#include <dev/cons.h>
@@ -85,7 +86,6 @@
#include <arm/arm32/machdep.h>
#include <arm/undefined.h>
#include <machine/rtc.h>
-#include <machine/bus.h>
#include <arm/iomd/vidc.h>
#include <arm/iomd/iomdreg.h>
Index: src/sys/arch/acorn32/eb7500atx/if_cs.c
diff -u src/sys/arch/acorn32/eb7500atx/if_cs.c:1.6 src/sys/arch/acorn32/eb7500atx/if_cs.c:1.7
--- src/sys/arch/acorn32/eb7500atx/if_cs.c:1.6 Tue Sep 22 14:55:19 2009
+++ src/sys/arch/acorn32/eb7500atx/if_cs.c Tue Jul 19 15:59:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs.c,v 1.6 2009/09/22 14:55:19 tsutsui Exp $ */
+/* $NetBSD: if_cs.c,v 1.7 2011/07/19 15:59:52 dyoung Exp $ */
/*
* Copyright (c) 2004 Christopher Gilbert
@@ -58,12 +58,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.6 2009/09/22 14:55:19 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.7 2011/07/19 15:59:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/socket.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include "rnd.h"
#if NRND > 0
@@ -74,7 +75,6 @@
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <acorn32/eb7500atx/rsbus.h>
Index: src/sys/arch/acorn32/eb7500atx/rsbus.c
diff -u src/sys/arch/acorn32/eb7500atx/rsbus.c:1.8 src/sys/arch/acorn32/eb7500atx/rsbus.c:1.9
--- src/sys/arch/acorn32/eb7500atx/rsbus.c:1.8 Fri Jun 3 07:35:37 2011
+++ src/sys/arch/acorn32/eb7500atx/rsbus.c Tue Jul 19 15:59:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.c,v 1.8 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: rsbus.c,v 1.9 2011/07/19 15:59:52 dyoung Exp $ */
/*
* Copyright (c) 2002
@@ -29,13 +29,12 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.8 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.9 2011/07/19 15:59:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <acorn32/eb7500atx/rsbus.h>
Index: src/sys/arch/acorn32/eb7500atx/rsbus.h
diff -u src/sys/arch/acorn32/eb7500atx/rsbus.h:1.2 src/sys/arch/acorn32/eb7500atx/rsbus.h:1.3
--- src/sys/arch/acorn32/eb7500atx/rsbus.h:1.2 Sun Dec 11 12:16:05 2005
+++ src/sys/arch/acorn32/eb7500atx/rsbus.h Tue Jul 19 15:59:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.h,v 1.2 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: rsbus.h,v 1.3 2011/07/19 15:59:52 dyoung Exp $ */
#ifndef _RSBUS_H_
#define _RSBUS_H_
@@ -6,8 +6,7 @@
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/queue.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
struct rsbus_softc {
struct device sc_dev;
Index: src/sys/arch/acorn32/eb7500atx/rsbus_io.c
diff -u src/sys/arch/acorn32/eb7500atx/rsbus_io.c:1.2 src/sys/arch/acorn32/eb7500atx/rsbus_io.c:1.3
--- src/sys/arch/acorn32/eb7500atx/rsbus_io.c:1.2 Sun Dec 11 12:16:05 2005
+++ src/sys/arch/acorn32/eb7500atx/rsbus_io.c Tue Jul 19 15:59:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus_io.c,v 1.2 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: rsbus_io.c,v 1.3 2011/07/19 15:59:52 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -37,11 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsbus_io.c,v 1.2 2005/12/11 12:16:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus_io.c,v 1.3 2011/07/19 15:59:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Proto types for all the bus_space structure functions */
Index: src/sys/arch/acorn32/eb7500atx/rside.c
diff -u src/sys/arch/acorn32/eb7500atx/rside.c:1.10 src/sys/arch/acorn32/eb7500atx/rside.c:1.11
--- src/sys/arch/acorn32/eb7500atx/rside.c:1.10 Sun Nov 23 11:55:27 2008
+++ src/sys/arch/acorn32/eb7500atx/rside.c Tue Jul 19 15:59:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rside.c,v 1.10 2008/11/23 11:55:27 chris Exp $ */
+/* $NetBSD: rside.c,v 1.11 2011/07/19 15:59:52 dyoung Exp $ */
/*
* Copyright (c) 2004 Christopher Gilbert
@@ -56,17 +56,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rside.c,v 1.10 2008/11/23 11:55:27 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rside.c,v 1.11 2011/07/19 15:59:52 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/io.h>
-#include <machine/bus.h>
#include <acorn32/eb7500atx/rsidereg.h>
#include <machine/irqhandler.h>
Index: src/sys/arch/acorn32/include/Makefile
diff -u src/sys/arch/acorn32/include/Makefile:1.26 src/sys/arch/acorn32/include/Makefile:1.27
--- src/sys/arch/acorn32/include/Makefile:1.26 Sun Jul 17 20:54:35 2011
+++ src/sys/arch/acorn32/include/Makefile Tue Jul 19 15:59:52 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2011/07/17 20:54:35 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2011/07/19 15:59:52 dyoung Exp $
INCSDIR= /usr/include/acorn32
INCS= ansi.h aout_machdep.h asm.h \
- bswap.h bus.h \
+ bswap.h \
cdefs.h cpu.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/acorn32/include/podulebus_machdep.h
diff -u src/sys/arch/acorn32/include/podulebus_machdep.h:1.3 src/sys/arch/acorn32/include/podulebus_machdep.h:1.4
--- src/sys/arch/acorn32/include/podulebus_machdep.h:1.3 Fri Jun 3 07:35:37 2011
+++ src/sys/arch/acorn32/include/podulebus_machdep.h Tue Jul 19 15:59:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus_machdep.h,v 1.3 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: podulebus_machdep.h,v 1.4 2011/07/19 15:59:53 dyoung Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/io.h>
/* Define the structure used to describe a podule */
Index: src/sys/arch/acorn32/mainbus/atppc_pioc.c
diff -u src/sys/arch/acorn32/mainbus/atppc_pioc.c:1.5 src/sys/arch/acorn32/mainbus/atppc_pioc.c:1.6
--- src/sys/arch/acorn32/mainbus/atppc_pioc.c:1.5 Tue May 12 07:06:53 2009
+++ src/sys/arch/acorn32/mainbus/atppc_pioc.c Tue Jul 19 15:59:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_pioc.c,v 1.5 2009/05/12 07:06:53 cegger Exp $ */
+/* $NetBSD: atppc_pioc.c,v 1.6 2011/07/19 15:59:53 dyoung Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -32,15 +32,15 @@
#include "opt_atppc.h"
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_pioc.c,v 1.5 2009/05/12 07:06:53 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_pioc.c,v 1.6 2011/07/19 15:59:53 dyoung Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/intr.h>
-#include <machine/bus.h>
#include <arch/acorn32/mainbus/piocvar.h>
Index: src/sys/arch/acorn32/mainbus/com_pioc.c
diff -u src/sys/arch/acorn32/mainbus/com_pioc.c:1.15 src/sys/arch/acorn32/mainbus/com_pioc.c:1.16
--- src/sys/arch/acorn32/mainbus/com_pioc.c:1.15 Fri Jun 3 07:35:37 2011
+++ src/sys/arch/acorn32/mainbus/com_pioc.c Tue Jul 19 15:59:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_pioc.c,v 1.15 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: com_pioc.c,v 1.16 2011/07/19 15:59:53 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: com_pioc.c,v 1.15 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pioc.c,v 1.16 2011/07/19 15:59:53 dyoung Exp $");
#include <sys/systm.h>
#include <sys/tty.h>
@@ -70,9 +70,9 @@
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/intr.h>
-#include <machine/bus.h>
#include <machine/io.h>
#include <acorn32/mainbus/piocvar.h>
Index: src/sys/arch/acorn32/mainbus/fd.c
diff -u src/sys/arch/acorn32/mainbus/fd.c:1.50 src/sys/arch/acorn32/mainbus/fd.c:1.51
--- src/sys/arch/acorn32/mainbus/fd.c:1.50 Fri Jun 3 07:35:37 2011
+++ src/sys/arch/acorn32/mainbus/fd.c Tue Jul 19 15:59:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.50 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: fd.c,v 1.51 2011/07/19 15:59:53 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.50 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.51 2011/07/19 15:59:53 dyoung Exp $");
#include "opt_ddb.h"
@@ -104,6 +104,7 @@
#include <sys/proc.h>
#include <sys/fdio.h>
#include <sys/conf.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
@@ -113,7 +114,6 @@
#include <machine/intr.h>
#include <machine/io.h>
#include <arm/arm32/katelib.h>
-#include <machine/bus.h>
#include <arm/iomd/iomdreg.h>
#include <arm/iomd/iomdvar.h>
Index: src/sys/arch/acorn32/mainbus/lpt_pioc.c
diff -u src/sys/arch/acorn32/mainbus/lpt_pioc.c:1.11 src/sys/arch/acorn32/mainbus/lpt_pioc.c:1.12
--- src/sys/arch/acorn32/mainbus/lpt_pioc.c:1.11 Fri Jun 3 07:35:37 2011
+++ src/sys/arch/acorn32/mainbus/lpt_pioc.c Tue Jul 19 15:59:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_pioc.c,v 1.11 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: lpt_pioc.c,v 1.12 2011/07/19 15:59:53 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -36,12 +36,12 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_pioc.c,v 1.11 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_pioc.c,v 1.12 2011/07/19 15:59:53 dyoung Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <acorn32/mainbus/piocvar.h>
#include <dev/ic/lptreg.h>
Index: src/sys/arch/acorn32/mainbus/pioc.c
diff -u src/sys/arch/acorn32/mainbus/pioc.c:1.16 src/sys/arch/acorn32/mainbus/pioc.c:1.17
--- src/sys/arch/acorn32/mainbus/pioc.c:1.16 Fri Jun 3 07:35:37 2011
+++ src/sys/arch/acorn32/mainbus/pioc.c Tue Jul 19 15:59:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pioc.c,v 1.16 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: pioc.c,v 1.17 2011/07/19 15:59:53 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -41,14 +41,14 @@
/*#define PIOC_DEBUG*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.16 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.17 2011/07/19 15:59:53 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <arm/mainbus/mainbus.h>
#include <acorn32/mainbus/piocreg.h>
#include <acorn32/mainbus/piocvar.h>
Index: src/sys/arch/acorn32/mainbus/piocvar.h
diff -u src/sys/arch/acorn32/mainbus/piocvar.h:1.1 src/sys/arch/acorn32/mainbus/piocvar.h:1.2
--- src/sys/arch/acorn32/mainbus/piocvar.h:1.1 Fri Oct 5 22:27:53 2001
+++ src/sys/arch/acorn32/mainbus/piocvar.h Tue Jul 19 15:59:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: piocvar.h,v 1.1 2001/10/05 22:27:53 reinoud Exp $ */
+/* $NetBSD: piocvar.h,v 1.2 2011/07/19 15:59:53 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -41,7 +41,7 @@
* Created : 18/02/97
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* pioc driver attach arguments
Index: src/sys/arch/acorn32/mainbus/wdc_pioc.c
diff -u src/sys/arch/acorn32/mainbus/wdc_pioc.c:1.24 src/sys/arch/acorn32/mainbus/wdc_pioc.c:1.25
--- src/sys/arch/acorn32/mainbus/wdc_pioc.c:1.24 Fri Jun 3 07:35:37 2011
+++ src/sys/arch/acorn32/mainbus/wdc_pioc.c Tue Jul 19 15:59:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pioc.c,v 1.24 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: wdc_pioc.c,v 1.25 2011/07/19 15:59:53 dyoung Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe.
@@ -34,14 +34,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pioc.c,v 1.24 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pioc.c,v 1.25 2011/07/19 15:59:53 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <acorn32/mainbus/piocvar.h>
Index: src/sys/arch/acorn32/podulebus/amps.c
diff -u src/sys/arch/acorn32/podulebus/amps.c:1.18 src/sys/arch/acorn32/podulebus/amps.c:1.19
--- src/sys/arch/acorn32/podulebus/amps.c:1.18 Fri Jun 3 07:35:37 2011
+++ src/sys/arch/acorn32/podulebus/amps.c Tue Jul 19 15:59:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: amps.c,v 1.18 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: amps.c,v 1.19 2011/07/19 15:59:54 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.18 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amps.c,v 1.19 2011/07/19 15:59:54 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,10 +52,10 @@
#include <sys/syslog.h>
#include <sys/types.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/io.h>
-#include <machine/bus.h>
#include <acorn32/podulebus/podulebus.h>
#include <acorn32/podulebus/ampsreg.h>
#include <dev/ic/comreg.h>
Index: src/sys/arch/acorn32/podulebus/asc.c
diff -u src/sys/arch/acorn32/podulebus/asc.c:1.17 src/sys/arch/acorn32/podulebus/asc.c:1.18
--- src/sys/arch/acorn32/podulebus/asc.c:1.17 Fri Jun 3 07:35:37 2011
+++ src/sys/arch/acorn32/podulebus/asc.c Tue Jul 19 15:59:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: asc.c,v 1.17 2011/06/03 07:35:37 matt Exp $ */
+/* $NetBSD: asc.c,v 1.18 2011/07/19 15:59:54 dyoung Exp $ */
/*
* Copyright (c) 2001 Richard Earnshaw
@@ -98,16 +98,16 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.17 2011/06/03 07:35:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.18 2011/07/19 15:59:54 dyoung Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/bootconfig.h> /* asc_poll */
Index: src/sys/arch/acorn32/podulebus/icside.c
diff -u src/sys/arch/acorn32/podulebus/icside.c:1.28 src/sys/arch/acorn32/podulebus/icside.c:1.29
--- src/sys/arch/acorn32/podulebus/icside.c:1.28 Tue May 12 06:54:10 2009
+++ src/sys/arch/acorn32/podulebus/icside.c Tue Jul 19 15:59:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: icside.c,v 1.28 2009/05/12 06:54:10 cegger Exp $ */
+/* $NetBSD: icside.c,v 1.29 2011/07/19 15:59:54 dyoung Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@@ -42,16 +42,16 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: icside.c,v 1.28 2009/05/12 06:54:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icside.c,v 1.29 2011/07/19 15:59:54 dyoung Exp $");
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/io.h>
-#include <machine/bus.h>
#include <acorn32/podulebus/podulebus.h>
#include <acorn32/podulebus/icsidereg.h>
Index: src/sys/arch/acorn32/podulebus/if_ne_pbus.c
diff -u src/sys/arch/acorn32/podulebus/if_ne_pbus.c:1.15 src/sys/arch/acorn32/podulebus/if_ne_pbus.c:1.16
--- src/sys/arch/acorn32/podulebus/if_ne_pbus.c:1.15 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/acorn32/podulebus/if_ne_pbus.c Tue Jul 19 15:59:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pbus.c,v 1.15 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: if_ne_pbus.c,v 1.16 2011/07/19 15:59:54 dyoung Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -50,20 +50,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pbus.c,v 1.15 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pbus.c,v 1.16 2011/07/19 15:59:54 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/socket.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/io.h>
#include <dev/ic/dp8390reg.h>
Index: src/sys/arch/acorn32/podulebus/sbic.c
diff -u src/sys/arch/acorn32/podulebus/sbic.c:1.15 src/sys/arch/acorn32/podulebus/sbic.c:1.16
--- src/sys/arch/acorn32/podulebus/sbic.c:1.15 Tue May 12 06:54:10 2009
+++ src/sys/arch/acorn32/podulebus/sbic.c Tue Jul 19 15:59:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.15 2009/05/12 06:54:10 cegger Exp $ */
+/* $NetBSD: sbic.c,v 1.16 2011/07/19 15:59:54 dyoung Exp $ */
/*
* Copyright (c) 2001 Richard Earnshaw
@@ -114,17 +114,17 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.15 2009/05/12 06:54:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.16 2011/07/19 15:59:54 dyoung Exp $");
#include <sys/systm.h>
#include <sys/callout.h>
#include <sys/kernel.h> /* For hz */
#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <dev/scsipi/scsi_all.h>
Index: src/sys/arch/acorn32/podulebus/podulebus_io.c
diff -u src/sys/arch/acorn32/podulebus/podulebus_io.c:1.6 src/sys/arch/acorn32/podulebus/podulebus_io.c:1.7
--- src/sys/arch/acorn32/podulebus/podulebus_io.c:1.6 Sun Mar 15 22:18:35 2009
+++ src/sys/arch/acorn32/podulebus/podulebus_io.c Tue Jul 19 15:59:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus_io.c,v 1.6 2009/03/15 22:18:35 cegger Exp $ */
+/* $NetBSD: podulebus_io.c,v 1.7 2011/07/19 15:59:54 dyoung Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -37,11 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus_io.c,v 1.6 2009/03/15 22:18:35 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus_io.c,v 1.7 2011/07/19 15:59:54 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Proto types for all the bus_space structure functions */
Index: src/sys/arch/acorn32/podulebus/rapide.c
diff -u src/sys/arch/acorn32/podulebus/rapide.c:1.26 src/sys/arch/acorn32/podulebus/rapide.c:1.27
--- src/sys/arch/acorn32/podulebus/rapide.c:1.26 Tue Mar 18 20:46:35 2008
+++ src/sys/arch/acorn32/podulebus/rapide.c Tue Jul 19 15:59:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rapide.c,v 1.26 2008/03/18 20:46:35 cube Exp $ */
+/* $NetBSD: rapide.c,v 1.27 2011/07/19 15:59:54 dyoung Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@@ -68,17 +68,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rapide.c,v 1.26 2008/03/18 20:46:35 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rapide.c,v 1.27 2011/07/19 15:59:54 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/io.h>
-#include <machine/bus.h>
#include <machine/bootconfig.h>
#include <arm/iomd/iomdreg.h>
#include <arm/iomd/iomdvar.h>
Index: src/sys/arch/acorn32/podulebus/simide.c
diff -u src/sys/arch/acorn32/podulebus/simide.c:1.25 src/sys/arch/acorn32/podulebus/simide.c:1.26
--- src/sys/arch/acorn32/podulebus/simide.c:1.25 Tue Mar 18 20:46:35 2008
+++ src/sys/arch/acorn32/podulebus/simide.c Tue Jul 19 15:59:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: simide.c,v 1.25 2008/03/18 20:46:35 cube Exp $ */
+/* $NetBSD: simide.c,v 1.26 2011/07/19 15:59:54 dyoung Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@@ -40,17 +40,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: simide.c,v 1.25 2008/03/18 20:46:35 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: simide.c,v 1.26 2011/07/19 15:59:54 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/io.h>
-#include <machine/bus.h>
#include <acorn32/podulebus/podulebus.h>
#include <acorn32/podulebus/simidereg.h>
Added files:
Index: src/sys/arch/acorn32/include/bus_defs.h
diff -u /dev/null src/sys/arch/acorn32/include/bus_defs.h:1.1
--- /dev/null Tue Jul 19 15:59:54 2011
+++ src/sys/arch/acorn32/include/bus_defs.h Tue Jul 19 15:59:53 2011
@@ -0,0 +1,4 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:59:53 dyoung Exp $ */
+
+#include <arm/bus_defs.h>
+
Index: src/sys/arch/acorn32/include/bus_funcs.h
diff -u /dev/null src/sys/arch/acorn32/include/bus_funcs.h:1.1
--- /dev/null Tue Jul 19 15:59:54 2011
+++ src/sys/arch/acorn32/include/bus_funcs.h Tue Jul 19 15:59:53 2011
@@ -0,0 +1,4 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:59:53 dyoung Exp $ */
+
+#include <arm/bus_funcs.h>
+
