Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch #include <sys/bus.h> instead of <machine/bus.h>.
details: https://anonhg.NetBSD.org/src/rev/4c887e10a62e
branches: trunk
changeset: 766770:4c887e10a62e
user: dyoung <dyoung%NetBSD.org@localhost>
date: Fri Jul 01 18:21:31 2011 +0000
description:
#include <sys/bus.h> instead of <machine/bus.h>.
diffstat:
sys/arch/algor/algor/algor_p4032_dma.c | 6 +++---
sys/arch/algor/algor/algor_p4032_intr.c | 6 +++---
sys/arch/algor/algor/algor_p4032var.h | 4 ++--
sys/arch/algor/algor/algor_p5064_dma.c | 6 +++---
sys/arch/algor/algor/algor_p5064_intr.c | 6 +++---
sys/arch/algor/algor/algor_p5064var.h | 4 ++--
sys/arch/algor/algor/algor_p6032_dma.c | 6 +++---
sys/arch/algor/algor/algor_p6032_intr.c | 6 +++---
sys/arch/algor/algor/algor_p6032var.h | 4 ++--
sys/arch/algor/algor/autoconf.c | 6 +++---
sys/arch/algor/algor/bus_dma.c | 6 +++---
sys/arch/algor/algor/machdep.c | 6 +++---
sys/arch/algor/dev/bonito_mainbus.c | 6 +++---
sys/arch/algor/dev/com_mainbus.c | 6 +++---
sys/arch/algor/dev/lpt_mainbus.c | 6 +++---
sys/arch/algor/dev/mainbus.c | 6 +++---
sys/arch/algor/dev/mcclock_mainbus.c | 6 +++---
sys/arch/algor/dev/vtpbc_mainbus.c | 6 +++---
sys/arch/x86/acpi/acpi_machdep.c | 6 +++---
sys/arch/x86/acpi/acpi_wakeup.c | 6 +++---
sys/arch/x86/include/isa_machdep.h | 4 ++--
sys/arch/x86/include/mpconfig.h | 4 ++--
sys/arch/x86/pci/agp_machdep.c | 6 +++---
sys/arch/x86/pci/amdpcib_hpet.c | 6 +++---
sys/arch/x86/pci/fwhrng.c | 6 +++---
sys/arch/x86/pci/ichlpcib.c | 6 +++---
sys/arch/x86/pci/ichlpcib_hpet.c | 7 +++----
sys/arch/x86/pci/pchb.c | 6 +++---
sys/arch/x86/pci/pci_addr_fixup.c | 6 +++---
sys/arch/x86/pci/pci_bus_fixup.c | 6 +++---
sys/arch/x86/pci/pcib.c | 6 +++---
sys/arch/x86/pci/rdcpcib.c | 6 +++---
sys/arch/x86/x86/bus_dma.c | 6 +++---
sys/arch/x86/x86/consinit.c | 6 +++---
sys/arch/x86/x86/genfb_machdep.c | 6 +++---
sys/arch/x86/x86/mp.c | 6 +++---
sys/arch/x86/x86/mpacpi.c | 6 +++---
37 files changed, 106 insertions(+), 107 deletions(-)
diffs (truncated from 933 to 300 lines):
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/algor_p4032_dma.c
--- a/sys/arch/algor/algor/algor_p4032_dma.c Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p4032_dma.c Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032_dma.c,v 1.6 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: algor_p4032_dma.c,v 1.7 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p4032_dma.c,v 1.6 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p4032_dma.c,v 1.7 2011/07/01 18:30:36 dyoung Exp $");
#include <sys/param.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <algor/algor/algor_p4032reg.h>
#include <algor/algor/algor_p4032var.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/algor_p4032_intr.c
--- a/sys/arch/algor/algor/algor_p4032_intr.c Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p4032_intr.c Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $ */
+/* $NetBSD: algor_p4032_intr.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -51,7 +51,7 @@
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/algor_p4032var.h
--- a/sys/arch/algor/algor/algor_p4032var.h Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p4032var.h Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032var.h,v 1.6 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: algor_p4032var.h,v 1.7 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
struct p4032_config {
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/algor_p5064_dma.c
--- a/sys/arch/algor/algor/algor_p5064_dma.c Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p5064_dma.c Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p5064_dma.c,v 1.4 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: algor_p5064_dma.c,v 1.5 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p5064_dma.c,v 1.4 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p5064_dma.c,v 1.5 2011/07/01 18:30:36 dyoung Exp $");
#include <sys/param.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <algor/algor/algor_p5064reg.h>
#include <algor/algor/algor_p5064var.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/algor_p5064_intr.c
--- a/sys/arch/algor/algor/algor_p5064_intr.c Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p5064_intr.c Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p5064_intr.c,v 1.25 2011/04/06 01:25:18 dyoung Exp $ */
+/* $NetBSD: algor_p5064_intr.c,v 1.26 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.25 2011/04/06 01:25:18 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.26 2011/07/01 18:30:36 dyoung Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -51,7 +51,7 @@
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/algor_p5064var.h
--- a/sys/arch/algor/algor/algor_p5064var.h Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p5064var.h Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p5064var.h,v 1.7 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: algor_p5064var.h,v 1.8 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/isa/isavar.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/algor_p6032_dma.c
--- a/sys/arch/algor/algor/algor_p6032_dma.c Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p6032_dma.c Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032_dma.c,v 1.5 2009/10/26 00:59:39 snj Exp $ */
+/* $NetBSD: algor_p6032_dma.c,v 1.6 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_dma.c,v 1.5 2009/10/26 00:59:39 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_dma.c,v 1.6 2011/07/01 18:30:36 dyoung Exp $");
#include <sys/param.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <algor/algor/algor_p6032reg.h>
#include <algor/algor/algor_p6032var.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/algor_p6032_intr.c
--- a/sys/arch/algor/algor/algor_p6032_intr.c Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p6032_intr.c Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032_intr.c,v 1.19 2011/04/07 04:01:40 dyoung Exp $ */
+/* $NetBSD: algor_p6032_intr.c,v 1.20 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.19 2011/04/07 04:01:40 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.20 2011/07/01 18:30:36 dyoung Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -50,7 +50,7 @@
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/algor_p6032var.h
--- a/sys/arch/algor/algor/algor_p6032var.h Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/algor_p6032var.h Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032var.h,v 1.3 2011/03/05 14:04:02 matt Exp $ */
+/* $NetBSD: algor_p6032var.h,v 1.4 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/isa/isavar.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/autoconf.c
--- a/sys/arch/algor/algor/autoconf.c Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/autoconf.c Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.18 2010/01/22 08:56:04 martin Exp $ */
+/* $NetBSD: autoconf.c,v 1.19 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2010/01/22 08:56:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2011/07/01 18:30:36 dyoung Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -47,7 +47,7 @@
#include <net/if.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/bus_dma.c
--- a/sys/arch/algor/algor/bus_dma.c Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/bus_dma.c Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.22 2009/12/14 00:45:59 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22 2009/12/14 00:45:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@
#include <mips/cache.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/locore.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/algor/machdep.c
--- a/sys/arch/algor/algor/machdep.c Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/algor/machdep.c Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.49 2011/02/20 07:51:21 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.50 2011/07/01 18:30:36 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2011/02/20 07:51:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/07/01 18:30:36 dyoung Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -107,7 +107,7 @@
#include <ddb/db_extern.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/pmon.h>
#include <machine/pcb.h>
diff -r e22079747357 -r 4c887e10a62e sys/arch/algor/dev/bonito_mainbus.c
--- a/sys/arch/algor/dev/bonito_mainbus.c Fri Jul 01 18:11:24 2011 +0000
+++ b/sys/arch/algor/dev/bonito_mainbus.c Fri Jul 01 18:21:31 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bonito_mainbus.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $ */
+/* $NetBSD: bonito_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
Home |
Main Index |
Thread Index |
Old Index