[src/trunk]: src/sys/arch/vax/vsa Cleanup includes. Switch from <machine/XXX...

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

details:   https://anonhg.NetBSD.org/src/rev/9b057c9e2c26
branches:  trunk
changeset: 759687:9b057c9e2c26
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Dec 14 23:31:16 2010 +0000

description:
Cleanup includes.  Switch from <machine/XXX.h> to <sys/XXX.h> from
bus, cpu, and intr.  Remove unneeded includes.

diffstat:

 sys/arch/vax/vsa/asc_vsbus.c |  17 ++++++-----------
 sys/arch/vax/vsa/dz_vsbus.c  |  19 ++++++++-----------
 sys/arch/vax/vsa/hdc9224.c   |  20 ++++++++------------
 sys/arch/vax/vsa/leds.c      |   9 ++++-----
 sys/arch/vax/vsa/ncr.c       |  12 ++++++------
 sys/arch/vax/vsa/smg.c       |  14 +++++++-------
 sys/arch/vax/vsa/spx.c       |  15 ++++++---------
 sys/arch/vax/vsa/tc_vsbus.c  |   6 +++---
 sys/arch/vax/vsa/vsbus.c     |  23 +++++++----------------
 sys/arch/vax/vsa/vsbus_dma.c |  14 +++++++-------
 10 files changed, 62 insertions(+), 87 deletions(-)

diffs (truncated from 394 to 300 lines):

diff -r 048f0a8729b6 -r 9b057c9e2c26 sys/arch/vax/vsa/asc_vsbus.c
--- a/sys/arch/vax/vsa/asc_vsbus.c      Tue Dec 14 23:29:33 2010 +0000
+++ b/sys/arch/vax/vsa/asc_vsbus.c      Tue Dec 14 23:31:16 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asc_vsbus.c,v 1.41 2009/11/21 04:45:39 rmind Exp $     */
+/*     $NetBSD: asc_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,35 +31,30 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: asc_vsbus.c,v 1.41 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $");
 
 #include "locators.h"
 #include "opt_cputype.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-#include <sys/device.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
-#include <sys/reboot.h>
-#include <sys/queue.h>
 
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 #include <dev/scsipi/scsi_message.h>
 
-#include <machine/bus.h>
-#include <machine/vmparam.h>
-
 #include <dev/ic/ncr53c9xreg.h>
 #include <dev/ic/ncr53c9xvar.h>
 
-#include <machine/cpu.h>
+#include <machine/vmparam.h>
 #include <machine/sid.h>
 #include <machine/scb.h>
 #include <machine/vsbus.h>
diff -r 048f0a8729b6 -r 9b057c9e2c26 sys/arch/vax/vsa/dz_vsbus.c
--- a/sys/arch/vax/vsa/dz_vsbus.c       Tue Dec 14 23:29:33 2010 +0000
+++ b/sys/arch/vax/vsa/dz_vsbus.c       Tue Dec 14 23:31:16 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dz_vsbus.c,v 1.41 2010/05/09 22:24:44 hans Exp $ */
+/*     $NetBSD: dz_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,25 +31,22 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.41 2010/05/09 22:24:44 hans Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
 #include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
-#include <sys/file.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/reboot.h>
 
 #include <dev/cons.h>
 
-#include <machine/mtpr.h>
 #include <machine/sid.h>
-#include <machine/uvax.h>
 #include <machine/vsbus.h>
-#include <machine/cpu.h>
 #include <machine/scb.h>
 
 #include <arch/vax/vax/gencons.h>
diff -r 048f0a8729b6 -r 9b057c9e2c26 sys/arch/vax/vsa/hdc9224.c
--- a/sys/arch/vax/vsa/hdc9224.c        Tue Dec 14 23:29:33 2010 +0000
+++ b/sys/arch/vax/vsa/hdc9224.c        Tue Dec 14 23:31:16 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hdc9224.c,v 1.50 2009/11/21 04:45:39 rmind Exp $ */
+/*     $NetBSD: hdc9224.c,v 1.51 2010/12/14 23:31:16 matt Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -51,33 +51,29 @@
 #undef RDDEBUG
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.50 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.51 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/file.h>
-#include <sys/stat.h> 
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
-#include <sys/proc.h>
+#include <sys/cpu.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/stat.h> 
 #include <sys/syslog.h>
-#include <sys/reboot.h>
 
 #include <uvm/uvm_extern.h>
 
 #include <ufs/ufs/dinode.h> /* For BBSIZE */
 #include <ufs/ffs/fs.h>
 
-#include <machine/pte.h>
 #include <machine/sid.h>
