Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Change <machine/bus.h> to <sys/bus.h> throughout.
details: https://anonhg.NetBSD.org/src/rev/1d1764408c82
branches: trunk
changeset: 767479:1d1764408c82
user: dyoung <dyoung%NetBSD.org@localhost>
date: Tue Jul 19 16:05:09 2011 +0000
description:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
Mark acorn26/bus.h obsolete.
diffstat:
distrib/sets/lists/comp/md.acorn26 | 4 ++--
sys/arch/acorn26/acorn26/bus.c | 6 +++---
sys/arch/acorn26/acorn26/db_machdep.c | 6 +++---
sys/arch/acorn26/include/Makefile | 4 ++--
sys/arch/acorn26/include/bus.h | 12 ------------
sys/arch/acorn26/include/bus_defs.h | 10 ++++++++++
sys/arch/acorn26/include/bus_funcs.h | 10 ++++++++++
sys/arch/acorn26/include/podulebus_machdep.h | 4 ++--
sys/arch/acorn26/iobus/iobus.c | 6 +++---
sys/arch/acorn26/iobus/iobusvar.h | 4 ++--
sys/arch/acorn26/iobus/ioc.c | 6 +++---
sys/arch/acorn26/ioc/arckbd.c | 6 +++---
sys/arch/acorn26/ioc/arcpp.c | 6 +++---
sys/arch/acorn26/ioc/if_eca.c | 6 +++---
sys/arch/acorn26/ioc/if_ecavar.h | 4 ++--
sys/arch/acorn26/ioc/iociic.c | 4 ++--
sys/arch/acorn26/ioc/ioeb.c | 7 +++----
sys/arch/acorn26/ioc/latches.c | 7 +++----
sys/arch/acorn26/ioc/ssn.c | 7 +++----
sys/arch/acorn26/podulebus/if_eh.c | 6 +++---
sys/arch/acorn26/podulebus/podulebus.c | 6 +++---
sys/arch/acorn26/podulebus/unixbp.c | 7 ++++---
sys/arch/acorn26/vidc/arcvideo.c | 6 +++---
23 files changed, 75 insertions(+), 69 deletions(-)
diffs (truncated from 532 to 300 lines):
diff -r fbda21f6d9d8 -r 1d1764408c82 distrib/sets/lists/comp/md.acorn26
--- a/distrib/sets/lists/comp/md.acorn26 Tue Jul 19 15:59:51 2011 +0000
+++ b/distrib/sets/lists/comp/md.acorn26 Tue Jul 19 16:05:09 2011 +0000
@@ -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
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/acorn26/bus.c
--- a/sys/arch/acorn26/acorn26/bus.c Tue Jul 19 15:59:51 2011 +0000
+++ b/sys/arch/acorn26/acorn26/bus.c Tue Jul 19 16:05:09 2011 +0000
@@ -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>
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/acorn26/db_machdep.c
--- a/sys/arch/acorn26/acorn26/db_machdep.c Tue Jul 19 15:59:51 2011 +0000
+++ b/sys/arch/acorn26/acorn26/db_machdep.c Tue Jul 19 16:05:09 2011 +0000
@@ -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>
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/include/Makefile
--- a/sys/arch/acorn26/include/Makefile Tue Jul 19 15:59:51 2011 +0000
+++ b/sys/arch/acorn26/include/Makefile Tue Jul 19 16:05:09 2011 +0000
@@ -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 \
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/include/bus.h
--- a/sys/arch/acorn26/include/bus.h Tue Jul 19 15:59:51 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-/* $NetBSD: bus.h,v 1.3 2006/09/30 16:30:10 bjh21 Exp $ */
-
-#ifndef _ACORN26_BUS_H
-#define _ACORN26_BUS_H
-
-#include <arm/bus.h>
-
-extern struct bus_space iobus_bs_tag;
-
-extern int bus_space_shift(bus_space_tag_t, int, bus_space_tag_t *);
-
-#endif
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/include/bus_defs.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/acorn26/include/bus_defs.h Tue Jul 19 16:05:09 2011 +0000
@@ -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_ */
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/include/bus_funcs.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/acorn26/include/bus_funcs.h Tue Jul 19 16:05:09 2011 +0000
@@ -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_ */
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/include/podulebus_machdep.h
--- a/sys/arch/acorn26/include/podulebus_machdep.h Tue Jul 19 15:59:51 2011 +0000
+++ b/sys/arch/acorn26/include/podulebus_machdep.h Tue Jul 19 16:05:09 2011 +0000
@@ -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;
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/iobus/iobus.c
--- a/sys/arch/acorn26/iobus/iobus.c Tue Jul 19 15:59:51 2011 +0000
+++ b/sys/arch/acorn26/iobus/iobus.c Tue Jul 19 16:05:09 2011 +0000
@@ -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>
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/iobus/iobusvar.h
--- a/sys/arch/acorn26/iobus/iobusvar.h Tue Jul 19 15:59:51 2011 +0000
+++ b/sys/arch/acorn26/iobus/iobusvar.h Tue Jul 19 16:05:09 2011 +0000
@@ -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 */
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/iobus/ioc.c
--- a/sys/arch/acorn26/iobus/ioc.c Tue Jul 19 15:59:51 2011 +0000
+++ b/sys/arch/acorn26/iobus/ioc.c Tue Jul 19 16:05:09 2011 +0000
@@ -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>
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/ioc/arckbd.c
--- a/sys/arch/acorn26/ioc/arckbd.c Tue Jul 19 15:59:51 2011 +0000
+++ b/sys/arch/acorn26/ioc/arckbd.c Tue Jul 19 16:05:09 2011 +0000
@@ -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>
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/ioc/arcpp.c
--- a/sys/arch/acorn26/ioc/arcpp.c Tue Jul 19 15:59:51 2011 +0000
+++ b/sys/arch/acorn26/ioc/arcpp.c Tue Jul 19 16:05:09 2011 +0000
@@ -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>
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/ioc/if_eca.c
--- a/sys/arch/acorn26/ioc/if_eca.c Tue Jul 19 15:59:51 2011 +0000
+++ b/sys/arch/acorn26/ioc/if_eca.c Tue Jul 19 16:05:09 2011 +0000
@@ -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>
diff -r fbda21f6d9d8 -r 1d1764408c82 sys/arch/acorn26/ioc/if_ecavar.h
Home |
Main Index |
Thread Index |
Old Index