[src/trunk]: src Change <machine/bus.h> to <sys/bus.h> throughout.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Change <machine/bus.h> to <sys/bus.h> throughout.
From: dyoung <dyoung%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:50:54 +0000
details:   https://anonhg.NetBSD.org/src/rev/95e215a4d43a
branches:  trunk
changeset: 767475:95e215a4d43a
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue Jul 19 15:52:29 2011 +0000

description:
Change <machine/bus.h> to <sys/bus.h> throughout.

Split bus.h -> bus_{defs,funcs}.h.

Mark dreamcast/bus.h obsolete.

diffstat:

 distrib/sets/lists/comp/md.dreamcast      |    4 +-
 sys/arch/dreamcast/dev/g2/aica.c          |    6 +-
 sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c |    6 +-
 sys/arch/dreamcast/dev/g2/g2busvar.h      |    4 +-
 sys/arch/dreamcast/dev/g2/g2rtc.c         |    6 +-
 sys/arch/dreamcast/dev/g2/gapspci.c       |    6 +-
 sys/arch/dreamcast/dev/g2/gapspci_dma.c   |    6 +-
 sys/arch/dreamcast/dev/g2/gapspci_pci.c   |    6 +-
 sys/arch/dreamcast/dev/g2/if_mbe_g2.c     |    6 +-
 sys/arch/dreamcast/dev/maple/maple.c      |    6 +-
 sys/arch/dreamcast/dev/maple/mkbd.c       |    6 +-
 sys/arch/dreamcast/dev/pvr.c              |    6 +-
 sys/arch/dreamcast/include/Makefile       |    4 +-
 sys/arch/dreamcast/include/bus.h          |  594 ------------------------------
 sys/arch/dreamcast/include/bus_defs.h     |  349 +++++++++++++++++
 sys/arch/dreamcast/include/bus_funcs.h    |  309 +++++++++++++++
 16 files changed, 694 insertions(+), 630 deletions(-)

diffs (truncated from 1608 to 300 lines):

diff -r 29b142fa00ff -r 95e215a4d43a distrib/sets/lists/comp/md.dreamcast
--- a/distrib/sets/lists/comp/md.dreamcast      Tue Jul 19 15:44:52 2011 +0000
+++ b/distrib/sets/lists/comp/md.dreamcast      Tue Jul 19 15:52:29 2011 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: md.dreamcast,v 1.16 2011/07/18 17:42:34 dyoung Exp $
+# $NetBSD: md.dreamcast,v 1.17 2011/07/19 15:52:29 dyoung Exp $
 ./usr/include/dreamcast                                comp-c-include
 ./usr/include/dreamcast/_G_config.h            comp-obsolete           obsolete
 ./usr/include/dreamcast/ansi.h                 comp-c-include
 ./usr/include/dreamcast/aout_machdep.h         comp-c-include
 ./usr/include/dreamcast/asm.h                  comp-c-include
 ./usr/include/dreamcast/bswap.h                        comp-c-include
