Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys #include <sys/bus.h> instead of <machine/bus.h>.



details:   https://anonhg.NetBSD.org/src/rev/3b4a3325e52c
branches:  trunk
changeset: 766771:3b4a3325e52c
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Jul 01 18:31:32 2011 +0000

description:
#include <sys/bus.h> instead of <machine/bus.h>.

diffstat:

 sys/arch/algor/isa/isadma_bounce.c           |  6 +++---
 sys/arch/algor/isa/mcclock_isa.c             |  6 +++---
 sys/arch/algor/pci/pcib.c                    |  6 +++---
 sys/arch/algor/pci/vtpbc.c                   |  6 +++---
 sys/arch/hp700/dev/asp.c                     |  6 +++---
 sys/arch/hp700/dev/com_dino.c                |  2 +-
 sys/arch/hp700/dev/com_ssio.c                |  4 ++--
 sys/arch/hp700/dev/gecko.c                   |  2 +-
 sys/arch/hp700/dev/lasi.c                    |  6 +++---
 sys/arch/hp700/dev/lcd.c                     |  4 ++--
 sys/arch/hp700/dev/lpt_ssio.c                |  2 +-
 sys/arch/hp700/dev/mongoose.c                |  6 +++---
 sys/arch/hp700/dev/siop_sgc.c                |  6 +++---
 sys/arch/hp700/dev/ssio.c                    |  4 ++--
 sys/arch/hp700/dev/sti_sgc.c                 |  6 +++---
 sys/arch/hp700/dev/uturn.c                   |  4 ++--
 sys/arch/hp700/gsc/com_gsc.c                 |  6 +++---
 sys/arch/hp700/gsc/fdc_gsc.c                 |  6 +++---
 sys/arch/hp700/gsc/gsckbc.c                  |  6 +++---
 sys/arch/hp700/gsc/harmony.c                 |  4 ++--
 sys/arch/hp700/gsc/if_ie_gsc.c               |  6 +++---
 sys/arch/hp700/gsc/if_iee_gsc.c              |  6 +++---
 sys/arch/hp700/gsc/lpt_gsc.c                 |  6 +++---
 sys/arch/hp700/gsc/oosiop_gsc.c              |  6 +++---
 sys/arch/hp700/gsc/osiop_gsc.c               |  6 +++---
 sys/arch/hp700/gsc/siop_gsc.c                |  6 +++---
 sys/arch/mips/adm5120/adm5120_cfio.c         |  6 +++---
 sys/arch/mips/adm5120/adm5120_extio.c        |  6 +++---
 sys/arch/mips/adm5120/adm5120_extio_space.c  |  6 +++---
 sys/arch/mips/adm5120/adm5120_intr.c         |  6 +++---
 sys/arch/mips/adm5120/adm5120_obio.c         |  6 +++---
 sys/arch/mips/adm5120/adm5120_obio_dma.c     |  6 +++---
 sys/arch/mips/adm5120/adm5120_obio_space.c   |  6 +++---
 sys/arch/mips/adm5120/adm5120_pciio_space.c  |  6 +++---
 sys/arch/mips/adm5120/adm5120_pcimem_space.c |  6 +++---
 sys/arch/mips/adm5120/dev/admgpio.c          |  6 +++---
 sys/arch/mips/adm5120/dev/admpci.c           |  6 +++---
 sys/arch/mips/adm5120/dev/admwdog.c          |  6 +++---
 sys/arch/mips/adm5120/dev/ahci.c             |  6 +++---
 sys/arch/mips/adm5120/dev/if_admsw.c         |  6 +++---
 sys/arch/mips/adm5120/dev/if_admswvar.h      |  6 +++---
 sys/arch/mips/adm5120/dev/uart.c             |  6 +++---
 sys/arch/mips/adm5120/dev/wdc_extio.c        |  6 +++---
 sys/arch/mips/adm5120/include/adm5120var.h   |  4 ++--
 sys/arch/mips/alchemy/au1000.c               |  4 ++--
 sys/arch/mips/alchemy/au1100.c               |  6 +++---
 sys/arch/mips/alchemy/au1500.c               |  6 +++---
 sys/arch/mips/alchemy/au1550.c               |  6 +++---
 sys/arch/mips/alchemy/au_chipdep.c           |  6 +++---
 sys/arch/mips/alchemy/au_cpureg_mem.c        |  6 +++---
 sys/arch/mips/alchemy/au_himem_space.c       |  6 +++---
 sys/arch/mips/alchemy/au_icu.c               |  6 +++---
 sys/arch/mips/alchemy/au_timer.c             |  6 +++---
 sys/arch/mips/alchemy/au_wired_space.c       |  6 +++---
 sys/arch/mips/alchemy/aubus.c                |  6 +++---
 sys/arch/mips/alchemy/dev/augpio.c           |  6 +++---
 sys/arch/mips/alchemy/dev/aupci.c            |  6 +++---
 sys/arch/mips/alchemy/dev/aupsc.c            |  6 +++---
 sys/arch/mips/alchemy/dev/aurtc.c            |  6 +++---
 sys/arch/mips/alchemy/dev/ausmbus_psc.c      |  6 +++---
 sys/arch/mips/alchemy/dev/auspi.c            |  6 +++---
 sys/arch/mips/alchemy/dev/com_aubus.c        |  6 +++---
 sys/arch/mips/alchemy/dev/if_aumac.c         |  6 +++---
 sys/arch/mips/alchemy/dev/ohci_aubus.c       |  6 +++---
 sys/arch/mips/alchemy/include/aubusvar.h     |  4 ++--
 sys/arch/mips/atheros/ar5312_board.c         |  6 +++---
 sys/arch/mips/atheros/ar5312_intr.c          |  6 +++---
 sys/arch/mips/atheros/ar5315_intr.c          |  6 +++---
 sys/arch/mips/atheros/arbus.c                |  6 +++---
 sys/arch/mips/atheros/dev/argpio.c           |  6 +++---
 sys/arch/mips/atheros/dev/arspi.c            |  6 +++---
 sys/arch/mips/atheros/dev/athflash.c         |  6 +++---
 sys/arch/mips/atheros/dev/com_arbus.c        |  6 +++---
 sys/arch/mips/atheros/dev/if_ae.c            |  6 +++---
 sys/arch/mips/atheros/dev/if_ath_arbus.c     |  6 +++---
 sys/arch/mips/atheros/include/ar531xvar.h    |  4 ++--
 sys/arch/mips/atheros/include/arbusvar.h     |  4 ++--
 sys/arch/xen/i386/npx_hv.c                   |  6 +++---
 sys/arch/xen/x86/consinit.c                  |  6 +++---
 sys/arch/xen/x86/mainbus.c                   |  6 +++---
 sys/arch/xen/x86/xen_bus_dma.c               |  6 +++---
 sys/arch/xen/xen/isa_machdep.c               |  6 +++---
 sys/arch/xen/xen/pci_intr_machdep.c          |  6 +++---
 sys/external/bsd/drm/dist/bsd-core/drmP.h    |  2 +-
 84 files changed, 234 insertions(+), 234 deletions(-)