-#include <machine/cpu.h>
-#include <machine/uvax.h>
 #include <machine/ka410.h>
 #include <machine/vsbus.h>
 #include <machine/rpb.h>
diff -r 048f0a8729b6 -r 9b057c9e2c26 sys/arch/vax/vsa/leds.c
--- a/sys/arch/vax/vsa/leds.c   Tue Dec 14 23:29:33 2010 +0000
+++ b/sys/arch/vax/vsa/leds.c   Tue Dec 14 23:31:16 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: leds.c,v 1.8 2008/05/04 00:10:42 jklos Exp $   */
+/*     $NetBSD: leds.c,v 1.9 2010/12/14 23:31:16 matt Exp $    */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -34,17 +34,16 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: leds.c,v 1.8 2008/05/04 00:10:42 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: leds.c,v 1.9 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
+#include <sys/cpu.h>
 #include <sys/conf.h>
-#include <sys/buf.h>
+#include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 
-#include <machine/cpu.h>
 #include <machine/sid.h>
 #include <machine/leds.h>
 
diff -r 048f0a8729b6 -r 9b057c9e2c26 sys/arch/vax/vsa/ncr.c
--- a/sys/arch/vax/vsa/ncr.c    Tue Dec 14 23:29:33 2010 +0000
+++ b/sys/arch/vax/vsa/ncr.c    Tue Dec 14 23:31:16 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.47 2009/11/21 04:45:39 rmind Exp $   */
+/*     $NetBSD: ncr.c,v 1.48 2010/12/14 23:31:16 matt Exp $    */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -42,15 +42,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.47 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.48 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/device.h>
-#include <sys/buf.h>
 #include <sys/proc.h>
 
 #include <dev/scsipi/scsi_all.h>
@@ -61,9 +63,7 @@
 #include <dev/ic/ncr5380reg.h>
 #include <dev/ic/ncr5380var.h>
 
-#include <machine/cpu.h>
 #include <machine/vsbus.h>
-#include <machine/bus.h>
 #include <machine/sid.h>
 #include <machine/scb.h>
 #include <machine/clock.h>
diff -r 048f0a8729b6 -r 9b057c9e2c26 sys/arch/vax/vsa/smg.c
--- a/sys/arch/vax/vsa/smg.c    Tue Dec 14 23:29:33 2010 +0000
+++ b/sys/arch/vax/vsa/smg.c    Tue Dec 14 23:31:16 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smg.c,v 1.53 2009/10/26 19:16:58 cegger Exp $ */
+/*     $NetBSD: smg.c,v 1.54 2010/12/14 23:31:16 matt Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,20 +31,20 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.53 2009/10/26 19:16:58 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.54 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
-#include <sys/time.h>
+#include <sys/conf.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
+#include <sys/time.h>
 
 #include <machine/vsbus.h>
 #include <machine/sid.h>
-#include <machine/cpu.h>
 #include <machine/ka420.h>
 
 #include <dev/cons.h>
diff -r 048f0a8729b6 -r 9b057c9e2c26 sys/arch/vax/vsa/spx.c
--- a/sys/arch/vax/vsa/spx.c    Tue Dec 14 23:29:33 2010 +0000
+++ b/sys/arch/vax/vsa/spx.c    Tue Dec 14 23:31:16 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spx.c,v 1.3 2010/05/09 22:19:46 hans Exp $ */
+/*     $NetBSD: spx.c,v 1.4 2010/12/14 23:31:16 matt Exp $ */
 /*
  * SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX
  * Copyright (c) 2005 Blaz Antonic
@@ -32,22 +32,19 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.3 2010/05/09 22:19:46 hans Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.4 2010/12/14 23:31:16 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
-#include <sys/time.h>
+#include <sys/conf.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
-
-#include <uvm/uvm.h>
+#include <sys/time.h>
 
 #include <machine/vsbus.h>
 #include <machine/sid.h>
-#include <machine/cpu.h>
 #include <machine/ka420.h>
 
 #include <dev/cons.h>
diff -r 048f0a8729b6 -r 9b057c9e2c26 sys/arch/vax/vsa/tc_vsbus.c
--- a/sys/arch/vax/vsa/tc_vsbus.c       Tue Dec 14 23:29:33 2010 +0000
+++ b/sys/arch/vax/vsa/tc_vsbus.c       Tue Dec 14 23:31:16 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tc_vsbus.c,v 1.4 2008/04/28 20:23:39 martin Exp $      */
+/*     $NetBSD: tc_vsbus.c,v 1.5 2010/12/14 23:31:17 matt Exp $        */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,10 +29,10 @@
  */
 
 #include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>