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

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/12520d04481a
branches:  trunk
changeset: 767471:12520d04481a
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue Jul 19 15:30:51 2011 +0000

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

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

Mark hpcsh/bus.h obsolete.

diffstat:

 distrib/sets/lists/comp/md.hpcsh             |    4 +-
 sys/arch/hpcsh/dev/hd64461/hd64461.c         |    6 +-
 sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c |    6 +-
 sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c   |    6 +-
 sys/arch/hpcsh/dev/hd64461/hd64461uart.c     |    6 +-
 sys/arch/hpcsh/dev/hd64461/hd64461video.c    |    6 +-
 sys/arch/hpcsh/dev/hd64465/hd64465.c         |    6 +-
 sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c   |    6 +-
 sys/arch/hpcsh/dev/hd64465/hd64465uart.c     |    6 +-
 sys/arch/hpcsh/dev/pfckbd.c                  |    6 +-
 sys/arch/hpcsh/hpcsh/autoconf.c              |    6 +-
 sys/arch/hpcsh/hpcsh/bus_space.c             |  138 ++++++++++++++++++++++++++-
 sys/arch/hpcsh/include/Makefile              |    4 +-
 13 files changed, 168 insertions(+), 38 deletions(-)

diffs (truncated from 484 to 300 lines):

diff -r 273e760af091 -r 12520d04481a distrib/sets/lists/comp/md.hpcsh
--- a/distrib/sets/lists/comp/md.hpcsh  Tue Jul 19 15:17:20 2011 +0000
+++ b/distrib/sets/lists/comp/md.hpcsh  Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcsh,v 1.25 2011/07/18 17:39:05 dyoung Exp $
+# $NetBSD: md.hpcsh,v 1.26 2011/07/19 15:30:51 dyoung Exp $
 ./usr/include/hpcsh                            comp-c-include
 ./usr/include/hpcsh/_G_config.h                        comp-obsolete           obsolete
 ./usr/include/hpcsh/ansi.h                     comp-c-include
@@ -7,7 +7,7 @@
 ./usr/include/hpcsh/asm.h                      comp-c-include
 ./usr/include/hpcsh/bootinfo.h                 comp-c-include
 ./usr/include/hpcsh/bswap.h                    comp-c-include
-./usr/include/hpcsh/bus.h                      comp-c-include
+./usr/include/hpcsh/bus.h                      comp-obsolete           obsolete
 ./usr/include/hpcsh/cdefs.h                    comp-c-include
 ./usr/include/hpcsh/coff_machdep.h             comp-c-include
 ./usr/include/hpcsh/conf.h                     comp-obsolete           obsolete
diff -r 273e760af091 -r 12520d04481a sys/arch/hpcsh/dev/hd64461/hd64461.c
--- a/sys/arch/hpcsh/dev/hd64461/hd64461.c      Tue Jul 19 15:17:20 2011 +0000
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461.c      Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64461.c,v 1.23 2010/05/13 18:07:40 kiyohara Exp $    */
+/*     $NetBSD: hd64461.c,v 1.24 2011/07/19 15:30:52 dyoung Exp $      */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461.c,v 1.23 2010/05/13 18:07:40 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461.c,v 1.24 2011/07/19 15:30:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/debug.h>
 
diff -r 273e760af091 -r 12520d04481a sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c
--- a/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c      Tue Jul 19 15:17:20 2011 +0000
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461_machdep.c      Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64461_machdep.c,v 1.5 2008/04/28 20:23:22 martin Exp $       */
+/*     $NetBSD: hd64461_machdep.c,v 1.6 2011/07/19 15:30:52 dyoung Exp $       */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,12 +30,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461_machdep.c,v 1.5 2008/04/28 20:23:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461_machdep.c,v 1.6 2011/07/19 15:30:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/platid.h>
 #include <machine/platid_mask.h>
 
diff -r 273e760af091 -r 12520d04481a sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
--- a/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c        Tue Jul 19 15:17:20 2011 +0000
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c        Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64461pcmcia.c,v 1.46 2009/04/05 00:56:20 uwe Exp $   */
+/*     $NetBSD: hd64461pcmcia.c,v 1.47 2011/07/19 15:30:52 dyoung Exp $        */
 
 /*-
  * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.46 2009/04/05 00:56:20 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.47 2011/07/19 15:30:52 dyoung Exp $");
 
 #include "opt_hd64461pcmcia.h"
 
@@ -40,8 +40,8 @@
 #include <sys/malloc.h>
 #include <sys/kthread.h>
 #include <sys/boot_flag.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 
 #include <dev/pcmcia/pcmciareg.h>
diff -r 273e760af091 -r 12520d04481a sys/arch/hpcsh/dev/hd64461/hd64461uart.c
--- a/sys/arch/hpcsh/dev/hd64461/hd64461uart.c  Tue Jul 19 15:17:20 2011 +0000
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461uart.c  Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64461uart.c,v 1.27 2010/05/13 18:21:33 kiyohara Exp $        */
+/*     $NetBSD: hd64461uart.c,v 1.28 2011/07/19 15:30:52 dyoung Exp $  */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461uart.c,v 1.27 2010/05/13 18:21:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461uart.c,v 1.28 2011/07/19 15:30:52 dyoung Exp $");
 
 #include "opt_kgdb.h"
 
