Module Name: src
Committed By: dyoung
Date: Mon Jul 18 17:26:56 UTC 2011
Modified Files:
src/sys/arch/rs6000/include: mca_machdep.h
src/sys/arch/rs6000/ioplanar: com_iop.c ioplanarvar.h
src/sys/arch/rs6000/mca: ioplanar.c mca_machdep.c mcadma_machdep.c
src/sys/arch/rs6000/rs6000: consinit.c cpu.c mainbus.c pic_iocc.c
Added Files:
src/sys/arch/rs6000/include: bus_defs.h bus_funcs.h
Removed Files:
src/sys/arch/rs6000/include: bus.h
Log Message:
Do the bus.h -> bus_{defs,funcs}.h split and change all occurrences of
<machine/bus.h> to <sys/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 src/sys/arch/rs6000/include/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/rs6000/include/bus_defs.h \
src/sys/arch/rs6000/include/bus_funcs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/rs6000/include/mca_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/ioplanar/com_iop.c \
src/sys/arch/rs6000/ioplanar/ioplanarvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/mca/ioplanar.c \
src/sys/arch/rs6000/mca/mca_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/rs6000/mca/mcadma_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/rs6000/rs6000/consinit.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/rs6000/cpu.c \
src/sys/arch/rs6000/rs6000/pic_iocc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/rs6000/rs6000/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/rs6000/include/mca_machdep.h
diff -u src/sys/arch/rs6000/include/mca_machdep.h:1.2 src/sys/arch/rs6000/include/mca_machdep.h:1.3
--- src/sys/arch/rs6000/include/mca_machdep.h:1.2 Sat Jun 18 08:08:30 2011
+++ src/sys/arch/rs6000/include/mca_machdep.h Mon Jul 18 17:26:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mca_machdep.h,v 1.2 2011/06/18 08:08:30 matt Exp $ */
+/* $NetBSD: mca_machdep.h,v 1.3 2011/07/18 17:26:55 dyoung Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#define _RS6000_MCA_MACHDEP_H_
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iocc.h>
/*
Index: src/sys/arch/rs6000/ioplanar/com_iop.c
diff -u src/sys/arch/rs6000/ioplanar/com_iop.c:1.3 src/sys/arch/rs6000/ioplanar/com_iop.c:1.4
--- src/sys/arch/rs6000/ioplanar/com_iop.c:1.3 Mon Apr 28 20:23:34 2008
+++ src/sys/arch/rs6000/ioplanar/com_iop.c Mon Jul 18 17:26:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_iop.c,v 1.3 2008/04/28 20:23:34 martin Exp $ */
+/* $NetBSD: com_iop.c,v 1.4 2011/07/18 17:26:55 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,15 +30,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_iop.c,v 1.3 2008/04/28 20:23:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_iop.c,v 1.4 2011/07/18 17:26:55 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
+#include <sys/bus.h>
#include <machine/intr.h>
-#include <machine/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: src/sys/arch/rs6000/ioplanar/ioplanarvar.h
diff -u src/sys/arch/rs6000/ioplanar/ioplanarvar.h:1.3 src/sys/arch/rs6000/ioplanar/ioplanarvar.h:1.4
--- src/sys/arch/rs6000/ioplanar/ioplanarvar.h:1.3 Sat Jun 18 08:08:30 2011
+++ src/sys/arch/rs6000/ioplanar/ioplanarvar.h Mon Jul 18 17:26:56 2011
@@ -30,7 +30,7 @@
#ifndef _RS6000_IOPLANAR_H_
#define _RS6000_IOPLANAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/mca_machdep.h>
/*
Index: src/sys/arch/rs6000/mca/ioplanar.c
diff -u src/sys/arch/rs6000/mca/ioplanar.c:1.3 src/sys/arch/rs6000/mca/ioplanar.c:1.4
--- src/sys/arch/rs6000/mca/ioplanar.c:1.3 Sat Jun 18 08:08:30 2011
+++ src/sys/arch/rs6000/mca/ioplanar.c Mon Jul 18 17:26:56 2011
@@ -28,13 +28,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioplanar.c,v 1.3 2011/06/18 08:08:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioplanar.c,v 1.4 2011/07/18 17:26:56 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/intr.h>
-#include <machine/bus.h>
#include <dev/mca/mcavar.h>
#include <dev/mca/mcadevs.h>
Index: src/sys/arch/rs6000/mca/mca_machdep.c
diff -u src/sys/arch/rs6000/mca/mca_machdep.c:1.3 src/sys/arch/rs6000/mca/mca_machdep.c:1.4
--- src/sys/arch/rs6000/mca/mca_machdep.c:1.3 Sat Jun 18 08:08:30 2011
+++ src/sys/arch/rs6000/mca/mca_machdep.c Mon Jul 18 17:26:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mca_machdep.c,v 1.3 2011/06/18 08:08:30 matt Exp $ */
+/* $NetBSD: mca_machdep.c,v 1.4 2011/07/18 17:26:56 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.3 2011/06/18 08:08:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.4 2011/07/18 17:26:56 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -49,7 +49,7 @@
#include <powerpc/pio.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mca/mcavar.h>
#include <dev/mca/mcareg.h>
Index: src/sys/arch/rs6000/mca/mcadma_machdep.c
diff -u src/sys/arch/rs6000/mca/mcadma_machdep.c:1.2 src/sys/arch/rs6000/mca/mcadma_machdep.c:1.3
--- src/sys/arch/rs6000/mca/mcadma_machdep.c:1.2 Mon Apr 28 20:23:34 2008
+++ src/sys/arch/rs6000/mca/mcadma_machdep.c Mon Jul 18 17:26:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mcadma_machdep.c,v 1.2 2008/04/28 20:23:34 martin Exp $ */
+/* $NetBSD: mcadma_machdep.c,v 1.3 2011/07/18 17:26:56 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcadma_machdep.c,v 1.2 2008/04/28 20:23:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcadma_machdep.c,v 1.3 2011/07/18 17:26:56 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,7 +41,7 @@
#include <sys/mbuf.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
Index: src/sys/arch/rs6000/rs6000/consinit.c
diff -u src/sys/arch/rs6000/rs6000/consinit.c:1.2 src/sys/arch/rs6000/rs6000/consinit.c:1.3
--- src/sys/arch/rs6000/rs6000/consinit.c:1.2 Mon Apr 28 20:23:34 2008
+++ src/sys/arch/rs6000/rs6000/consinit.c Mon Jul 18 17:26:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.2 2008/04/28 20:23:34 martin Exp $ */
+/* $NetBSD: consinit.c,v 1.3 2011/07/18 17:26:56 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.2 2008/04/28 20:23:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.3 2011/07/18 17:26:56 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/bus.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
#include <machine/intr.h>
#include <dev/cons.h>
Index: src/sys/arch/rs6000/rs6000/cpu.c
diff -u src/sys/arch/rs6000/rs6000/cpu.c:1.3 src/sys/arch/rs6000/rs6000/cpu.c:1.4
--- src/sys/arch/rs6000/rs6000/cpu.c:1.3 Sun Jun 5 17:03:17 2011
+++ src/sys/arch/rs6000/rs6000/cpu.c Mon Jul 18 17:26:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.3 2011/06/05 17:03:17 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.4 2011/07/18 17:26:56 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.3 2011/06/05 17:03:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.4 2011/07/18 17:26:56 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
#include <machine/cpu.h>
int cpumatch(device_t, cfdata_t, void *);
Index: src/sys/arch/rs6000/rs6000/pic_iocc.c
diff -u src/sys/arch/rs6000/rs6000/pic_iocc.c:1.3 src/sys/arch/rs6000/rs6000/pic_iocc.c:1.4
--- src/sys/arch/rs6000/rs6000/pic_iocc.c:1.3 Sun Jun 19 07:59:46 2011
+++ src/sys/arch/rs6000/rs6000/pic_iocc.c Mon Jul 18 17:26:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_iocc.c,v 1.3 2011/06/19 07:59:46 matt Exp $ */
+/* $NetBSD: pic_iocc.c,v 1.4 2011/07/18 17:26:56 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,18 +30,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_iocc.c,v 1.3 2011/06/19 07:59:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_iocc.c,v 1.4 2011/07/18 17:26:56 dyoung Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
#include <machine/pio.h>
#include <machine/intr.h>
#include <machine/iocc.h>
-#include <machine/bus.h>
#include <arch/powerpc/pic/picvar.h>
Index: src/sys/arch/rs6000/rs6000/mainbus.c
diff -u src/sys/arch/rs6000/rs6000/mainbus.c:1.4 src/sys/arch/rs6000/rs6000/mainbus.c:1.5
--- src/sys/arch/rs6000/rs6000/mainbus.c:1.4 Sun Jun 5 17:03:17 2011
+++ src/sys/arch/rs6000/rs6000/mainbus.c Mon Jul 18 17:26:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4 2011/06/05 17:03:17 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.5 2011/07/18 17:26:56 dyoung Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,17 +30,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2011/06/05 17:03:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2011/07/18 17:26:56 dyoung Exp $");
#include <sys/param.h>
#include <sys/extent.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <powerpc/pio.h>
-#include <machine/bus.h>
#include "mca.h"
Added files:
Index: src/sys/arch/rs6000/include/bus_defs.h
diff -u /dev/null src/sys/arch/rs6000/include/bus_defs.h:1.1
--- /dev/null Mon Jul 18 17:26:57 2011
+++ src/sys/arch/rs6000/include/bus_defs.h Mon Jul 18 17:26:55 2011
@@ -0,0 +1,53 @@
+/* $NetBSD: bus_defs.h,v 1.1 2011/07/18 17:26:55 dyoung Exp $ */
+/*-
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RS6000_BUS_DEFS_H_
+#define _RS6000_BUS_DEFS_H_
+
+/*
+ * Values for the Be bus space tag, not to be used directly by MI code.
+ */
+#define RS6000_BUS_SPACE_IO 0xC0000000 /* i/o space */
+#define RS6000_BUS_SPACE_MEM 0xC0000000 /* mem space */
+
+/*
+ * Address conversion as seen from a PCI master.
+ */
+#define MPC105_DIRECT_MAPPED_SPACE 0xC0000000
+#define PHYS_TO_BUS_MEM(t, x) ((x) | MPC105_DIRECT_MAPPED_SPACE)
+#define BUS_MEM_TO_PHYS(t, x) ((x) & ~MPC105_DIRECT_MAPPED_SPACE)
+
+#ifdef _KERNEL
+extern struct powerpc_bus_space rs6000_iocc0_io_space_tag;
+#endif
+
+#include <powerpc/bus_defs.h>
+
+#endif /* _RS6000_BUS_DEFS_H_ */
Index: src/sys/arch/rs6000/include/bus_funcs.h
diff -u /dev/null src/sys/arch/rs6000/include/bus_funcs.h:1.1
--- /dev/null Mon Jul 18 17:26:57 2011
+++ src/sys/arch/rs6000/include/bus_funcs.h Mon Jul 18 17:26:55 2011
@@ -0,0 +1,36 @@
+/* $NetBSD: bus_funcs.h,v 1.1 2011/07/18 17:26:55 dyoung Exp $ */
+/*-
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RS6000_BUS_FUNCS_H_
+#define _RS6000_BUS_FUNCS_H_
+
+#include <powerpc/bus_funcs.h>
+
+#endif /* _RS6000_BUS_FUNCS_H_ */
