[src/trunk]: src/sys/arch/shark Change <machine/bus.h> to <sys/bus.h> through...

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

details:   https://anonhg.NetBSD.org/src/rev/056776c9c7b1
branches:  trunk
changeset: 767466:056776c9c7b1
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue Jul 19 15:07:42 2011 +0000

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

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

diffstat:

 sys/arch/shark/include/Makefile          |  4 ++--
 sys/arch/shark/include/bus.h             |  6 ------
 sys/arch/shark/include/bus_defs.h        |  6 ++++++
 sys/arch/shark/include/bus_funcs.h       |  6 ++++++
 sys/arch/shark/isa/isa_io.c              |  6 +++---
 sys/arch/shark/isa/isadma_machdep.c      |  6 +++---
 sys/arch/shark/ofw/chipsfb_ofbus.c       |  6 +++---
 sys/arch/shark/ofw/com_ofisa_machdep.c   |  6 +++---
 sys/arch/shark/ofw/if_cs_ofisa_machdep.c |  6 +++---
 sys/arch/shark/ofw/igsfb_ofbus.c         |  6 +++---
 sys/arch/shark/ofw/lpt_ofisa_machdep.c   |  6 +++---
 sys/arch/shark/ofw/ofisa_machdep.c       |  6 +++---
 sys/arch/shark/ofw/ofrom.c               |  6 +++---
 sys/arch/shark/ofw/ofw.c                 |  6 +++---
 sys/arch/shark/ofw/wdc_ofisa_machdep.c   |  6 +++---
 sys/arch/shark/shark/consinit.c          |  6 +++---
 sys/arch/shark/shark/i8042.c             |  6 +++---
 sys/arch/shark/shark/ns87307.c           |  6 +++---
 sys/arch/shark/shark/sequoia.c           |  6 +++---
 19 files changed, 59 insertions(+), 53 deletions(-)

diffs (truncated from 450 to 300 lines):

diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/include/Makefile
--- a/sys/arch/shark/include/Makefile   Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/include/Makefile   Tue Jul 19 15:07:42 2011 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.11 2011/07/17 20:54:47 joerg Exp $
+#      $NetBSD: Makefile,v 1.12 2011/07/19 15:07:42 dyoung Exp $
 
 INCSDIR= /usr/include/shark
 
 INCS=  ansi.h aout_machdep.h asm.h \