-./usr/include/dreamcast/bus.h                  comp-c-include
+./usr/include/dreamcast/bus.h                  comp-obsolete           obsolete
 ./usr/include/dreamcast/cdefs.h                        comp-c-include
 ./usr/include/dreamcast/coff_machdep.h         comp-c-include
 ./usr/include/dreamcast/conf.h                 comp-obsolete           obsolete
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/g2/aica.c
--- a/sys/arch/dreamcast/dev/g2/aica.c  Tue Jul 19 15:44:52 2011 +0000
+++ b/sys/arch/dreamcast/dev/g2/aica.c  Tue Jul 19 15:52:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aica.c,v 1.20 2010/11/21 16:11:32 tsutsui Exp $        */
+/*     $NetBSD: aica.c,v 1.21 2011/07/19 15:52:29 dyoung Exp $ */
 
 /*
  * Copyright (c) 2003 SHIMIZU Ryo <ryo%misakimix.org@localhost>
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.20 2010/11/21 16:11:32 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.21 2011/07/19 15:52:29 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,12 +37,12 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/audioio.h>
+#include <sys/bus.h>
 
 #include <dev/audio_if.h>
 #include <dev/mulaw.h>
 #include <dev/auconv.h>
 
-#include <machine/bus.h>
 #include <machine/sysasicvar.h>
 
 #include <dreamcast/dev/g2/g2busvar.h>
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c
--- a/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c Tue Jul 19 15:44:52 2011 +0000
+++ b/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c Tue Jul 19 15:52:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: g2bus_bus_mem.c,v 1.15 2009/08/23 14:28:09 tsutsui Exp $       */
+/*     $NetBSD: g2bus_bus_mem.c,v 1.16 2011/07/19 15:52:29 dyoung Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,14 +39,14 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: g2bus_bus_mem.c,v 1.15 2009/08/23 14:28:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g2bus_bus_mem.c,v 1.16 2011/07/19 15:52:29 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
 
 #include <dreamcast/dev/g2/g2busvar.h>
 
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/g2/g2busvar.h
--- a/sys/arch/dreamcast/dev/g2/g2busvar.h      Tue Jul 19 15:44:52 2011 +0000
+++ b/sys/arch/dreamcast/dev/g2/g2busvar.h      Tue Jul 19 15:52:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: g2busvar.h,v 1.5 2010/11/21 16:11:32 tsutsui Exp $     */
+/*     $NetBSD: g2busvar.h,v 1.6 2011/07/19 15:52:29 dyoung Exp $      */
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -35,7 +35,7 @@
 #ifndef _DREAMCAST_G2BUSVAR_H_
 #define _DREAMCAST_G2BUSVAR_H_
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 /*
  * G2 driver attach arguments
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/g2/g2rtc.c
--- a/sys/arch/dreamcast/dev/g2/g2rtc.c Tue Jul 19 15:44:52 2011 +0000
+++ b/sys/arch/dreamcast/dev/g2/g2rtc.c Tue Jul 19 15:52:29 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: g2rtc.c,v 1.5 2010/09/01 17:06:00 tsutsui Exp $ */
+/* $NetBSD: g2rtc.c,v 1.6 2011/07/19 15:52:29 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,15 +27,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g2rtc.c,v 1.5 2010/09/01 17:06:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g2rtc.c,v 1.6 2011/07/19 15:52:29 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include <dev/clock_subr.h>
 
-#include <machine/bus.h>
 #include <dreamcast/dev/g2/g2busvar.h>
 
 
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/g2/gapspci.c
--- a/sys/arch/dreamcast/dev/g2/gapspci.c       Tue Jul 19 15:44:52 2011 +0000
+++ b/sys/arch/dreamcast/dev/g2/gapspci.c       Tue Jul 19 15:52:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gapspci.c,v 1.18 2011/05/17 17:34:49 dyoung Exp $      */
+/*     $NetBSD: gapspci.c,v 1.19 2011/07/19 15:52:29 dyoung Exp $      */
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gapspci.c,v 1.18 2011/05/17 17:34:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gapspci.c,v 1.19 2011/07/19 15:52:29 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -42,9 +42,9 @@
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/mbuf.h>
+#include <sys/bus.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/g2/gapspci_dma.c
--- a/sys/arch/dreamcast/dev/g2/gapspci_dma.c   Tue Jul 19 15:44:52 2011 +0000
+++ b/sys/arch/dreamcast/dev/g2/gapspci_dma.c   Tue Jul 19 15:52:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gapspci_dma.c,v 1.18 2010/11/12 13:18:56 uebayasi Exp $        */
+/*     $NetBSD: gapspci_dma.c,v 1.19 2011/07/19 15:52:29 dyoung Exp $  */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gapspci_dma.c,v 1.18 2010/11/12 13:18:56 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gapspci_dma.c,v 1.19 2011/07/19 15:52:29 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,9 +47,9 @@
 #include <sys/mbuf.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
 
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/g2/gapspci_pci.c
--- a/sys/arch/dreamcast/dev/g2/gapspci_pci.c   Tue Jul 19 15:44:52 2011 +0000
+++ b/sys/arch/dreamcast/dev/g2/gapspci_pci.c   Tue Jul 19 15:52:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gapspci_pci.c,v 1.12 2010/11/21 16:11:32 tsutsui Exp $ */
+/*     $NetBSD: gapspci_pci.c,v 1.13 2011/07/19 15:52:30 dyoung Exp $  */
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt.
@@ -38,15 +38,15 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gapspci_pci.c,v 1.12 2010/11/21 16:11:32 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gapspci_pci.c,v 1.13 2011/07/19 15:52:30 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
 #include <machine/sysasicvar.h>
 
 #include <dev/pci/pcivar.h>
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/g2/if_mbe_g2.c
--- a/sys/arch/dreamcast/dev/g2/if_mbe_g2.c     Tue Jul 19 15:44:52 2011 +0000
+++ b/sys/arch/dreamcast/dev/g2/if_mbe_g2.c     Tue Jul 19 15:52:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_mbe_g2.c,v 1.7 2008/04/12 06:27:01 tsutsui Exp $    */
+/*     $NetBSD: if_mbe_g2.c,v 1.8 2011/07/19 15:52:30 dyoung Exp $     */
 
 /*
  * Copyright (c) 2002 Christian Groessler
@@ -64,17 +64,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mbe_g2.c,v 1.7 2008/04/12 06:27:01 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mbe_g2.c,v 1.8 2011/07/19 15:52:30 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/sysasicvar.h>
 #include <machine/cpu.h>
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/maple/maple.c
--- a/sys/arch/dreamcast/dev/maple/maple.c      Tue Jul 19 15:44:52 2011 +0000
+++ b/sys/arch/dreamcast/dev/maple/maple.c      Tue Jul 19 15:52:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: maple.c,v 1.43 2010/11/12 13:18:57 uebayasi Exp $      */
+/*     $NetBSD: maple.c,v 1.44 2011/07/19 15:52:30 dyoung Exp $        */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.43 2010/11/12 13:18:57 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.44 2011/07/19 15:52:30 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -75,11 +75,11 @@
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
 #include <machine/sysasicvar.h>
 #include <sh3/pmap.h>
 
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/maple/mkbd.c
--- a/sys/arch/dreamcast/dev/maple/mkbd.c       Tue Jul 19 15:44:52 2011 +0000
+++ b/sys/arch/dreamcast/dev/maple/mkbd.c       Tue Jul 19 15:52:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkbd.c,v 1.28 2010/10/17 14:13:44 tsutsui Exp $        */
+/*     $NetBSD: mkbd.c,v 1.29 2011/07/19 15:52:30 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mkbd.c,v 1.28 2010/10/17 14:13:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkbd.c,v 1.29 2011/07/19 15:52:30 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -43,6 +43,7 @@
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
 
 #include "wskbd.h"
 
@@ -52,7 +53,6 @@
 #include <dev/wscons/wsksymvar.h>
 
 #include <machine/cpu.h>
-#include <machine/bus.h>
 
 #include <dreamcast/dev/maple/maple.h>
 #include <dreamcast/dev/maple/mapleconf.h>
diff -r 29b142fa00ff -r 95e215a4d43a sys/arch/dreamcast/dev/pvr.c
Prev by Date: [src/trunk]: src/sys/arch/hpcsh/include Straggler from last: bus.h -> bus_{de...
Next by Date: [src/trunk]: src/sys/arch/amiga Change <machine/bus.h> to <sys/bus.h> through...
Previous by Thread: [src/trunk]: src/sys/arch/hpcsh/include Straggler from last: bus.h -> bus_{de...
Next by Thread: [src/trunk]: src/sys/arch/amiga Change <machine/bus.h> to <sys/bus.h> through...
Indexes:
Home | Main Index | Thread Index | Old Index