Module Name: src
Committed By: dyoung
Date: Fri Jul 1 20:34:06 UTC 2011
Modified Files:
src/sys/arch/atari/atari: be_bus.c bus.c le_bus.c mainbus.c
src/sys/arch/atari/dev: hdfd.c wdc_mb.c
src/sys/arch/atari/isa: fdcisa.c isa_dma.c isa_machdep.c
isapnp_machdep.c
src/sys/arch/atari/pci: pci_hades.c pci_machdep.c
src/sys/arch/atari/vme: if_le_vme.c leo.c vme_machdep.c vmevar.h
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/atari/atari/be_bus.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/atari/atari/bus.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/atari/atari/le_bus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/atari/atari/mainbus.c
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/atari/dev/wdc_mb.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/atari/isa/fdcisa.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/atari/isa/isa_dma.c \
src/sys/arch/atari/isa/isapnp_machdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/atari/isa/isa_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/atari/pci/pci_hades.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/atari/pci/pci_machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/atari/vme/if_le_vme.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/atari/vme/leo.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/atari/vme/vme_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/atari/vme/vmevar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/atari/be_bus.c
diff -u src/sys/arch/atari/atari/be_bus.c:1.14 src/sys/arch/atari/atari/be_bus.c:1.15
--- src/sys/arch/atari/atari/be_bus.c:1.14 Wed Mar 31 13:15:52 2010
+++ src/sys/arch/atari/atari/be_bus.c Fri Jul 1 20:34:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: be_bus.c,v 1.14 2010/03/31 13:15:52 tsutsui Exp $ */
+/* $NetBSD: be_bus.c,v 1.15 2011/07/01 20:34:05 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.14 2010/03/31 13:15:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.15 2011/07/01 20:34:05 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* This file contains the common functions for using a big endian (linear)
Index: src/sys/arch/atari/atari/bus.c
diff -u src/sys/arch/atari/atari/bus.c:1.55 src/sys/arch/atari/atari/bus.c:1.56
--- src/sys/arch/atari/atari/bus.c:1.55 Sat Nov 6 11:46:00 2010
+++ src/sys/arch/atari/atari/bus.c Fri Jul 1 20:34:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.55 2010/11/06 11:46:00 uebayasi Exp $ */
+/* $NetBSD: bus.c,v 1.56 2011/07/01 20:34:05 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.55 2010/11/06 11:46:00 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.56 2011/07/01 20:34:05 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@
#include <machine/cpu.h>
#include <m68k/cacheops.h>
#define _ATARI_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
int bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
Index: src/sys/arch/atari/atari/le_bus.c
diff -u src/sys/arch/atari/atari/le_bus.c:1.17 src/sys/arch/atari/atari/le_bus.c:1.18
--- src/sys/arch/atari/atari/le_bus.c:1.17 Wed Mar 18 16:00:10 2009
+++ src/sys/arch/atari/atari/le_bus.c Fri Jul 1 20:34:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: le_bus.c,v 1.17 2009/03/18 16:00:10 cegger Exp $ */
+/* $NetBSD: le_bus.c,v 1.18 2011/07/01 20:34:05 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.17 2009/03/18 16:00:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.18 2011/07/01 20:34:05 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -38,7 +38,7 @@
#include <sys/malloc.h>
#include <sys/bswap.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* This file contains the common functions for using a litte endian (linear)
Index: src/sys/arch/atari/atari/mainbus.c
diff -u src/sys/arch/atari/atari/mainbus.c:1.10 src/sys/arch/atari/atari/mainbus.c:1.11
--- src/sys/arch/atari/atari/mainbus.c:1.10 Sun Mar 8 05:25:31 2009
+++ src/sys/arch/atari/atari/mainbus.c Fri Jul 1 20:34:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.10 2009/03/08 05:25:31 tsutsui Exp $ */
+/* $NetBSD: mainbus.c,v 1.11 2011/07/01 20:34:05 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2009/03/08 05:25:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2011/07/01 20:34:05 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
static int mb_bus_space_peek_1(bus_space_tag_t,
bus_space_handle_t, bus_size_t);
Index: src/sys/arch/atari/dev/hdfd.c
diff -u src/sys/arch/atari/dev/hdfd.c:1.74 src/sys/arch/atari/dev/hdfd.c:1.75
--- src/sys/arch/atari/dev/hdfd.c:1.74 Fri Jun 10 09:27:51 2011
+++ src/sys/arch/atari/dev/hdfd.c Fri Jul 1 20:34:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.74 2011/06/10 09:27:51 tsutsui Exp $ */
+/* $NetBSD: hdfd.c,v 1.75 2011/07/01 20:34:05 dyoung Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.74 2011/06/10 09:27:51 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.75 2011/07/01 20:34:05 dyoung Exp $");
#include "opt_ddb.h"
@@ -117,7 +117,7 @@
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomap.h>
#include <machine/mfp.h>
#include <machine/intr.h>
Index: src/sys/arch/atari/dev/wdc_mb.c
diff -u src/sys/arch/atari/dev/wdc_mb.c:1.34 src/sys/arch/atari/dev/wdc_mb.c:1.35
--- src/sys/arch/atari/dev/wdc_mb.c:1.34 Sun Mar 8 05:25:31 2009
+++ src/sys/arch/atari/dev/wdc_mb.c Fri Jul 1 20:34:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_mb.c,v 1.34 2009/03/08 05:25:31 tsutsui Exp $ */
+/* $NetBSD: wdc_mb.c,v 1.35 2011/07/01 20:34:05 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.34 2009/03/08 05:25:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.35 2011/07/01 20:34:05 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -40,7 +40,7 @@
#include <sys/bswap.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomap.h>
#include <machine/mfp.h>
#include <machine/dma.h>
Index: src/sys/arch/atari/isa/fdcisa.c
diff -u src/sys/arch/atari/isa/fdcisa.c:1.13 src/sys/arch/atari/isa/fdcisa.c:1.14
--- src/sys/arch/atari/isa/fdcisa.c:1.13 Mon Apr 28 20:23:15 2008
+++ src/sys/arch/atari/isa/fdcisa.c Fri Jul 1 20:34:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fdcisa.c,v 1.13 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: fdcisa.c,v 1.14 2011/07/01 20:34:06 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,14 +64,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdcisa.c,v 1.13 2008/04/28 20:23:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdcisa.c,v 1.14 2011/07/01 20:34:06 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/callout.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: src/sys/arch/atari/isa/isa_dma.c
diff -u src/sys/arch/atari/isa/isa_dma.c:1.9 src/sys/arch/atari/isa/isa_dma.c:1.10
--- src/sys/arch/atari/isa/isa_dma.c:1.9 Sat Mar 14 21:04:06 2009
+++ src/sys/arch/atari/isa/isa_dma.c Fri Jul 1 20:34:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_dma.c,v 1.9 2009/03/14 21:04:06 dsl Exp $ */
+/* $NetBSD: isa_dma.c,v 1.10 2011/07/01 20:34:06 dyoung Exp $ */
#define ISA_DMA_STATS
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v 1.9 2009/03/14 21:04:06 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v 1.10 2011/07/01 20:34:06 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@
#include <sys/mbuf.h>
#define _ATARI_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/atari/isa/isapnp_machdep.c
diff -u src/sys/arch/atari/isa/isapnp_machdep.c:1.9 src/sys/arch/atari/isa/isapnp_machdep.c:1.10
--- src/sys/arch/atari/isa/isapnp_machdep.c:1.9 Wed Oct 21 21:57:39 2009
+++ src/sys/arch/atari/isa/isapnp_machdep.c Fri Jul 1 20:34:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp_machdep.c,v 1.9 2009/10/21 21:57:39 snj Exp $ */
+/* $NetBSD: isapnp_machdep.c,v 1.10 2011/07/01 20:34:06 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -74,14 +74,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.9 2009/10/21 21:57:39 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.10 2011/07/01 20:34:06 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/atari/isa/isa_machdep.c
diff -u src/sys/arch/atari/isa/isa_machdep.c:1.38 src/sys/arch/atari/isa/isa_machdep.c:1.39
--- src/sys/arch/atari/isa/isa_machdep.c:1.38 Fri Jun 10 09:27:51 2011
+++ src/sys/arch/atari/isa/isa_machdep.c Fri Jul 1 20:34:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.38 2011/06/10 09:27:51 tsutsui Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.39 2011/07/01 20:34:06 dyoung Exp $ */
/*
* Copyright (c) 1997 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.38 2011/06/10 09:27:51 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.39 2011/07/01 20:34:06 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -40,7 +40,7 @@
#include <sys/device.h>
#define _ATARI_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isareg.h>
Index: src/sys/arch/atari/pci/pci_hades.c
diff -u src/sys/arch/atari/pci/pci_hades.c:1.11 src/sys/arch/atari/pci/pci_hades.c:1.12
--- src/sys/arch/atari/pci/pci_hades.c:1.11 Mon Mar 16 23:11:10 2009
+++ src/sys/arch/atari/pci/pci_hades.c Fri Jul 1 20:34:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_hades.c,v 1.11 2009/03/16 23:11:10 dsl Exp $ */
+/* $NetBSD: pci_hades.c,v 1.12 2011/07/01 20:34:06 dyoung Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_hades.c,v 1.11 2009/03/16 23:11:10 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_hades.c,v 1.12 2011/07/01 20:34:06 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -41,7 +41,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/atari/pci/pci_machdep.c
diff -u src/sys/arch/atari/pci/pci_machdep.c:1.51 src/sys/arch/atari/pci/pci_machdep.c:1.52
--- src/sys/arch/atari/pci/pci_machdep.c:1.51 Sun Jun 5 06:31:41 2011
+++ src/sys/arch/atari/pci/pci_machdep.c Fri Jul 1 20:34:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.51 2011/06/05 06:31:41 tsutsui Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.52 2011/07/01 20:34:06 dyoung Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.51 2011/06/05 06:31:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.52 2011/07/01 20:34:06 dyoung Exp $");
#include "opt_mbtype.h"
@@ -45,7 +45,7 @@
#include <sys/malloc.h>
#define _ATARI_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/atari/vme/if_le_vme.c
diff -u src/sys/arch/atari/vme/if_le_vme.c:1.30 src/sys/arch/atari/vme/if_le_vme.c:1.31
--- src/sys/arch/atari/vme/if_le_vme.c:1.30 Tue Apr 13 11:31:11 2010
+++ src/sys/arch/atari/vme/if_le_vme.c Fri Jul 1 20:34:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_vme.c,v 1.30 2010/04/13 11:31:11 tsutsui Exp $ */
+/* $NetBSD: if_le_vme.c,v 1.31 2011/07/01 20:34:06 dyoung Exp $ */
/*-
* Copyright (c) 1998 maximum entropy. All rights reserved.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_vme.c,v 1.30 2010/04/13 11:31:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_vme.c,v 1.31 2011/07/01 20:34:06 dyoung Exp $");
#include "opt_inet.h"
@@ -95,7 +95,7 @@
#endif
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomap.h>
#include <machine/scu.h>
#include <machine/intr.h>
Index: src/sys/arch/atari/vme/leo.c
diff -u src/sys/arch/atari/vme/leo.c:1.18 src/sys/arch/atari/vme/leo.c:1.19
--- src/sys/arch/atari/vme/leo.c:1.18 Fri Jun 10 09:29:07 2011
+++ src/sys/arch/atari/vme/leo.c Fri Jul 1 20:34:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: leo.c,v 1.18 2011/06/10 09:29:07 tsutsui Exp $ */
+/* $NetBSD: leo.c,v 1.19 2011/07/01 20:34:06 dyoung Exp $ */
/*-
* Copyright (c) 1997 maximum entropy <entr...@zippy.bernstein.com>
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.18 2011/06/10 09:29:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.19 2011/07/01 20:34:06 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomap.h>
#include <machine/scu.h>
#include <atari/vme/vmevar.h>
Index: src/sys/arch/atari/vme/vme_machdep.c
diff -u src/sys/arch/atari/vme/vme_machdep.c:1.20 src/sys/arch/atari/vme/vme_machdep.c:1.21
--- src/sys/arch/atari/vme/vme_machdep.c:1.20 Sun Jun 5 06:31:42 2011
+++ src/sys/arch/atari/vme/vme_machdep.c Fri Jul 1 20:34:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_machdep.c,v 1.20 2011/06/05 06:31:42 tsutsui Exp $ */
+/* $NetBSD: vme_machdep.c,v 1.21 2011/07/01 20:34:06 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.20 2011/06/05 06:31:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.21 2011/07/01 20:34:06 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -38,7 +38,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/iomap.h>
#include <machine/mfp.h>
Index: src/sys/arch/atari/vme/vmevar.h
diff -u src/sys/arch/atari/vme/vmevar.h:1.7 src/sys/arch/atari/vme/vmevar.h:1.8
--- src/sys/arch/atari/vme/vmevar.h:1.7 Sun Jun 5 06:33:43 2011
+++ src/sys/arch/atari/vme/vmevar.h Fri Jul 1 20:34:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vmevar.h,v 1.7 2011/06/05 06:33:43 tsutsui Exp $ */
+/* $NetBSD: vmevar.h,v 1.8 2011/07/01 20:34:06 dyoung Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
* Definitions for VME autoconfiguration.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Structures and definitions needed by the machine-dependent header.