-       bswap.h bus.h \
+       bswap.h \
        cdefs.h cpu.h \
        disklabel.h \
        elf_machdep.h endian.h endian_machdep.h \
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/include/bus.h
--- a/sys/arch/shark/include/bus.h      Tue Jul 19 12:23:51 2011 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-/*     $NetBSD: bus.h,v 1.2 2007/01/21 23:19:57 macallan Exp $ */
-
-#define __BUS_SPACE_HAS_STREAM_METHODS
-
-#include <arm/bus.h>
-
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/include/bus_defs.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/shark/include/bus_defs.h Tue Jul 19 15:07:42 2011 +0000
@@ -0,0 +1,6 @@
+/*     $NetBSD: bus_defs.h,v 1.1 2011/07/19 15:07:42 dyoung Exp $      */
+
+#define __BUS_SPACE_HAS_STREAM_METHODS
+
+#include <arm/bus_defs.h>
+
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/include/bus_funcs.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/shark/include/bus_funcs.h        Tue Jul 19 15:07:42 2011 +0000
@@ -0,0 +1,6 @@
+/*     $NetBSD: bus_funcs.h,v 1.1 2011/07/19 15:07:42 dyoung Exp $     */
+
+#define __BUS_SPACE_HAS_STREAM_METHODS
+
+#include <arm/bus_funcs.h>
+
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/isa/isa_io.c
--- a/sys/arch/shark/isa/isa_io.c       Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/isa/isa_io.c       Tue Jul 19 15:07:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_io.c,v 1.10 2009/03/14 21:04:16 dsl Exp $  */
+/*     $NetBSD: isa_io.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $       */
 
 /*
  * Copyright 1997
@@ -38,11 +38,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.10 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/pio.h>
 #include <machine/isa_machdep.h>
 #include <machine/ofw.h>
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/isa/isadma_machdep.c
--- a/sys/arch/shark/isa/isadma_machdep.c       Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/isa/isadma_machdep.c       Tue Jul 19 15:07:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isadma_machdep.c,v 1.14 2009/03/18 10:22:36 cegger Exp $       */
+/*     $NetBSD: isadma_machdep.c,v 1.15 2011/07/19 15:07:43 dyoung Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.14 2009/03/18 10:22:36 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.15 2011/07/19 15:07:43 dyoung Exp $");
 
 #define ISA_DMA_STATS
 
@@ -44,7 +44,7 @@
 #include <sys/mbuf.h>
 
 #define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/ofw/chipsfb_ofbus.c
--- a/sys/arch/shark/ofw/chipsfb_ofbus.c        Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/ofw/chipsfb_ofbus.c        Tue Jul 19 15:07:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chipsfb_ofbus.c,v 1.1 2011/03/23 04:06:03 macallan Exp $ */
+/*     $NetBSD: chipsfb_ofbus.c,v 1.2 2011/07/19 15:07:43 dyoung Exp $ */
 
 /*
  * Copyright (c) 2006 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: chipsfb_ofbus.c,v 1.1 2011/03/23 04:06:03 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: chipsfb_ofbus.c,v 1.2 2011/07/19 15:07:43 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,9 +39,9 @@
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
+#include <sys/bus.h>
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/ofw.h>
 #include <machine/pmap.h>
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/ofw/com_ofisa_machdep.c
--- a/sys/arch/shark/ofw/com_ofisa_machdep.c    Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/ofw/com_ofisa_machdep.c    Tue Jul 19 15:07:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_ofisa_machdep.c,v 1.6 2009/03/14 21:04:16 dsl Exp $        */
+/*     $NetBSD: com_ofisa_machdep.c,v 1.7 2011/07/19 15:07:43 dyoung Exp $     */
 
 /*
  * Copyright 1998
@@ -34,14 +34,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ofisa_machdep.c,v 1.6 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ofisa_machdep.c,v 1.7 2011/07/19 15:07:43 dyoung Exp $");
 
 #include "opt_compat_old_ofw.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/ofw/openfirm.h>
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/ofw/if_cs_ofisa_machdep.c
--- a/sys/arch/shark/ofw/if_cs_ofisa_machdep.c  Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/ofw/if_cs_ofisa_machdep.c  Tue Jul 19 15:07:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cs_ofisa_machdep.c,v 1.8 2009/09/22 15:04:41 tsutsui Exp $  */
+/*     $NetBSD: if_cs_ofisa_machdep.c,v 1.9 2011/07/19 15:07:43 dyoung Exp $   */
 
 /*
  * Copyright 1998
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa_machdep.c,v 1.8 2009/09/22 15:04:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa_machdep.c,v 1.9 2011/07/19 15:07:43 dyoung Exp $");
 
 #include "opt_compat_old_ofw.h"
 
@@ -47,12 +47,12 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/socket.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 <dev/ofw/openfirm.h>
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/ofw/igsfb_ofbus.c
--- a/sys/arch/shark/ofw/igsfb_ofbus.c  Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/ofw/igsfb_ofbus.c  Tue Jul 19 15:07:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: igsfb_ofbus.c,v 1.11 2011/02/28 10:05:04 macallan Exp $ */
+/*     $NetBSD: igsfb_ofbus.c,v 1.12 2011/07/19 15:07:43 dyoung Exp $ */
 
 /*
  * Copyright (c) 2006 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb_ofbus.c,v 1.11 2011/02/28 10:05:04 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb_ofbus.c,v 1.12 2011/07/19 15:07:43 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,9 +39,9 @@
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
+#include <sys/bus.h>
 #include <uvm/uvm.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/ofw.h>
 #include <machine/pmap.h>
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/ofw/lpt_ofisa_machdep.c
--- a/sys/arch/shark/ofw/lpt_ofisa_machdep.c    Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/ofw/lpt_ofisa_machdep.c    Tue Jul 19 15:07:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lpt_ofisa_machdep.c,v 1.7 2009/03/14 21:04:16 dsl Exp $        */
+/*     $NetBSD: lpt_ofisa_machdep.c,v 1.8 2011/07/19 15:07:43 dyoung Exp $     */
 
 /*
  * Copyright 1998
@@ -34,14 +34,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa_machdep.c,v 1.7 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa_machdep.c,v 1.8 2011/07/19 15:07:43 dyoung Exp $");
 
 #include "opt_compat_old_ofw.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/ofw/openfirm.h>
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/ofw/ofisa_machdep.c
--- a/sys/arch/shark/ofw/ofisa_machdep.c        Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/ofw/ofisa_machdep.c        Tue Jul 19 15:07:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofisa_machdep.c,v 1.8 2009/03/14 21:04:16 dsl Exp $    */
+/*     $NetBSD: ofisa_machdep.c,v 1.9 2011/07/19 15:07:43 dyoung Exp $ */
 
 /*
  * Copyright 1998
@@ -34,14 +34,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisa_machdep.c,v 1.8 2009/03/14 21:04:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisa_machdep.c,v 1.9 2011/07/19 15:07:43 dyoung Exp $");
 
 #include "opt_compat_old_ofw.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <dev/ofw/openfirm.h>
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/ofw/ofrom.c
--- a/sys/arch/shark/ofw/ofrom.c        Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/ofw/ofrom.c        Tue Jul 19 15:07:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofrom.c,v 1.21 2011/06/12 03:35:46 rmind Exp $ */
+/*     $NetBSD: ofrom.c,v 1.22 2011/07/19 15:07:43 dyoung Exp $        */
 
 /*
  * Copyright 1998
@@ -38,17 +38,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofrom.c,v 1.21 2011/06/12 03:35:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofrom.c,v 1.22 2011/07/19 15:07:43 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
+#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
 #include <dev/ofw/openfirm.h>
 
 struct ofrom_softc {
diff -r 4a7279f8a46e -r 056776c9c7b1 sys/arch/shark/ofw/ofw.c
--- a/sys/arch/shark/ofw/ofw.c  Tue Jul 19 12:23:51 2011 +0000
+++ b/sys/arch/shark/ofw/ofw.c  Tue Jul 19 15:07:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofw.c,v 1.55 2011/03/23 04:06:03 macallan Exp $        */
+/*     $NetBSD: ofw.c,v 1.56 2011/07/19 15:07:43 dyoung Exp $  */
 
 /*