Module Name: src
Committed By: dyoung
Date: Tue Jul 19 16:05:11 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: md.acorn26
src/sys/arch/acorn26/acorn26: bus.c db_machdep.c
src/sys/arch/acorn26/include: Makefile podulebus_machdep.h
src/sys/arch/acorn26/iobus: iobus.c iobusvar.h ioc.c
src/sys/arch/acorn26/ioc: arckbd.c arcpp.c if_eca.c if_ecavar.h
iociic.c ioeb.c latches.c ssn.c
src/sys/arch/acorn26/podulebus: if_eh.c podulebus.c unixbp.c
src/sys/arch/acorn26/vidc: arcvideo.c
Added Files:
src/sys/arch/acorn26/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/acorn26/include: bus.h
Log Message:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
Mark acorn26/bus.h obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/comp/md.acorn26
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/acorn26/acorn26/bus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/acorn26/acorn26/db_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/acorn26/include/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/acorn26/include/bus_defs.h \
src/sys/arch/acorn26/include/bus_funcs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/acorn26/include/podulebus_machdep.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn26/iobus/iobus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/acorn26/iobus/iobusvar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/acorn26/iobus/ioc.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/acorn26/ioc/arckbd.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/acorn26/ioc/arcpp.c \
src/sys/arch/acorn26/ioc/if_eca.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/acorn26/ioc/if_ecavar.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/acorn26/ioc/iociic.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/acorn26/ioc/ioeb.c \
src/sys/arch/acorn26/ioc/latches.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn26/ioc/ssn.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn26/podulebus/if_eh.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/acorn26/podulebus/podulebus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/acorn26/podulebus/unixbp.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/acorn26/vidc/arcvideo.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.acorn26
diff -u src/distrib/sets/lists/comp/md.acorn26:1.13 src/distrib/sets/lists/comp/md.acorn26:1.14
--- src/distrib/sets/lists/comp/md.acorn26:1.13 Sun Jul 17 20:54:31 2011
+++ src/distrib/sets/lists/comp/md.acorn26 Tue Jul 19 16:05:09 2011
@@ -1,11 +1,11 @@
-# $NetBSD: md.acorn26,v 1.13 2011/07/17 20:54:31 joerg Exp $
+# $NetBSD: md.acorn26,v 1.14 2011/07/19 16:05:09 dyoung Exp $
./usr/include/acorn26 comp-c-include
./usr/include/acorn26/ansi.h comp-c-include
./usr/include/acorn26/aout_machdep.h comp-c-include
./usr/include/acorn26/asm.h comp-c-include
./usr/include/acorn26/boot.h comp-c-include
./usr/include/acorn26/bswap.h comp-c-include
-./usr/include/acorn26/bus.h comp-c-include
+./usr/include/acorn26/bus.h comp-obsolete obsolete
./usr/include/acorn26/cdefs.h comp-c-include
./usr/include/acorn26/cpu.h comp-c-include
./usr/include/acorn26/db_machdep.h comp-obsolete obsolete
Index: src/sys/arch/acorn26/acorn26/bus.c
diff -u src/sys/arch/acorn26/acorn26/bus.c:1.6 src/sys/arch/acorn26/acorn26/bus.c:1.7
--- src/sys/arch/acorn26/acorn26/bus.c:1.6 Sat Sep 30 16:30:10 2006
+++ src/sys/arch/acorn26/acorn26/bus.c Tue Jul 19 16:05:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.6 2006/09/30 16:30:10 bjh21 Exp $ */
+/* $NetBSD: bus.c,v 1.7 2011/07/19 16:05:09 dyoung Exp $ */
/*-
* Copyright (c) 1999, 2000 Ben Harris
* All rights reserved.
@@ -30,11 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.6 2006/09/30 16:30:10 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.7 2011/07/19 16:05:09 dyoung Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/memcreg.h>
#include <arm/blockio.h>
Index: src/sys/arch/acorn26/acorn26/db_machdep.c
diff -u src/sys/arch/acorn26/acorn26/db_machdep.c:1.7 src/sys/arch/acorn26/acorn26/db_machdep.c:1.8
--- src/sys/arch/acorn26/acorn26/db_machdep.c:1.7 Fri Feb 23 09:49:48 2007
+++ src/sys/arch/acorn26/acorn26/db_machdep.c Tue Jul 19 16:05:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.7 2007/02/23 09:49:48 he Exp $ */
+/* $NetBSD: db_machdep.c,v 1.8 2011/07/19 16:05:09 dyoung Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -29,12 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.7 2007/02/23 09:49:48 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.8 2011/07/19 16:05:09 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/db_machdep.h>
#include <machine/irq.h>
Index: src/sys/arch/acorn26/include/Makefile
diff -u src/sys/arch/acorn26/include/Makefile:1.10 src/sys/arch/acorn26/include/Makefile:1.11
--- src/sys/arch/acorn26/include/Makefile:1.10 Sun Jul 17 20:54:35 2011
+++ src/sys/arch/acorn26/include/Makefile Tue Jul 19 16:05:10 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2011/07/17 20:54:35 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2011/07/19 16:05:10 dyoung Exp $
INCSDIR= /usr/include/acorn26
INCS= ansi.h aout_machdep.h asm.h \
- boot.h bswap.h bus.h \
+ boot.h bswap.h \
cdefs.h cpu.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
Index: src/sys/arch/acorn26/include/podulebus_machdep.h
diff -u src/sys/arch/acorn26/include/podulebus_machdep.h:1.2 src/sys/arch/acorn26/include/podulebus_machdep.h:1.3
--- src/sys/arch/acorn26/include/podulebus_machdep.h:1.2 Sat Sep 30 16:30:10 2006
+++ src/sys/arch/acorn26/include/podulebus_machdep.h Tue Jul 19 16:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus_machdep.h,v 1.2 2006/09/30 16:30:10 bjh21 Exp $ */
+/* $NetBSD: podulebus_machdep.h,v 1.3 2011/07/19 16:05:10 dyoung Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct podulebus_chunk {
int pc_type;
Index: src/sys/arch/acorn26/iobus/iobus.c
diff -u src/sys/arch/acorn26/iobus/iobus.c:1.15 src/sys/arch/acorn26/iobus/iobus.c:1.16
--- src/sys/arch/acorn26/iobus/iobus.c:1.15 Tue Jan 6 23:44:27 2009
+++ src/sys/arch/acorn26/iobus/iobus.c Tue Jul 19 16:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iobus.c,v 1.15 2009/01/06 23:44:27 bjh21 Exp $ */
+/* $NetBSD: iobus.c,v 1.16 2011/07/19 16:05:10 dyoung Exp $ */
/*-
* Copyright (c) 1998 Ben Harris
* All rights reserved.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iobus.c,v 1.15 2009/01/06 23:44:27 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iobus.c,v 1.16 2011/07/19 16:05:10 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/memcreg.h>
#include <arch/acorn26/iobus/iobusvar.h>
Index: src/sys/arch/acorn26/iobus/iobusvar.h
diff -u src/sys/arch/acorn26/iobus/iobusvar.h:1.2 src/sys/arch/acorn26/iobus/iobusvar.h:1.3
--- src/sys/arch/acorn26/iobus/iobusvar.h:1.2 Sun Mar 24 23:37:44 2002
+++ src/sys/arch/acorn26/iobus/iobusvar.h Tue Jul 19 16:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iobusvar.h,v 1.2 2002/03/24 23:37:44 bjh21 Exp $ */
+/* $NetBSD: iobusvar.h,v 1.3 2011/07/19 16:05:10 dyoung Exp $ */
/*-
* Copyright (c) 1998 Ben Harris
* All rights reserved.
@@ -32,7 +32,7 @@
#ifndef _ARM26_IOBUSVAR_H
#define _ARM26_IOBUSVAR_H
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Structure passed to children of an iobus */
Index: src/sys/arch/acorn26/iobus/ioc.c
diff -u src/sys/arch/acorn26/iobus/ioc.c:1.19 src/sys/arch/acorn26/iobus/ioc.c:1.20
--- src/sys/arch/acorn26/iobus/ioc.c:1.19 Wed Mar 18 10:22:22 2009
+++ src/sys/arch/acorn26/iobus/ioc.c Tue Jul 19 16:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ioc.c,v 1.19 2009/03/18 10:22:22 cegger Exp $ */
+/* $NetBSD: ioc.c,v 1.20 2011/07/19 16:05:10 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.19 2009/03/18 10:22:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.20 2011/07/19 16:05:10 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -40,8 +40,8 @@
#include <sys/reboot.h> /* For bootverbose */
#include <sys/systm.h>
#include <sys/timetc.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/irq.h>
Index: src/sys/arch/acorn26/ioc/arckbd.c
diff -u src/sys/arch/acorn26/ioc/arckbd.c:1.19 src/sys/arch/acorn26/ioc/arckbd.c:1.20
--- src/sys/arch/acorn26/ioc/arckbd.c:1.19 Fri Jun 3 07:08:48 2011
+++ src/sys/arch/acorn26/ioc/arckbd.c Tue Jul 19 16:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: arckbd.c,v 1.19 2011/06/03 07:08:48 matt Exp $ */
+/* $NetBSD: arckbd.c,v 1.20 2011/07/19 16:05:10 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arckbd.c,v 1.19 2011/06/03 07:08:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arckbd.c,v 1.20 2011/07/19 16:05:10 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -52,8 +52,8 @@
#include <sys/reboot.h> /* For bootverbose */
#include <sys/syslog.h>
#include <sys/systm.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/irq.h>
Index: src/sys/arch/acorn26/ioc/arcpp.c
diff -u src/sys/arch/acorn26/ioc/arcpp.c:1.11 src/sys/arch/acorn26/ioc/arcpp.c:1.12
--- src/sys/arch/acorn26/ioc/arcpp.c:1.11 Wed Nov 25 14:28:49 2009
+++ src/sys/arch/acorn26/ioc/arcpp.c Tue Jul 19 16:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: arcpp.c,v 1.11 2009/11/25 14:28:49 rmind Exp $ */
+/* $NetBSD: arcpp.c,v 1.12 2011/07/19 16:05:10 dyoung Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -52,7 +52,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.11 2009/11/25 14:28:49 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.12 2011/07/19 16:05:10 dyoung Exp $");
#include <sys/conf.h>
#include <sys/device.h>
@@ -60,8 +60,8 @@
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/systm.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/irq.h>
Index: src/sys/arch/acorn26/ioc/if_eca.c
diff -u src/sys/arch/acorn26/ioc/if_eca.c:1.11 src/sys/arch/acorn26/ioc/if_eca.c:1.12
--- src/sys/arch/acorn26/ioc/if_eca.c:1.11 Mon Jan 19 23:43:14 2009
+++ src/sys/arch/acorn26/ioc/if_eca.c Tue Jul 19 16:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eca.c,v 1.11 2009/01/19 23:43:14 bjh21 Exp $ */
+/* $NetBSD: if_eca.c,v 1.12 2011/07/19 16:05:10 dyoung Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -29,19 +29,19 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.11 2009/01/19 23:43:14 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.12 2011/07/19 16:05:10 dyoung Exp $");
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/systm.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_eco.h>
-#include <machine/bus.h>
#include <machine/fiq.h>
#include <machine/intr.h>
#include <machine/machdep.h>
Index: src/sys/arch/acorn26/ioc/if_ecavar.h
diff -u src/sys/arch/acorn26/ioc/if_ecavar.h:1.2 src/sys/arch/acorn26/ioc/if_ecavar.h:1.3
--- src/sys/arch/acorn26/ioc/if_ecavar.h:1.2 Mon Jan 19 23:43:14 2009
+++ src/sys/arch/acorn26/ioc/if_ecavar.h Tue Jul 19 16:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ecavar.h,v 1.2 2009/01/19 23:43:14 bjh21 Exp $ */
+/* $NetBSD: if_ecavar.h,v 1.3 2011/07/19 16:05:10 dyoung Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -33,13 +33,13 @@
#ifndef _LOCORE
#include <sys/device.h>
#include <sys/socket.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_eco.h>
#include <arm/fiq.h>
-#include <machine/bus.h>
#include <machine/fiq.h>
struct eca_fiqstate {
Index: src/sys/arch/acorn26/ioc/iociic.c
diff -u src/sys/arch/acorn26/ioc/iociic.c:1.8 src/sys/arch/acorn26/ioc/iociic.c:1.9
--- src/sys/arch/acorn26/ioc/iociic.c:1.8 Sun Jan 18 18:41:34 2009
+++ src/sys/arch/acorn26/ioc/iociic.c Tue Jul 19 16:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iociic.c,v 1.8 2009/01/18 18:41:34 bjh21 Exp $ */
+/* $NetBSD: iociic.c,v 1.9 2011/07/19 16:05:10 dyoung Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,8 +40,8 @@
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/mutex.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/cpu.h>
#include <acorn26/iobus/iocreg.h>
Index: src/sys/arch/acorn26/ioc/ioeb.c
diff -u src/sys/arch/acorn26/ioc/ioeb.c:1.6 src/sys/arch/acorn26/ioc/ioeb.c:1.7
--- src/sys/arch/acorn26/ioc/ioeb.c:1.6 Fri Jun 3 07:08:48 2011
+++ src/sys/arch/acorn26/ioc/ioeb.c Tue Jul 19 16:05:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ioeb.c,v 1.6 2011/06/03 07:08:48 matt Exp $ */
+/* $NetBSD: ioeb.c,v 1.7 2011/07/19 16:05:11 dyoung Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@@ -29,12 +29,11 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: ioeb.c,v 1.6 2011/06/03 07:08:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioeb.c,v 1.7 2011/07/19 16:05:11 dyoung Exp $");
#include <sys/device.h>
#include <sys/systm.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/acorn26/iobus/iocvar.h>
#include <arch/acorn26/ioc/ioebreg.h>
Index: src/sys/arch/acorn26/ioc/latches.c
diff -u src/sys/arch/acorn26/ioc/latches.c:1.6 src/sys/arch/acorn26/ioc/latches.c:1.7
--- src/sys/arch/acorn26/ioc/latches.c:1.6 Fri Jun 3 07:21:32 2011
+++ src/sys/arch/acorn26/ioc/latches.c Tue Jul 19 16:05:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: latches.c,v 1.6 2011/06/03 07:21:32 matt Exp $ */
+/* $NetBSD: latches.c,v 1.7 2011/07/19 16:05:11 dyoung Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -29,12 +29,11 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: latches.c,v 1.6 2011/06/03 07:21:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: latches.c,v 1.7 2011/07/19 16:05:11 dyoung Exp $");
#include <sys/device.h>
#include <sys/systm.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/acorn26/iobus/iocvar.h>
#include <arch/acorn26/ioc/latchreg.h>
Index: src/sys/arch/acorn26/ioc/ssn.c
diff -u src/sys/arch/acorn26/ioc/ssn.c:1.9 src/sys/arch/acorn26/ioc/ssn.c:1.10
--- src/sys/arch/acorn26/ioc/ssn.c:1.9 Fri Jun 3 07:08:48 2011
+++ src/sys/arch/acorn26/ioc/ssn.c Tue Jul 19 16:05:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ssn.c,v 1.9 2011/06/03 07:08:48 matt Exp $ */
+/* $NetBSD: ssn.c,v 1.10 2011/07/19 16:05:11 dyoung Exp $ */
/*-
* Copyright (c) 2002 Ben Harris
@@ -28,13 +28,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ssn.c,v 1.9 2011/06/03 07:08:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssn.c,v 1.10 2011/07/19 16:05:11 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <acorn26/iobus/iocreg.h>
#include <acorn26/iobus/iocvar.h>
Index: src/sys/arch/acorn26/podulebus/if_eh.c
diff -u src/sys/arch/acorn26/podulebus/if_eh.c:1.15 src/sys/arch/acorn26/podulebus/if_eh.c:1.16
--- src/sys/arch/acorn26/podulebus/if_eh.c:1.15 Wed Jan 21 23:36:30 2009
+++ src/sys/arch/acorn26/podulebus/if_eh.c Tue Jul 19 16:05:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eh.c,v 1.15 2009/01/21 23:36:30 bjh21 Exp $ */
+/* $NetBSD: if_eh.c,v 1.16 2011/07/19 16:05:11 dyoung Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@@ -45,7 +45,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.15 2009/01/21 23:36:30 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.16 2011/07/19 16:05:11 dyoung Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -53,6 +53,7 @@
#include <sys/mbuf.h>
#include <sys/reboot.h>
#include <sys/syslog.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_dl.h>
@@ -62,7 +63,6 @@
#include <net/if_ether.h>
#include <sys/bswap.h>
-#include <machine/bus.h>
#include <machine/irq.h>
#ifndef __BUS_SPACE_HAS_STREAM_METHODS
Index: src/sys/arch/acorn26/podulebus/podulebus.c
diff -u src/sys/arch/acorn26/podulebus/podulebus.c:1.18 src/sys/arch/acorn26/podulebus/podulebus.c:1.19
--- src/sys/arch/acorn26/podulebus/podulebus.c:1.18 Wed Mar 18 16:00:08 2009
+++ src/sys/arch/acorn26/podulebus/podulebus.c Tue Jul 19 16:05:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.18 2009/03/18 16:00:08 cegger Exp $ */
+/* $NetBSD: podulebus.c,v 1.19 2011/07/19 16:05:11 dyoung Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@@ -28,14 +28,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.18 2009/03/18 16:00:08 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.19 2011/07/19 16:05:11 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/systm.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/irq.h>
#include <machine/machdep.h>
Index: src/sys/arch/acorn26/podulebus/unixbp.c
diff -u src/sys/arch/acorn26/podulebus/unixbp.c:1.7 src/sys/arch/acorn26/podulebus/unixbp.c:1.8
--- src/sys/arch/acorn26/podulebus/unixbp.c:1.7 Wed Mar 18 10:22:22 2009
+++ src/sys/arch/acorn26/podulebus/unixbp.c Tue Jul 19 16:05:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: unixbp.c,v 1.7 2009/03/18 10:22:22 cegger Exp $ */
+/* $NetBSD: unixbp.c,v 1.8 2011/07/19 16:05:11 dyoung Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@@ -32,11 +32,12 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: unixbp.c,v 1.7 2009/03/18 10:22:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: unixbp.c,v 1.8 2011/07/19 16:05:11 dyoung Exp $");
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
+
#include <arch/acorn26/iobus/iocvar.h>
#include <arch/acorn26/podulebus/unixbpreg.h>
#include <arch/acorn26/podulebus/unixbpvar.h>
Index: src/sys/arch/acorn26/vidc/arcvideo.c
diff -u src/sys/arch/acorn26/vidc/arcvideo.c:1.14 src/sys/arch/acorn26/vidc/arcvideo.c:1.15
--- src/sys/arch/acorn26/vidc/arcvideo.c:1.14 Mon Jan 19 23:09:22 2009
+++ src/sys/arch/acorn26/vidc/arcvideo.c Tue Jul 19 16:05:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: arcvideo.c,v 1.14 2009/01/19 23:09:22 bjh21 Exp $ */
+/* $NetBSD: arcvideo.c,v 1.15 2011/07/19 16:05:11 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2000 Ben Harris
* All rights reserved.
@@ -37,13 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcvideo.c,v 1.14 2009/01/19 23:09:22 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcvideo.c,v 1.15 2011/07/19 16:05:11 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/errno.h>
#include <sys/reboot.h> /* For bootverbose */
#include <sys/systm.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
@@ -53,7 +54,6 @@
#include <dev/rasops/rasops.h>
#include <machine/boot.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/irq.h>
#include <machine/machdep.h>
Added files:
Index: src/sys/arch/acorn26/include/bus_defs.h
diff -u /dev/null src/sys/arch/acorn26/include/bus_defs.h:1.1
--- /dev/null Tue Jul 19 16:05:11 2011
+++ src/sys/arch/acorn26/include/bus_defs.h Tue Jul 19 16:05:10 2011
@@ -0,0 +1,10 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 16:05:10 dyoung Exp $ */
+
+#ifndef _ACORN26_BUS_DEFS_H_
+#define _ACORN26_BUS_DEFS_H_
+
+#include <arm/bus_defs.h>
+
+extern struct bus_space iobus_bs_tag;
+
+#endif /* _ACORN26_BUS_DEFS_H_ */
Index: src/sys/arch/acorn26/include/bus_funcs.h
diff -u /dev/null src/sys/arch/acorn26/include/bus_funcs.h:1.1
--- /dev/null Tue Jul 19 16:05:11 2011
+++ src/sys/arch/acorn26/include/bus_funcs.h Tue Jul 19 16:05:10 2011
@@ -0,0 +1,10 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 16:05:10 dyoung Exp $ */
+
+#ifndef _ACORN26_BUS_FUNCS_H_
+#define _ACORN26_BUS_FUNCS_H_
+
+#include <arm/bus_funcs.h>
+
+int bus_space_shift(bus_space_tag_t, int, bus_space_tag_t *);
+
+#endif /* _ACORN26_BUS_FUNCS_H_ */
