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

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

details:   https://anonhg.NetBSD.org/src/rev/e9112cf66993
branches:  trunk
changeset: 767476:e9112cf66993
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue Jul 19 15:55:26 2011 +0000

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

diffstat:

 sys/arch/amiga/amiga/busfuncs.c        |  6 +++---
 sys/arch/amiga/amiga/simple_busfuncs.c |  6 +++---
 sys/arch/amiga/dev/aster.c             |  7 +++----
 sys/arch/amiga/dev/com_supio.c         |  6 +++---
 sys/arch/amiga/dev/drsupio.c           |  7 +++----
 sys/arch/amiga/dev/gvpio.c             |  6 +++---
 sys/arch/amiga/dev/hyper.c             |  7 +++----
 sys/arch/amiga/dev/if_bah_zbus.c       |  6 +++---
 sys/arch/amiga/dev/if_ne_zbus.c        |  7 +++----
 sys/arch/amiga/dev/ioblix_zbus.c       |  7 +++----
 sys/arch/amiga/dev/isic_supio.c        |  6 +++---
 sys/arch/amiga/dev/lpt_supio.c         |  6 +++---
 sys/arch/amiga/dev/melody.c            |  7 +++----
 sys/arch/amiga/dev/repulse.c           |  7 +++----
 sys/arch/amiga/dev/toccata.c           |  7 +++----
 sys/arch/amiga/dev/wdc_amiga.c         |  6 +++---
 sys/arch/amiga/dev/wdc_buddha.c        |  4 ++--
 17 files changed, 50 insertions(+), 58 deletions(-)

diffs (truncated from 478 to 300 lines):

diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/amiga/busfuncs.c
--- a/sys/arch/amiga/amiga/busfuncs.c   Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/amiga/busfuncs.c   Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: busfuncs.c,v 1.11 2010/02/03 13:56:53 phx Exp $        */
+/*     $NetBSD: busfuncs.c,v 1.12 2011/07/19 15:55:26 dyoung Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: busfuncs.c,v 1.11 2010/02/03 13:56:53 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: busfuncs.c,v 1.12 2011/07/19 15:55:26 dyoung Exp $");
 
 /*
  * Amiga bus access methods for data widths > 1
  * XXX currently, only 16bit methods are defined
  */
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 bsr(amiga_contiguous_read_2, u_int16_t);
 bsw(amiga_contiguous_write_2, u_int16_t);
diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/amiga/simple_busfuncs.c
--- a/sys/arch/amiga/amiga/simple_busfuncs.c    Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/amiga/simple_busfuncs.c    Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: simple_busfuncs.c,v 1.6 2010/02/03 13:56:53 phx Exp $ */
+/* $NetBSD: simple_busfuncs.c,v 1.7 2011/07/19 15:55:26 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: simple_busfuncs.c,v 1.6 2010/02/03 13:56:53 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: simple_busfuncs.c,v 1.7 2011/07/19 15:55:26 dyoung Exp $");
 
 /*
  * Do NOT use this standalone.
@@ -44,7 +44,7 @@
 Error AMIGA_SIMPLE_BUS_STRIDE not defined in __FILE__, line __LINE__ .
 #endif
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #define MKN2(x,y) __CONCAT(x, y)
 #define MKN1(x,y) MKN2(x, y)
diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/dev/aster.c
--- a/sys/arch/amiga/dev/aster.c        Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/dev/aster.c        Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aster.c,v 1.21 2008/04/28 20:23:12 martin Exp $ */
+/*     $NetBSD: aster.c,v 1.22 2011/07/19 15:55:26 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998,2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aster.c,v 1.21 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aster.c,v 1.22 2011/07/19 15:55:26 dyoung Exp $");
 
 /*
  * zbus ISDN Blaster, ISDN Master driver.
@@ -42,8 +42,7 @@
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/param.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <amiga/include/cpu.h>
 
diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/dev/com_supio.c
--- a/sys/arch/amiga/dev/com_supio.c    Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/dev/com_supio.c    Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_supio.c,v 1.29 2011/01/22 17:10:20 tsutsui Exp $ */
+/*     $NetBSD: com_supio.c,v 1.30 2011/07/19 15:55:26 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_supio.c,v 1.29 2011/01/22 17:10:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_supio.c,v 1.30 2011/07/19 15:55:26 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -76,9 +76,9 @@
 #include <sys/syslog.h>
 #include <sys/types.h>
 #include <sys/device.h>
+#include <sys/bus.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
 
 /*#include <dev/isa/isavar.h>*/
 #include <dev/ic/comreg.h>
diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/dev/drsupio.c
--- a/sys/arch/amiga/dev/drsupio.c      Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/dev/drsupio.c      Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drsupio.c,v 1.19 2010/12/20 00:25:25 matt Exp $ */
+/*     $NetBSD: drsupio.c,v 1.20 2011/07/19 15:55:26 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drsupio.c,v 1.19 2010/12/20 00:25:25 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drsupio.c,v 1.20 2011/07/19 15:55:26 dyoung Exp $");
 
 /*
  * DraCo multi-io chip bus space stuff
@@ -42,8 +42,7 @@
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/param.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <amiga/include/cpu.h>
 
diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/dev/gvpio.c
--- a/sys/arch/amiga/dev/gvpio.c        Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/dev/gvpio.c        Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gvpio.c,v 1.18 2010/02/02 19:03:31 phx Exp $ */
+/*     $NetBSD: gvpio.c,v 1.19 2011/07/19 15:55:26 dyoung Exp $ */
 
 /*
  * Copyright (c) 1997 Ignatios Souvatzis
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.18 2010/02/02 19:03:31 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.19 2011/07/19 15:55:26 dyoung Exp $");
 
 /*
  * GVP I/O Extender
@@ -38,8 +38,8 @@
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/param.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/intr.h>
 
 #include <amiga/include/cpu.h>
diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/dev/hyper.c
--- a/sys/arch/amiga/dev/hyper.c        Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/dev/hyper.c        Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hyper.c,v 1.20 2010/02/02 19:03:31 phx Exp $ */
+/*     $NetBSD: hyper.c,v 1.21 2011/07/19 15:55:27 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hyper.c,v 1.20 2010/02/02 19:03:31 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyper.c,v 1.21 2011/07/19 15:55:27 dyoung Exp $");
 
 /*
  * zbus HyperCom driver
@@ -42,8 +42,7 @@
 #include <sys/conf.h>
 #include <sys/systm.h>
 #include <sys/param.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <amiga/include/cpu.h>
 
diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/dev/if_bah_zbus.c
--- a/sys/arch/amiga/dev/if_bah_zbus.c  Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/dev/if_bah_zbus.c  Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bah_zbus.c,v 1.13 2010/10/18 22:02:25 phx Exp $ */
+/*     $NetBSD: if_bah_zbus.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.13 2010/10/18 22:02:25 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $");
 
 /*
  * Driver frontend for the Commodore Busines Machines and the
@@ -50,8 +50,8 @@
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/bus.h>
 
-#include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
 
diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/dev/if_ne_zbus.c
--- a/sys/arch/amiga/dev/if_ne_zbus.c   Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/dev/if_ne_zbus.c   Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ne_zbus.c,v 1.13 2008/04/28 20:23:12 martin Exp $ */
+/*     $NetBSD: if_ne_zbus.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_zbus.c,v 1.13 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_zbus.c,v 1.14 2011/07/19 15:55:27 dyoung Exp $");
 
 /*
  * Thanks to Village Tronic for giving me a card.
@@ -44,13 +44,12 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
 
-#include <machine/bus.h>
-
 #include <dev/ic/dp8390reg.h>
 #include <dev/ic/dp8390var.h>
 
diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/dev/ioblix_zbus.c
--- a/sys/arch/amiga/dev/ioblix_zbus.c  Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/dev/ioblix_zbus.c  Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ioblix_zbus.c,v 1.17 2010/07/21 01:33:59 jklos Exp $ */
+/*     $NetBSD: ioblix_zbus.c,v 1.18 2011/07/19 15:55:27 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioblix_zbus.c,v 1.17 2010/07/21 01:33:59 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioblix_zbus.c,v 1.18 2011/07/19 15:55:27 dyoung Exp $");
 
 /* IOBlix Zorro driver */
 /* XXX to be done: we need to probe the com clock speed! */
@@ -41,8 +41,7 @@
 #include <sys/conf.h>
 #include <sys/systm.h>
 #include <sys/param.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <amiga/include/cpu.h>
 
diff -r 95e215a4d43a -r e9112cf66993 sys/arch/amiga/dev/isic_supio.c
--- a/sys/arch/amiga/dev/isic_supio.c   Tue Jul 19 15:52:29 2011 +0000
+++ b/sys/arch/amiga/dev/isic_supio.c   Tue Jul 19 15:55:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isic_supio.c,v 1.17 2009/05/19 18:39:26 phx Exp $ */
+/*     $NetBSD: isic_supio.c,v 1.18 2011/07/19 15:55:27 dyoung Exp $ */
 
 /*
  *   Copyright (c) 1998,2001 Ignatios Souvatzis. All rights reserved.
@@ -47,7 +47,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_supio.c,v 1.17 2009/05/19 18:39:26 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_supio.c,v 1.18 2011/07/19 15:55:27 dyoung Exp $");
 
 #include <sys/types.h>