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/70c2e02c1520
branches:  trunk
changeset: 766772:70c2e02c1520
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Jul 01 18:41:51 2011 +0000

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

diffstat:

 sys/arch/evbmips/adm5120/mainbus.c       |  6 +++---
 sys/arch/evbmips/alchemy/dbau1500.c      |  6 +++---
 sys/arch/evbmips/alchemy/dbau1550.c      |  6 +++---
 sys/arch/evbmips/alchemy/genericbd.c     |  6 +++---
 sys/arch/evbmips/alchemy/mach_intr.c     |  6 +++---
 sys/arch/evbmips/alchemy/mtx-1.c         |  6 +++---
 sys/arch/evbmips/alchemy/obio.c          |  6 +++---
 sys/arch/evbmips/alchemy/omsal400.c      |  6 +++---
 sys/arch/evbmips/atheros/mach_intr.c     |  6 +++---
 sys/arch/evbmips/gdium/bonito_mainbus.c  |  6 +++---
 sys/arch/evbmips/gdium/gdium_dma.c       |  6 +++---
 sys/arch/evbmips/gdium/gdium_genfb.c     |  6 +++---
 sys/arch/evbmips/gdium/gdium_intr.c      |  6 +++---
 sys/arch/evbmips/gdium/gdiumvar.h        |  4 ++--
 sys/arch/evbmips/isa/isadma_bounce.c     |  6 +++---
 sys/arch/evbmips/isa/mcclock_isa.c       |  6 +++---
 sys/arch/evbmips/malta/autoconf.h        |  4 ++--
 sys/arch/evbmips/malta/malta_dma.c       |  6 +++---
 sys/arch/evbmips/malta/maltavar.h        |  4 ++--
 sys/arch/evbmips/malta/pci/pci_machdep.c |  6 +++---
 sys/arch/evbmips/malta/pci/pcib.c        |  6 +++---
 sys/arch/macppc/dev/adb.c                |  6 +++---
 sys/arch/macppc/dev/am79c950.c           |  6 +++---
 sys/arch/macppc/dev/battery.c            |  6 +++---
 sys/arch/macppc/dev/com_mainbus.c        |  2 +-
 sys/arch/macppc/dev/cuda.c               |  6 +++---
 sys/arch/macppc/dev/if_mc.c              |  6 +++---
 sys/arch/macppc/dev/if_wi_obio.c         |  6 +++---
 sys/arch/macppc/dev/kauai.c              |  6 +++---
 sys/arch/macppc/dev/ofb.c                |  6 +++---
 sys/arch/macppc/dev/pmu.c                |  6 +++---
 sys/arch/macppc/dev/smartbat.c           |  6 +++---
 sys/arch/macppc/dev/wdc_obio.c           |  6 +++---
 sys/arch/macppc/macppc/rbus_machdep.c    |  6 +++---
 sys/arch/macppc/pci/agp_machdep.c        |  6 +++---
 sys/arch/macppc/pci/pci_machdep.c        |  6 +++---
 sys/arch/sparc/dev/bootbus.c             |  6 +++---
 sys/arch/sparc/dev/cgsix_obio.c          |  6 +++---
 sys/arch/sparc/dev/com_ebus.c            |  6 +++---
 sys/arch/sparc/dev/com_obio.c            |  6 +++---
 sys/arch/sparc/dev/dma_obio.c            |  6 +++---
 sys/arch/sparc/dev/ebus.c                |  6 +++---
 sys/arch/sparc/dev/esp_obio.c            |  6 +++---
 sys/arch/sparc/dev/if_ie_obio.c          |  6 +++---
 sys/arch/sparc/dev/if_le_obio.c          |  6 +++---
 sys/arch/sparc/dev/kbd_pckbport.c        |  6 +++---
 sys/arch/sparc/dev/ms_pckbport.c         |  6 +++---
 sys/arch/sparc/dev/obio.c                |  6 +++---
 sys/arch/sparc/dev/rtc.c                 |  6 +++---
 sys/arch/sparc/dev/sbus.c                |  6 +++---
 sys/arch/sparc/dev/sw.c                  |  6 +++---
 sys/arch/sparc/dev/tctrl.c               |  6 +++---
 sys/arch/sparc/dev/ts102.c               |  4 ++--
 sys/arch/sparc/dev/vme_machdep.c         |  6 +++---
 sys/arch/sparc/sparc/clock.c             |  6 +++---
 sys/arch/sparc/sparc/cpuunit.c           |  6 +++---
 sys/arch/sparc/sparc/eeprom.c            |  6 +++---
 sys/arch/sparc/sparc/genassym.cf         |  4 ++--
 sys/arch/sparc/sparc/iommu.c             |  6 +++---
 sys/arch/sparc/sparc/memecc.c            |  6 +++---
 sys/arch/sparc/sparc/mkclock.c           |  6 +++---
 sys/arch/sparc/sparc/msiiep.c            |  6 +++---
 sys/arch/sparc/sparc/oclock.c            |  6 +++---
 sys/arch/sparc/sparc/pci_machdep.c       |  6 +++---
 sys/arch/sparc/sparc/timer.c             |  6 +++---
 sys/arch/sparc/sparc/timer_sun4.c        |  6 +++---
 sys/arch/sparc64/dev/com_ebus.c          |  6 +++---
 sys/arch/sparc64/dev/ebus.c              |  6 +++---
 sys/arch/sparc64/dev/ebus_mainbus.c      |  4 ++--
 sys/arch/sparc64/dev/ebusvar.h           |  4 ++--
 sys/arch/sparc64/dev/ffb.c               |  6 +++---
 sys/arch/sparc64/dev/ffb_mainbus.c       |  6 +++---
 sys/arch/sparc64/dev/gfb.c               |  6 +++---
 sys/arch/sparc64/dev/iommu.c             |  6 +++---
 sys/arch/sparc64/dev/lpt_ebus.c          |  6 +++---
 sys/arch/sparc64/dev/mkclock.c           |  6 +++---
 sys/arch/sparc64/dev/pcfiic_ebus.c       |  4 ++--
 sys/arch/sparc64/dev/pci_machdep.c       |  6 +++---
 sys/arch/sparc64/dev/psm.c               |  6 +++---
 sys/arch/sparc64/dev/psycho.c            |  6 +++---
 sys/arch/sparc64/dev/pyro.c              |  4 ++--
 sys/arch/sparc64/dev/rtc.c               |  6 +++---
 sys/arch/sparc64/dev/sbus.c              |  6 +++---
 sys/arch/sparc64/dev/sbusvar.h           |  4 ++--
 sys/arch/sparc64/dev/schizo.c            |  4 ++--
 sys/arch/sparc64/dev/upa.c               |  2 +-
 sys/arch/sparc64/sparc64/autoconf.c      |  6 +++---
 sys/arch/sparc64/sparc64/clock.c         |  6 +++---
 sys/arch/sparc64/sparc64/core_machdep.c  |  6 +++---
 sys/arch/sparc64/sparc64/rbus_machdep.c  |  6 +++---
 sys/arch/sparc64/sparc64/vm_machdep.c    |  6 +++---
 91 files changed, 258 insertions(+), 258 deletions(-)

