[src/trunk]: src/sys/arch #include <sys/bus.h> instead of <machine/bus.h>.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch #include <sys/bus.h> instead of <machine/bus.h>.
From: dyoung <dyoung%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:43:54 +0000
details:   https://anonhg.NetBSD.org/src/rev/53de65d50a74
branches:  trunk
changeset: 766777:53de65d50a74
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Jul 01 20:57:45 2011 +0000

description:
#include <sys/bus.h> instead of <machine/bus.h>.

diffstat:

 sys/arch/algor/include/autoconf.h      |  4 ++--
 sys/arch/arm/arm32/bus_dma.c           |  6 +++---
 sys/arch/arm/arm32/pmap.c              |  6 +++---
 sys/arch/arm/include/isa_machdep.h     |  4 ++--
 sys/arch/arm/include/pio.h             |  4 ++--
 sys/arch/atari/include/isa_machdep.h   |  4 ++--
 sys/arch/cobalt/include/autoconf.h     |  4 ++--
 sys/arch/hp700/include/autoconf.h      |  4 ++--
 sys/arch/macppc/include/autoconf.h     |  4 ++--
 sys/arch/mips/mips/bus_dma.c           |  6 +++---
 sys/arch/ofppc/include/autoconf.h      |  4 ++--
 sys/arch/powerpc/include/isa_machdep.h |  4 ++--
 sys/arch/sgimips/include/autoconf.h    |  4 ++--
 sys/arch/sgimips/include/z8530var.h    |  4 ++--
 sys/arch/sparc/include/autoconf.h      |  4 ++--
 sys/arch/sparc/include/z8530var.h      |  4 ++--
 sys/arch/sparc64/include/autoconf.h    |  4 ++--
 sys/arch/sparc64/include/z8530var.h    |  4 ++--
 18 files changed, 39 insertions(+), 39 deletions(-)

diffs (truncated from 346 to 300 lines):

diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/algor/include/autoconf.h
--- a/sys/arch/algor/include/autoconf.h Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/algor/include/autoconf.h Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.h,v 1.5 2011/02/20 07:51:21 matt Exp $        */
+/*     $NetBSD: autoconf.h,v 1.6 2011/07/01 21:02:15 dyoung Exp $      */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -30,7 +30,7 @@
 #ifndef _ALGOR_AUTOCONF_H_
 #define        _ALGOR_AUTOCONF_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * Machine-dependent structures for autoconfiguration
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.53 2010/11/06 11:46:00 uebayasi Exp $    */
+/*     $NetBSD: bus_dma.c,v 1.54 2011/07/01 20:57:45 dyoung Exp $      */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #define _ARM32_BUS_DMA_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.53 2010/11/06 11:46:00 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.54 2011/07/01 20:57:45 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,7 +50,7 @@
 
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 
 #include <arm/cpufunc.h>
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/arm/arm32/pmap.c Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.223 2011/06/30 20:09:19 wiz Exp $   */
+/*     $NetBSD: pmap.c,v 1.224 2011/07/01 20:57:45 dyoung Exp $        */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -205,13 +205,13 @@
  
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pmap.h>
 #include <machine/pcb.h>
 #include <machine/param.h>
 #include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.223 2011/06/30 20:09:19 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.224 2011/07/01 20:57:45 dyoung Exp $");
 
 #ifdef PMAP_DEBUG
 
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/arm/include/isa_machdep.h
--- a/sys/arch/arm/include/isa_machdep.h        Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/arm/include/isa_machdep.h        Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_machdep.h,v 1.7 2009/08/19 15:01:07 dyoung Exp $   */
+/*     $NetBSD: isa_machdep.h,v 1.8 2011/07/01 21:16:40 dyoung Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #ifndef _ARM32_ISA_MACHDEP_H_
 #define _ARM32_ISA_MACHDEP_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/isa/isadmavar.h>
 
 /*
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/arm/include/pio.h
--- a/sys/arch/arm/include/pio.h        Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/arm/include/pio.h        Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pio.h,v 1.1 2001/02/23 21:23:48 reinoud Exp $  */
+/*     $NetBSD: pio.h,v 1.2 2011/07/01 21:20:33 dyoung Exp $   */
 
 /*
  * Copyright 1997
@@ -36,7 +36,7 @@
 #ifndef _ARM32_PIO_H_
 #define _ARM32_PIO_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 extern struct bus_space isa_io_bs_tag;
 
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/atari/include/isa_machdep.h
--- a/sys/arch/atari/include/isa_machdep.h      Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/atari/include/isa_machdep.h      Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_machdep.h,v 1.15 2009/10/20 19:10:11 snj Exp $     */
+/*     $NetBSD: isa_machdep.h,v 1.16 2011/07/01 21:16:40 dyoung Exp $  */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 #ifndef _ATARI_ISA_MACHDEP_H_
 #define _ATARI_ISA_MACHDEP_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <dev/isa/isadmavar.h>
 
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/cobalt/include/autoconf.h
--- a/sys/arch/cobalt/include/autoconf.h        Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/cobalt/include/autoconf.h        Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.h,v 1.5 2009/12/17 15:29:47 matt Exp $        */
+/*     $NetBSD: autoconf.h,v 1.6 2011/07/01 21:02:15 dyoung Exp $      */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct mainbus_attach_args {
        const char      *ma_name;
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/hp700/include/autoconf.h
--- a/sys/arch/hp700/include/autoconf.h Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/hp700/include/autoconf.h Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.h,v 1.18 2011/01/20 19:47:40 skrll Exp $      */
+/*     $NetBSD: autoconf.h,v 1.19 2011/07/01 21:02:15 dyoung Exp $     */
 
 /*     $OpenBSD: autoconf.h,v 1.10 2001/05/05 22:33:42 art Exp $       */
 
@@ -30,7 +30,7 @@
 
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pdc.h>
 
 /* 16 should be enough for anyone */
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/macppc/include/autoconf.h
--- a/sys/arch/macppc/include/autoconf.h        Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/macppc/include/autoconf.h        Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.h,v 1.17 2011/06/30 00:52:57 matt Exp $       */
+/*     $NetBSD: autoconf.h,v 1.18 2011/07/01 21:02:15 dyoung Exp $     */
 
 /*-
  * Copyright (C) 1998  Internet Research Institute, Inc.
@@ -34,7 +34,7 @@
 #ifndef _MACHINE_AUTOCONF_H_
 #define _MACHINE_AUTOCONF_H_
 
-#include <machine/bus.h>       /* for bus_space_tag_t */
+#include <sys/bus.h>   /* for bus_space_tag_t */
 
 struct confargs {
        const char *ca_name;
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/mips/mips/bus_dma.c
--- a/sys/arch/mips/mips/bus_dma.c      Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/mips/mips/bus_dma.c      Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.25 2011/02/20 07:45:47 matt Exp $        */
+/*     $NetBSD: bus_dma.c,v 1.26 2011/07/01 20:58:39 dyoung Exp $      */
 
 /*-
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.25 2011/02/20 07:45:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.26 2011/07/01 20:58:39 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,7 +51,7 @@
 #endif
 
 #define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/locore.h>
 
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/ofppc/include/autoconf.h
--- a/sys/arch/ofppc/include/autoconf.h Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/ofppc/include/autoconf.h Fri Jul 01 20:57:45 2011 +0000
@@ -1,9 +1,9 @@
-/*     $NetBSD: autoconf.h,v 1.14 2011/06/18 08:08:29 matt Exp $       */
+/*     $NetBSD: autoconf.h,v 1.15 2011/07/01 21:02:15 dyoung Exp $     */
 
 #ifndef _OFPPC_AUTOCONF_H_
 #define _OFPPC_AUTOCONF_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct confargs {
        const char      *ca_name;
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/powerpc/include/isa_machdep.h
--- a/sys/arch/powerpc/include/isa_machdep.h    Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/powerpc/include/isa_machdep.h    Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_machdep.h,v 1.7 2011/06/17 19:03:00 matt Exp $     */
+/*     $NetBSD: isa_machdep.h,v 1.8 2011/07/01 21:01:30 dyoung Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
 #ifndef _POWERPC_ISA_MACHDEP_H_
 #define _POWERPC_ISA_MACHDEP_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/isa/isadmavar.h>
 
 /*
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/sgimips/include/autoconf.h
--- a/sys/arch/sgimips/include/autoconf.h       Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/sgimips/include/autoconf.h       Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.h,v 1.10 2007/10/17 19:57:04 garbled Exp $    */
+/*     $NetBSD: autoconf.h,v 1.11 2011/07/01 21:00:21 dyoung Exp $     */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 struct mainbus_attach_args {
        char            *ma_name;
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/sgimips/include/z8530var.h
--- a/sys/arch/sgimips/include/z8530var.h       Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/sgimips/include/z8530var.h       Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: z8530var.h,v 1.9 2008/03/29 19:15:35 tsutsui Exp $     */
+/*     $NetBSD: z8530var.h,v 1.10 2011/07/01 21:00:21 dyoung Exp $     */
 
 /*
  * Copyright (c) 1992, 1993
@@ -83,7 +83,7 @@
  *     @(#)zsvar.h     8.1 (Berkeley) 6/11/93
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <dev/ic/z8530sc.h>
 
 struct zs_channel {
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/sparc/include/autoconf.h
--- a/sys/arch/sparc/include/autoconf.h Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/sparc/include/autoconf.h Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.h,v 1.46 2008/04/28 20:23:36 martin Exp $ */
+/*     $NetBSD: autoconf.h,v 1.47 2011/07/01 21:00:57 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  * Autoconfiguration information.
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/bsd_openprom.h>
 #include <machine/promlib.h>
 #include <dev/sbus/sbusvar.h>
diff -r 54134dd7d0b0 -r 53de65d50a74 sys/arch/sparc/include/z8530var.h
--- a/sys/arch/sparc/include/z8530var.h Fri Jul 01 20:47:43 2011 +0000
+++ b/sys/arch/sparc/include/z8530var.h Fri Jul 01 20:57:45 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: z8530var.h,v 1.10 2010/06/26 16:10:00 tsutsui Exp $    */
+/*     $NetBSD: z8530var.h,v 1.11 2011/07/01 21:00:57 dyoung Exp $     */
 
 /*
Prev by Date: [src/trunk]: src/sys/arch #include <sys/bus.h> instead of <machine/bus.h>.
Next by Date: [src/trunk]: src/share/man/man9 Bump date.
Previous by Thread: [src/trunk]: src/sys/arch #include <sys/bus.h> instead of <machine/bus.h>.
Next by Thread: [src/trunk]: src/share/man/man9 Bump date.
Indexes:
Home | Main Index | Thread Index | Old Index