diffs (truncated from 2047 to 300 lines):

diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/algor/isa/isadma_bounce.c
--- a/sys/arch/algor/isa/isadma_bounce.c        Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/algor/isa/isadma_bounce.c        Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isadma_bounce.c,v 1.9 2011/02/20 07:51:22 matt Exp $   */
+/*     $NetBSD: isadma_bounce.c,v 1.10 2011/07/01 18:31:32 dyoung Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.9 2011/02/20 07:51:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.10 2011/07/01 18:31:32 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,7 +44,7 @@
 #include <mips/cache.h>
 
 #define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 
 #include <dev/isa/isareg.h>
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/algor/isa/mcclock_isa.c
--- a/sys/arch/algor/isa/mcclock_isa.c  Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/algor/isa/mcclock_isa.c  Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mcclock_isa.c,v 1.12 2008/03/29 05:42:45 tsutsui Exp $ */
+/*     $NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:31:32 dyoung Exp $  */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,14 +29,14 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.12 2008/03/29 05:42:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.13 2011/07/01 18:31:32 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/clock_subr.h>
 #include <dev/ic/mc146818reg.h>
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/algor/pci/pcib.c
--- a/sys/arch/algor/pci/pcib.c Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/algor/pci/pcib.c Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $ */
+/*     $NetBSD: pcib.c,v 1.22 2011/07/01 18:31:32 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.22 2011/07/01 18:31:32 dyoung Exp $");
 
 #include "opt_algor_p5064.h" 
 #include "opt_algor_p6032.h"
@@ -43,7 +43,7 @@
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/algor/pci/vtpbc.c
--- a/sys/arch/algor/pci/vtpbc.c        Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/algor/pci/vtpbc.c        Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vtpbc.c,v 1.7 2008/04/28 20:23:10 martin Exp $ */
+/*     $NetBSD: vtpbc.c,v 1.8 2011/07/01 18:31:32 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,13 +37,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vtpbc.c,v 1.7 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vtpbc.c,v 1.8 2011/07/01 18:31:32 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/locore.h>
 
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/hp700/dev/asp.c
--- a/sys/arch/hp700/dev/asp.c  Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/hp700/dev/asp.c  Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asp.c,v 1.18 2011/02/01 18:33:24 skrll Exp $   */
+/*     $NetBSD: asp.c,v 1.19 2011/07/01 18:33:09 dyoung Exp $  */
 
 /*     $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $  */
 
