[src/trunk]: src/sys/arch/rs6000 Do the bus.h -> bus_{defs, funcs}.h split and...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/rs6000 Do the bus.h -> bus_{defs, funcs}.h split and...
From: dyoung <dyoung%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:50:32 +0000
details:   https://anonhg.NetBSD.org/src/rev/9203a85af1c2
branches:  trunk
changeset: 767439:9203a85af1c2
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Mon Jul 18 17:26:55 2011 +0000

description:
Do the bus.h -> bus_{defs,funcs}.h split and change all occurrences of
<machine/bus.h> to <sys/bus.h>.

diffstat:

 sys/arch/rs6000/include/bus.h          |  53 ----------------------------------
 sys/arch/rs6000/include/bus_defs.h     |  53 ++++++++++++++++++++++++++++++++++
 sys/arch/rs6000/include/bus_funcs.h    |  36 +++++++++++++++++++++++
 sys/arch/rs6000/include/mca_machdep.h  |   4 +-
 sys/arch/rs6000/ioplanar/com_iop.c     |   6 +-
 sys/arch/rs6000/ioplanar/ioplanarvar.h |   2 +-
 sys/arch/rs6000/mca/ioplanar.c         |   4 +-
 sys/arch/rs6000/mca/mca_machdep.c      |   6 +-
 sys/arch/rs6000/mca/mcadma_machdep.c   |   6 +-
 sys/arch/rs6000/rs6000/consinit.c      |   6 +-
 sys/arch/rs6000/rs6000/cpu.c           |   6 +-
 sys/arch/rs6000/rs6000/mainbus.c       |   6 +-
 sys/arch/rs6000/rs6000/pic_iocc.c      |   6 +-
 13 files changed, 115 insertions(+), 79 deletions(-)

diffs (truncated from 394 to 300 lines):

diff -r 5bc400125cb1 -r 9203a85af1c2 sys/arch/rs6000/include/bus.h
--- a/sys/arch/rs6000/include/bus.h     Mon Jul 18 17:18:14 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*     $NetBSD: bus.h,v 1.2 2008/04/28 20:23:34 martin 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_H_
-#define _RS6000_BUS_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.h>
-
-#endif /* _RS6000_BUS_H_ */
diff -r 5bc400125cb1 -r 9203a85af1c2 sys/arch/rs6000/include/bus_defs.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/rs6000/include/bus_defs.h        Mon Jul 18 17:26:55 2011 +0000
@@ -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_ */
diff -r 5bc400125cb1 -r 9203a85af1c2 sys/arch/rs6000/include/bus_funcs.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/rs6000/include/bus_funcs.h       Mon Jul 18 17:26:55 2011 +0000
@@ -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_ */
diff -r 5bc400125cb1 -r 9203a85af1c2 sys/arch/rs6000/include/mca_machdep.h
--- a/sys/arch/rs6000/include/mca_machdep.h     Mon Jul 18 17:18:14 2011 +0000
+++ b/sys/arch/rs6000/include/mca_machdep.h     Mon Jul 18 17:26:55 2011 +0000
@@ -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>
 
 /*
diff -r 5bc400125cb1 -r 9203a85af1c2 sys/arch/rs6000/ioplanar/com_iop.c
--- a/sys/arch/rs6000/ioplanar/com_iop.c        Mon Jul 18 17:18:14 2011 +0000
+++ b/sys/arch/rs6000/ioplanar/com_iop.c        Mon Jul 18 17:26:55 2011 +0000
@@ -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>
diff -r 5bc400125cb1 -r 9203a85af1c2 sys/arch/rs6000/ioplanar/ioplanarvar.h
--- a/sys/arch/rs6000/ioplanar/ioplanarvar.h    Mon Jul 18 17:18:14 2011 +0000
+++ b/sys/arch/rs6000/ioplanar/ioplanarvar.h    Mon Jul 18 17:26:55 2011 +0000
@@ -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>
 
 /*
diff -r 5bc400125cb1 -r 9203a85af1c2 sys/arch/rs6000/mca/ioplanar.c
--- a/sys/arch/rs6000/mca/ioplanar.c    Mon Jul 18 17:18:14 2011 +0000
+++ b/sys/arch/rs6000/mca/ioplanar.c    Mon Jul 18 17:26:55 2011 +0000
@@ -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>
diff -r 5bc400125cb1 -r 9203a85af1c2 sys/arch/rs6000/mca/mca_machdep.c
--- a/sys/arch/rs6000/mca/mca_machdep.c Mon Jul 18 17:18:14 2011 +0000
+++ b/sys/arch/rs6000/mca/mca_machdep.c Mon Jul 18 17:26:55 2011 +0000
@@ -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>
diff -r 5bc400125cb1 -r 9203a85af1c2 sys/arch/rs6000/mca/mcadma_machdep.c
--- a/sys/arch/rs6000/mca/mcadma_machdep.c      Mon Jul 18 17:18:14 2011 +0000
+++ b/sys/arch/rs6000/mca/mcadma_machdep.c      Mon Jul 18 17:26:55 2011 +0000
@@ -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>
 
diff -r 5bc400125cb1 -r 9203a85af1c2 sys/arch/rs6000/rs6000/consinit.c
--- a/sys/arch/rs6000/rs6000/consinit.c Mon Jul 18 17:18:14 2011 +0000
+++ b/sys/arch/rs6000/rs6000/consinit.c Mon Jul 18 17:26:55 2011 +0000
@@ -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 $");
Prev by Date: [src/trunk]: src/usr.sbin/makefs Don't include v7fs support into tool version...
Next by Date: [src/trunk]: src/distrib/sets/lists/comp Mark bus.h obsolete on more archs.
Previous by Thread: [src/trunk]: src/usr.sbin/makefs Don't include v7fs support into tool version...
Next by Thread: [src/trunk]: src/distrib/sets/lists/comp Mark bus.h obsolete on more archs.
Indexes:
Home | Main Index | Thread Index | Old Index