diffs (truncated from 2284 to 300 lines):

diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/adm5120/mainbus.c
--- a/sys/arch/evbmips/adm5120/mainbus.c        Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/adm5120/mainbus.c        Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.2 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -66,13 +66,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/cache.h>
 #include <mips/cpuregs.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/alchemy/dbau1500.c
--- a/sys/arch/evbmips/alchemy/dbau1500.c       Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/alchemy/dbau1500.c       Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1500.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: dbau1500.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,10 +32,10 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/alchemy/dbau1550.c
--- a/sys/arch/evbmips/alchemy/dbau1550.c       Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/alchemy/dbau1550.c       Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1550.c,v 1.10 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: dbau1550.c,v 1.11 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,13 +32,13 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.10 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.11 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/dev/aupcmciavar.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/alchemy/genericbd.c
--- a/sys/arch/evbmips/alchemy/genericbd.c      Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/alchemy/genericbd.c      Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: genericbd.c,v 1.2 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: genericbd.c,v 1.3 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,10 +32,10 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genericbd.c,v 1.2 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genericbd.c,v 1.3 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/alchemy/mach_intr.c
--- a/sys/arch/evbmips/alchemy/mach_intr.c      Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/alchemy/mach_intr.c      Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mach_intr.c,v 1.4 2011/02/20 07:48:33 matt Exp $       */
+/*     $NetBSD: mach_intr.c,v 1.5 2011/07/01 18:44:45 dyoung Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.4 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.5 2011/07/01 18:44:45 dyoung Exp $");
 
 #include "opt_ddb.h"
 
@@ -49,7 +49,7 @@
 #include <sys/device.h>
 #include <sys/kernel.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/locore.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/alchemy/mtx-1.c
--- a/sys/arch/evbmips/alchemy/mtx-1.c  Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/alchemy/mtx-1.c  Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mtx-1.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: mtx-1.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,10 +32,10 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <evbmips/alchemy/obiovar.h>
 #include <evbmips/alchemy/board.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/alchemy/obio.c
--- a/sys/arch/evbmips/alchemy/obio.c   Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/alchemy/obio.c   Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.3 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: obio.c,v 1.4 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,13 +36,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.3 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.4 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/cache.h>
 #include <mips/cpuregs.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/alchemy/omsal400.c
--- a/sys/arch/evbmips/alchemy/omsal400.c       Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/alchemy/omsal400.c       Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: omsal400.c,v 1.7 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: omsal400.c,v 1.8 2011/07/01 18:44:45 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -36,10 +36,10 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.7 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.8 2011/07/01 18:44:45 dyoung Exp $");
 
 #include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/locore.h>
 #include <mips/alchemy/dev/augpiovar.h>
 #include <mips/alchemy/dev/aupcmciavar.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/atheros/mach_intr.c
--- a/sys/arch/evbmips/atheros/mach_intr.c      Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/atheros/mach_intr.c      Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mach_intr.c,v 1.3 2011/02/20 07:48:33 matt Exp $       */
+/*     $NetBSD: mach_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.3 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $");
 
 #include "opt_ddb.h"
 
@@ -44,7 +44,7 @@
 #include <sys/device.h>
 #include <sys/kernel.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <machine/intr.h>
 
 #include <mips/locore.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/gdium/bonito_mainbus.c
--- a/sys/arch/evbmips/gdium/bonito_mainbus.c   Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/gdium/bonito_mainbus.c   Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bonito_mainbus.c,v 1.2 2011/05/17 17:34:49 dyoung Exp $        */
+/*     $NetBSD: bonito_mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.2 2011/05/17 17:34:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.3 2011/07/01 18:45:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,7 +38,7 @@
 #include <sys/reboot.h>
 #include <sys/device.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <mips/bonito/bonitoreg.h>
 
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/gdium/gdium_dma.c
--- a/sys/arch/evbmips/gdium/gdium_dma.c        Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/gdium/gdium_dma.c        Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gdium_dma.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $     */
+/*     $NetBSD: gdium_dma.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_dma.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_dma.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $");
 
 #include <sys/param.h>
 
 #define        _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <evbmips/gdium/gdiumreg.h>
 #include <evbmips/gdium/gdiumvar.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/gdium/gdium_genfb.c
--- a/sys/arch/evbmips/gdium/gdium_genfb.c      Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/gdium/gdium_genfb.c      Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gdium_genfb.c,v 1.4 2010/05/11 01:38:14 macallan Exp $ */
+/*     $NetBSD: gdium_genfb.c,v 1.5 2011/07/01 18:45:36 dyoung Exp $   */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.4 2010/05/11 01:38:14 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.5 2011/07/01 18:45:36 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -39,7 +39,7 @@
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
diff -r 3b4a3325e52c -r 70c2e02c1520 sys/arch/evbmips/gdium/gdium_intr.c
--- a/sys/arch/evbmips/gdium/gdium_intr.c       Fri Jul 01 18:31:32 2011 +0000
+++ b/sys/arch/evbmips/gdium/gdium_intr.c       Fri Jul 01 18:41:51 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gdium_intr.c,v 1.3 2011/06/08 17:47:48 bouyer Exp $    */



Home | Main Index | Thread Index | Old Index