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/fbda21f6d9d8
branches: trunk
changeset: 767478:fbda21f6d9d8
user: dyoung <dyoung%NetBSD.org@localhost>
date: Tue Jul 19 15:59:51 2011 +0000
description:
Change <machine/bus.h> to <sys/bus.h> throughout.
Split bus.h -> bus_{defs,funcs}.h.
Mark acorn32/bus.h obsolete.
diffstat:
distrib/sets/lists/comp/md.acorn32 | 4 ++--
sys/arch/acorn32/acorn32/rpc_machdep.c | 6 +++---
sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c | 6 +++---
sys/arch/acorn32/eb7500atx/if_cs.c | 6 +++---
sys/arch/acorn32/eb7500atx/rsbus.c | 7 +++----
sys/arch/acorn32/eb7500atx/rsbus.h | 5 ++---
sys/arch/acorn32/eb7500atx/rsbus_io.c | 6 +++---
sys/arch/acorn32/eb7500atx/rside.c | 6 +++---
sys/arch/acorn32/include/Makefile | 4 ++--
sys/arch/acorn32/include/bus.h | 4 ----
sys/arch/acorn32/include/bus_defs.h | 4 ++++
sys/arch/acorn32/include/bus_funcs.h | 4 ++++
sys/arch/acorn32/include/podulebus_machdep.h | 4 ++--
sys/arch/acorn32/mainbus/atppc_pioc.c | 6 +++---
sys/arch/acorn32/mainbus/com_pioc.c | 6 +++---
sys/arch/acorn32/mainbus/fd.c | 6 +++---
sys/arch/acorn32/mainbus/lpt_pioc.c | 6 +++---
sys/arch/acorn32/mainbus/pioc.c | 6 +++---
sys/arch/acorn32/mainbus/piocvar.h | 4 ++--
sys/arch/acorn32/mainbus/wdc_pioc.c | 6 +++---
sys/arch/acorn32/podulebus/amps.c | 6 +++---
sys/arch/acorn32/podulebus/asc.c | 6 +++---
sys/arch/acorn32/podulebus/icside.c | 6 +++---
sys/arch/acorn32/podulebus/if_ne_pbus.c | 6 +++---
sys/arch/acorn32/podulebus/podulebus_io.c | 6 +++---
sys/arch/acorn32/podulebus/rapide.c | 6 +++---
sys/arch/acorn32/podulebus/sbic.c | 6 +++---
sys/arch/acorn32/podulebus/simide.c | 6 +++---
28 files changed, 78 insertions(+), 76 deletions(-)
diffs (truncated from 683 to 300 lines):
diff -r e00d0a8d7582 -r fbda21f6d9d8 distrib/sets/lists/comp/md.acorn32
--- a/distrib/sets/lists/comp/md.acorn32 Tue Jul 19 15:59:01 2011 +0000
+++ b/distrib/sets/lists/comp/md.acorn32 Tue Jul 19 15:59:51 2011 +0000
@@ -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
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/acorn32/rpc_machdep.c
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c Tue Jul 19 15:59:01 2011 +0000
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c Tue Jul 19 15:59:51 2011 +0000
@@ -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>
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
--- a/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Tue Jul 19 15:59:01 2011 +0000
+++ b/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Tue Jul 19 15:59:51 2011 +0000
@@ -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>
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/eb7500atx/if_cs.c
--- a/sys/arch/acorn32/eb7500atx/if_cs.c Tue Jul 19 15:59:01 2011 +0000
+++ b/sys/arch/acorn32/eb7500atx/if_cs.c Tue Jul 19 15:59:51 2011 +0000
@@ -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>
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/eb7500atx/rsbus.c
--- a/sys/arch/acorn32/eb7500atx/rsbus.c Tue Jul 19 15:59:01 2011 +0000
+++ b/sys/arch/acorn32/eb7500atx/rsbus.c Tue Jul 19 15:59:51 2011 +0000
@@ -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>
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/eb7500atx/rsbus.h
--- a/sys/arch/acorn32/eb7500atx/rsbus.h Tue Jul 19 15:59:01 2011 +0000
+++ b/sys/arch/acorn32/eb7500atx/rsbus.h Tue Jul 19 15:59:51 2011 +0000
@@ -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;
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/eb7500atx/rsbus_io.c
--- a/sys/arch/acorn32/eb7500atx/rsbus_io.c Tue Jul 19 15:59:01 2011 +0000
+++ b/sys/arch/acorn32/eb7500atx/rsbus_io.c Tue Jul 19 15:59:51 2011 +0000
@@ -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 */
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/eb7500atx/rside.c
--- a/sys/arch/acorn32/eb7500atx/rside.c Tue Jul 19 15:59:01 2011 +0000
+++ b/sys/arch/acorn32/eb7500atx/rside.c Tue Jul 19 15:59:51 2011 +0000
@@ -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>
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/include/Makefile
--- a/sys/arch/acorn32/include/Makefile Tue Jul 19 15:59:01 2011 +0000
+++ b/sys/arch/acorn32/include/Makefile Tue Jul 19 15:59:51 2011 +0000
@@ -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 \
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/include/bus.h
--- a/sys/arch/acorn32/include/bus.h Tue Jul 19 15:59:01 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-/* $NetBSD: bus.h,v 1.1 2001/10/05 22:27:49 reinoud Exp $ */
-
-#include <arm/bus.h>
-
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/include/bus_defs.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/acorn32/include/bus_defs.h Tue Jul 19 15:59:51 2011 +0000
@@ -0,0 +1,4 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:59:53 dyoung Exp $ */
+
+#include <arm/bus_defs.h>
+
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/include/bus_funcs.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/acorn32/include/bus_funcs.h Tue Jul 19 15:59:51 2011 +0000
@@ -0,0 +1,4 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:59:53 dyoung Exp $ */
+
+#include <arm/bus_funcs.h>
+
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/include/podulebus_machdep.h
--- a/sys/arch/acorn32/include/podulebus_machdep.h Tue Jul 19 15:59:01 2011 +0000
+++ b/sys/arch/acorn32/include/podulebus_machdep.h Tue Jul 19 15:59:51 2011 +0000
@@ -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 */
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/mainbus/atppc_pioc.c
--- a/sys/arch/acorn32/mainbus/atppc_pioc.c Tue Jul 19 15:59:01 2011 +0000
+++ b/sys/arch/acorn32/mainbus/atppc_pioc.c Tue Jul 19 15:59:51 2011 +0000
@@ -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>
diff -r e00d0a8d7582 -r fbda21f6d9d8 sys/arch/acorn32/mainbus/com_pioc.c
--- a/sys/arch/acorn32/mainbus/com_pioc.c Tue Jul 19 15:59:01 2011 +0000
Home |
Main Index |
Thread Index |
Old Index