Module Name: src
Committed By: matt
Date: Tue Dec 14 23:31:17 UTC 2010
Modified Files:
src/sys/arch/vax/vsa: asc_vsbus.c dz_vsbus.c hdc9224.c leds.c ncr.c
smg.c spx.c tc_vsbus.c vsbus.c vsbus_dma.c
Log Message:
Cleanup includes. Switch from <machine/XXX.h> to <sys/XXX.h> from
bus, cpu, and intr. Remove unneeded includes.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/vax/vsa/asc_vsbus.c \
src/sys/arch/vax/vsa/dz_vsbus.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/vax/vsa/hdc9224.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/vsa/leds.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/vax/vsa/ncr.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/vax/vsa/smg.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/vsa/spx.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vsa/tc_vsbus.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/vax/vsa/vsbus.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/vsa/vsbus_dma.c
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/vax/vsa/asc_vsbus.c
diff -u src/sys/arch/vax/vsa/asc_vsbus.c:1.41 src/sys/arch/vax/vsa/asc_vsbus.c:1.42
--- src/sys/arch/vax/vsa/asc_vsbus.c:1.41 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vsa/asc_vsbus.c Tue Dec 14 23:31:16 2010
@@ -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>
Index: src/sys/arch/vax/vsa/dz_vsbus.c
diff -u src/sys/arch/vax/vsa/dz_vsbus.c:1.41 src/sys/arch/vax/vsa/dz_vsbus.c:1.42
--- src/sys/arch/vax/vsa/dz_vsbus.c:1.41 Sun May 9 22:24:44 2010
+++ src/sys/arch/vax/vsa/dz_vsbus.c Tue Dec 14 23:31:16 2010
@@ -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/proc.h>
#include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
-#include <sys/file.h>
#include <sys/conf.h>
+#include <sys/cpu.h>
#include <sys/device.h>
-#include <sys/reboot.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.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>
Index: src/sys/arch/vax/vsa/hdc9224.c
diff -u src/sys/arch/vax/vsa/hdc9224.c:1.50 src/sys/arch/vax/vsa/hdc9224.c:1.51
--- src/sys/arch/vax/vsa/hdc9224.c:1.50 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vsa/hdc9224.c Tue Dec 14 23:31:16 2010
@@ -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>
Index: src/sys/arch/vax/vsa/leds.c
diff -u src/sys/arch/vax/vsa/leds.c:1.8 src/sys/arch/vax/vsa/leds.c:1.9
--- src/sys/arch/vax/vsa/leds.c:1.8 Sun May 4 00:10:42 2008
+++ src/sys/arch/vax/vsa/leds.c Tue Dec 14 23:31:16 2010
@@ -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>
Index: src/sys/arch/vax/vsa/ncr.c
diff -u src/sys/arch/vax/vsa/ncr.c:1.47 src/sys/arch/vax/vsa/ncr.c:1.48
--- src/sys/arch/vax/vsa/ncr.c:1.47 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vsa/ncr.c Tue Dec 14 23:31:16 2010
@@ -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>
Index: src/sys/arch/vax/vsa/smg.c
diff -u src/sys/arch/vax/vsa/smg.c:1.53 src/sys/arch/vax/vsa/smg.c:1.54
--- src/sys/arch/vax/vsa/smg.c:1.53 Mon Oct 26 19:16:58 2009
+++ src/sys/arch/vax/vsa/smg.c Tue Dec 14 23:31:16 2010
@@ -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/malloc.h>
#include <sys/conf.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/kernel.h>
+#include <sys/malloc.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>
Index: src/sys/arch/vax/vsa/spx.c
diff -u src/sys/arch/vax/vsa/spx.c:1.3 src/sys/arch/vax/vsa/spx.c:1.4
--- src/sys/arch/vax/vsa/spx.c:1.3 Sun May 9 22:19:46 2010
+++ src/sys/arch/vax/vsa/spx.c Tue Dec 14 23:31:16 2010
@@ -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/malloc.h>
#include <sys/conf.h>
-#include <sys/kernel.h>
-
-#include <uvm/uvm.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/malloc.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>
Index: src/sys/arch/vax/vsa/tc_vsbus.c
diff -u src/sys/arch/vax/vsa/tc_vsbus.c:1.4 src/sys/arch/vax/vsa/tc_vsbus.c:1.5
--- src/sys/arch/vax/vsa/tc_vsbus.c:1.4 Mon Apr 28 20:23:39 2008
+++ src/sys/arch/vax/vsa/tc_vsbus.c Tue Dec 14 23:31:17 2010
@@ -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>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
#include <machine/pte.h>
#include <machine/scb.h>
#include <machine/vsbus.h>
Index: src/sys/arch/vax/vsa/vsbus.c
diff -u src/sys/arch/vax/vsa/vsbus.c:1.58 src/sys/arch/vax/vsa/vsbus.c:1.59
--- src/sys/arch/vax/vsa/vsbus.c:1.58 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vsa/vsbus.c Tue Dec 14 23:31:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus.c,v 1.58 2009/11/21 04:45:39 rmind Exp $ */
+/* $NetBSD: vsbus.c,v 1.59 2010/12/14 23:31:17 matt Exp $ */
/*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,29 +33,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.58 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.59 2010/12/14 23:31:17 matt Exp $");
+
+#include "opt_cputype.h"
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/conf.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/proc.h>
+#include <sys/bus.h>
#include <sys/device.h>
-#include <sys/disklabel.h>
-#include <sys/syslog.h>
-#include <sys/stat.h>
#include <uvm/uvm_extern.h>
-#define _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/pte.h>
#include <machine/sid.h>
#include <machine/scb.h>
-#include <machine/cpu.h>
-#include <machine/trap.h>
#include <machine/nexus.h>
#include <machine/uvax.h>
@@ -68,7 +60,6 @@
#include "ioconf.h"
#include "locators.h"
-#include "opt_cputype.h"
static int vsbus_match(device_t, cfdata_t, void *);
static void vsbus_attach(device_t, device_t, void *);
Index: src/sys/arch/vax/vsa/vsbus_dma.c
diff -u src/sys/arch/vax/vsa/vsbus_dma.c:1.15 src/sys/arch/vax/vsa/vsbus_dma.c:1.16
--- src/sys/arch/vax/vsa/vsbus_dma.c:1.15 Mon Apr 28 20:23:39 2008
+++ src/sys/arch/vax/vsa/vsbus_dma.c Tue Dec 14 23:31:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus_dma.c,v 1.15 2008/04/28 20:23:39 martin Exp $ */
+/* $NetBSD: vsbus_dma.c,v 1.16 2010/12/14 23:31:17 matt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,18 +31,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus_dma.c,v 1.15 2008/04/28 20:23:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus_dma.c,v 1.16 2010/12/14 23:31:17 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/malloc.h>
+
#include <uvm/uvm_extern.h>
-#define _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/cpu.h>
#include <machine/sid.h>
#include <machine/sgmap.h>
#include <machine/vsbus.h>