@@ -37,14 +37,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.18 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.19 2011/07/01 18:33:09 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 #include <machine/cpufunc.h>
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/hp700/dev/com_dino.c
--- a/sys/arch/hp700/dev/com_dino.c     Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/hp700/dev/com_dino.c     Fri Jul 01 18:31:32 2011 +0000
@@ -31,7 +31,7 @@
 #include <sys/device.h>
 #include <sys/tty.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/hp700/dev/com_ssio.c
--- a/sys/arch/hp700/dev/com_ssio.c     Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/hp700/dev/com_ssio.c     Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_ssio.c,v 1.2 2010/03/05 18:41:29 skrll Exp $       */
+/*     $NetBSD: com_ssio.c,v 1.3 2011/07/01 18:33:09 dyoung Exp $      */
 
 /*     $OpenBSD: com_ssio.c,v 1.2 2007/06/24 16:28:39 kettenis Exp $   */
 
@@ -23,7 +23,7 @@
 #include <sys/device.h>
 #include <sys/tty.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 
 #include <dev/ic/comreg.h>
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/hp700/dev/gecko.c
--- a/sys/arch/hp700/dev/gecko.c        Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/hp700/dev/gecko.c        Fri Jul 01 18:31:32 2011 +0000
@@ -22,7 +22,7 @@
 #include <sys/systm.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/iomod.h>
 #include <machine/pdc.h>
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/hp700/dev/lasi.c
--- a/sys/arch/hp700/dev/lasi.c Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/hp700/dev/lasi.c Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $  */
+/*     $NetBSD: lasi.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $ */
 
 /*     $OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.20 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.21 2011/07/01 18:33:09 dyoung Exp $");
 
 #undef LASIDEBUG
 
@@ -38,7 +38,7 @@
 #include <sys/device.h>
 #include <sys/reboot.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/hp700/dev/lcd.c
--- a/sys/arch/hp700/dev/lcd.c  Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/hp700/dev/lcd.c  Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lcd.c,v 1.4 2011/01/04 10:42:33 skrll Exp $    */
+/*     $NetBSD: lcd.c,v 1.5 2011/07/01 18:33:09 dyoung Exp $   */
 /*     OpenBSD: lcd.c,v 1.2 2007/07/20 22:13:45 kettenis Exp   */
 
 /*
@@ -24,7 +24,7 @@
 #include <sys/callout.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/cpu.h>
 #include <machine/pdc.h>
 
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/hp700/dev/lpt_ssio.c
--- a/sys/arch/hp700/dev/lpt_ssio.c     Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/hp700/dev/lpt_ssio.c     Fri Jul 01 18:31:32 2011 +0000
@@ -20,7 +20,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/ic/lptreg.h>
 #include <dev/ic/lptvar.h>
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/hp700/dev/mongoose.c
--- a/sys/arch/hp700/dev/mongoose.c     Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/hp700/dev/mongoose.c     Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mongoose.c,v 1.21 2011/02/01 18:33:24 skrll Exp $      */
+/*     $NetBSD: mongoose.c,v 1.22 2011/07/01 18:33:09 dyoung Exp $     */
 
 /*     $OpenBSD: mongoose.c,v 1.19 2010/01/01 20:28:42 kettenis Exp $  */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.21 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mongoose.c,v 1.22 2011/07/01 18:33:09 dyoung Exp $");
 
 #define MONGOOSE_DEBUG 9
 
@@ -38,7 +38,7 @@
 #include <sys/device.h>
 #include <sys/reboot.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/hp700/dev/siop_sgc.c
--- a/sys/arch/hp700/dev/siop_sgc.c     Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/hp700/dev/siop_sgc.c     Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siop_sgc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $       */
+/*     $NetBSD: siop_sgc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $      */
 
 /*     $OpenBSD: siop_sgc.c,v 1.1 2007/08/05 19:09:52 kettenis Exp $   */
 
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.7 2011/02/01 18:33:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v 1.8 2011/07/01 18:33:09 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -28,7 +28,7 @@
 #include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>
 
 #include <dev/scsipi/scsi_all.h>
diff -r 4c887e10a62e -r 3b4a3325e52c sys/arch/hp700/dev/ssio.c
--- a/sys/arch/hp700/dev/ssio.c Fri Jul 01 18:21:31 2011 +0000
+++ b/sys/arch/hp700/dev/ssio.c Fri Jul 01 18:31:32 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ssio.c,v 1.1 2009/05/28 08:41:29 skrll Exp $   */
+/*     $NetBSD: ssio.c,v 1.2 2011/07/01 18:33:09 dyoung Exp $  */
 
 /*     $OpenBSD: ssio.c,v 1.7 2009/03/08 22:19:04 miod Exp $   */
 
@@ -26,7 +26,7 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/iomod.h>



Home | Main Index | Thread Index | Old Index