@@ -41,8 +41,8 @@
 #include <sys/termios.h>
 #include <dev/cons.h>
 #include <sys/conf.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/console.h>
 #include <machine/platid.h>
diff -r 273e760af091 -r 12520d04481a sys/arch/hpcsh/dev/hd64461/hd64461video.c
--- a/sys/arch/hpcsh/dev/hd64461/hd64461video.c Tue Jul 19 15:17:20 2011 +0000
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461video.c Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64461video.c,v 1.52 2009/04/05 00:56:20 uwe Exp $    */
+/*     $NetBSD: hd64461video.c,v 1.53 2011/07/19 15:30:52 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461video.c,v 1.52 2009/04/05 00:56:20 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461video.c,v 1.53 2011/07/19 15:30:52 dyoung Exp $");
 
 #include "opt_hd64461video.h"
 // #define HD64461VIDEO_HWACCEL
@@ -40,6 +40,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 
 #include <sys/conf.h> /* cdev_decl */
 #include <dev/cons.h> /* consdev */
@@ -49,7 +50,6 @@
 #include <sys/buf.h>
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 
 #include <hpcsh/dev/hd64461/hd64461var.h>
diff -r 273e760af091 -r 12520d04481a sys/arch/hpcsh/dev/hd64465/hd64465.c
--- a/sys/arch/hpcsh/dev/hd64465/hd64465.c      Tue Jul 19 15:17:20 2011 +0000
+++ b/sys/arch/hpcsh/dev/hd64465/hd64465.c      Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64465.c,v 1.14 2011/06/06 17:27:42 matt Exp $        */
+/*     $NetBSD: hd64465.c,v 1.15 2011/07/19 15:30:52 dyoung Exp $      */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64465.c,v 1.14 2011/06/06 17:27:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64465.c,v 1.15 2011/07/19 15:30:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/boot_flag.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/debug.h>
 
diff -r 273e760af091 -r 12520d04481a sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c
--- a/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c        Tue Jul 19 15:17:20 2011 +0000
+++ b/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c        Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64465pcmcia.c,v 1.26 2009/11/07 07:27:44 cegger Exp $        */
+/*     $NetBSD: hd64465pcmcia.c,v 1.27 2011/07/19 15:30:52 dyoung Exp $        */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.26 2009/11/07 07:27:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.27 2011/07/19 15:30:52 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,10 +38,10 @@
 #include <sys/malloc.h>
 #include <sys/kthread.h>
 #include <sys/boot_flag.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 
 #include <dev/pcmcia/pcmciareg.h>
diff -r 273e760af091 -r 12520d04481a sys/arch/hpcsh/dev/hd64465/hd64465uart.c
--- a/sys/arch/hpcsh/dev/hd64465/hd64465uart.c  Tue Jul 19 15:17:20 2011 +0000
+++ b/sys/arch/hpcsh/dev/hd64465/hd64465uart.c  Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64465uart.c,v 1.17 2008/04/28 20:23:22 martin Exp $  */
+/*     $NetBSD: hd64465uart.c,v 1.18 2011/07/19 15:30:52 dyoung Exp $  */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64465uart.c,v 1.17 2008/04/28 20:23:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64465uart.c,v 1.18 2011/07/19 15:30:52 dyoung Exp $");
 
 #include "opt_kgdb.h"
 
@@ -37,12 +37,12 @@
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/kgdb.h>
+#include <sys/bus.h>
 
 #include <sys/termios.h>
 #include <dev/cons.h>
 #include <sys/conf.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/console.h>
 
diff -r 273e760af091 -r 12520d04481a sys/arch/hpcsh/dev/pfckbd.c
--- a/sys/arch/hpcsh/dev/pfckbd.c       Tue Jul 19 15:17:20 2011 +0000
+++ b/sys/arch/hpcsh/dev/pfckbd.c       Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pfckbd.c,v 1.27 2009/04/05 02:29:40 uwe Exp $  */
+/*     $NetBSD: pfckbd.c,v 1.28 2011/07/19 15:30:51 dyoung Exp $       */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  * currently, HP Jornada 680/690, HITACHI PERSONA HPW-50PAD only.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pfckbd.c,v 1.27 2009/04/05 02:29:40 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pfckbd.c,v 1.28 2011/07/19 15:30:51 dyoung Exp $");
 
 #include "debug_hpcsh.h"
 
@@ -42,8 +42,8 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/callout.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/platid.h>
 #include <machine/platid_mask.h>
 
diff -r 273e760af091 -r 12520d04481a sys/arch/hpcsh/hpcsh/autoconf.c
--- a/sys/arch/hpcsh/hpcsh/autoconf.c   Tue Jul 19 15:17:20 2011 +0000
+++ b/sys/arch/hpcsh/hpcsh/autoconf.c   Tue Jul 19 15:30:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.24 2011/02/08 20:20:15 rmind Exp $      */
+/*     $NetBSD: autoconf.c,v 1.25 2011/07/19 15:30:53 dyoung Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2011/02/08 20:20:15 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2011/07/19 15:30:53 dyoung Exp $");
 
 #include "opt_md.h"
 
@@ -48,9 +48,9 @@
 #include <sys/conf.h>
 #include <sys/disklabel.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include <sh3/exception.h>
-#include <machine/bus.h>