Module Name: src
Committed By: matt
Date: Tue Dec 14 23:38:31 UTC 2010
Modified Files:
src/sys/arch/vax/bi: bi_mainbus.c bi_nmi.c
src/sys/arch/vax/if: if_le.c if_le_vsbus.c if_ze.c
src/sys/arch/vax/mba: hp.c mba.c
src/sys/arch/vax/uba: uba_cmi.c uba_dma.c uba_mainbus.c uba_sbi.c
uba_ubi.c
Log Message:
Cleanup includes. Change <machine/XXX.h> to <sys/XXX.h> for bus, cpu, intr.
Remove unneeded includes.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/bi/bi_mainbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/bi/bi_nmi.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/vax/if/if_le.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/vax/if/if_le_vsbus.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/if/if_ze.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/vax/mba/hp.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/vax/mba/mba.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/uba/uba_cmi.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/uba/uba_dma.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/uba/uba_mainbus.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/vax/uba/uba_sbi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/uba/uba_ubi.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/bi/bi_mainbus.c
diff -u src/sys/arch/vax/bi/bi_mainbus.c:1.10 src/sys/arch/vax/bi/bi_mainbus.c:1.11
--- src/sys/arch/vax/bi/bi_mainbus.c:1.10 Tue Mar 11 05:34:02 2008
+++ src/sys/arch/vax/bi/bi_mainbus.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bi_mainbus.c,v 1.10 2008/03/11 05:34:02 matt Exp $ */
+/* $NetBSD: bi_mainbus.c,v 1.11 2010/12/14 23:38:30 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,17 +31,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bi_mainbus.c,v 1.10 2008/03/11 05:34:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi_mainbus.c,v 1.11 2010/12/14 23:38:30 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
#include <sys/device.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
-#define _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
#include <machine/nexus.h>
#include <machine/sid.h>
#include <machine/scb.h>
-#include <machine/cpu.h>
#include <machine/mainbus.h>
#include <dev/bi/bivar.h>
Index: src/sys/arch/vax/bi/bi_nmi.c
diff -u src/sys/arch/vax/bi/bi_nmi.c:1.7 src/sys/arch/vax/bi/bi_nmi.c:1.8
--- src/sys/arch/vax/bi/bi_nmi.c:1.7 Tue Mar 11 05:34:02 2008
+++ src/sys/arch/vax/bi/bi_nmi.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bi_nmi.c,v 1.7 2008/03/11 05:34:02 matt Exp $ */
+/* $NetBSD: bi_nmi.c,v 1.8 2010/12/14 23:38:30 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,18 +31,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bi_nmi.c,v 1.7 2008/03/11 05:34:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi_nmi.c,v 1.8 2010/12/14 23:38:30 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
-#define _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
#include <machine/nexus.h>
#include <machine/sid.h>
#include <machine/scb.h>
-#include <machine/cpu.h>
#include <machine/ka88.h>
#include <dev/bi/bivar.h>
Index: src/sys/arch/vax/if/if_le.c
diff -u src/sys/arch/vax/if/if_le.c:1.36 src/sys/arch/vax/if/if_le.c:1.37
--- src/sys/arch/vax/if/if_le.c:1.36 Tue Jan 19 22:06:23 2010
+++ src/sys/arch/vax/if/if_le.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.36 2010/01/19 22:06:23 pooka Exp $ */
+/* $NetBSD: if_le.c,v 1.37 2010/12/14 23:38:30 matt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,15 +65,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.36 2010/01/19 22:06:23 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.37 2010/12/14 23:38:30 matt Exp $");
#include "opt_inet.h"
#include <sys/param.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/syslog.h>
#include <sys/socket.h>
-#include <sys/device.h>
-#include <sys/reboot.h>
#include <uvm/uvm_extern.h>
@@ -86,7 +86,6 @@
#include <netinet/if_inarp.h>
#endif
-#include <machine/cpu.h>
#include <machine/nexus.h>
#include <machine/scb.h>
#include <machine/mainbus.h>
Index: src/sys/arch/vax/if/if_le_vsbus.c
diff -u src/sys/arch/vax/if/if_le_vsbus.c:1.27 src/sys/arch/vax/if/if_le_vsbus.c:1.28
--- src/sys/arch/vax/if/if_le_vsbus.c:1.27 Tue Jan 19 22:06:23 2010
+++ src/sys/arch/vax/if/if_le_vsbus.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_vsbus.c,v 1.27 2010/01/19 22:06:23 pooka Exp $ */
+/* $NetBSD: if_le_vsbus.c,v 1.28 2010/12/14 23:38:30 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,15 +64,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_vsbus.c,v 1.27 2010/01/19 22:06:23 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_vsbus.c,v 1.28 2010/12/14 23:38:30 matt Exp $");
#include "opt_inet.h"
#include <sys/param.h>
-#include <sys/syslog.h>
-#include <sys/socket.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
-#include <sys/reboot.h>
+#include <sys/socket.h>
#include <uvm/uvm_extern.h>
@@ -85,10 +85,8 @@
#include <netinet/if_inarp.h>
#endif
-#include <machine/cpu.h>
#include <machine/sid.h>
#include <machine/scb.h>
-#include <machine/bus.h>
#include <machine/vsbus.h>
#include <dev/ic/lancereg.h>
Index: src/sys/arch/vax/if/if_ze.c
diff -u src/sys/arch/vax/if/if_ze.c:1.16 src/sys/arch/vax/if/if_ze.c:1.17
--- src/sys/arch/vax/if/if_ze.c:1.16 Tue Jan 19 22:06:23 2010
+++ src/sys/arch/vax/if/if_ze.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ze.c,v 1.16 2010/01/19 22:06:23 pooka Exp $ */
+/* $NetBSD: if_ze.c,v 1.17 2010/12/14 23:38:30 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -30,15 +30,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ze.c,v 1.16 2010/01/19 22:06:23 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ze.c,v 1.17 2010/12/14 23:38:30 matt Exp $");
#include "opt_cputype.h"
#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/device.h>
#include <sys/systm.h>
-#include <sys/sockio.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <net/if.h>
#include <net/if_ether.h>
@@ -47,9 +47,7 @@
#include <netinet/in.h>
#include <netinet/if_inarp.h>
-#include <machine/bus.h>
#include <machine/nexus.h>
-#include <machine/cpu.h>
#include <machine/scb.h>
#include <machine/sid.h>
#include <machine/mainbus.h>
Index: src/sys/arch/vax/mba/hp.c
diff -u src/sys/arch/vax/mba/hp.c:1.47 src/sys/arch/vax/mba/hp.c:1.48
--- src/sys/arch/vax/mba/hp.c:1.47 Tue Jan 13 13:35:52 2009
+++ src/sys/arch/vax/mba/hp.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hp.c,v 1.47 2009/01/13 13:35:52 yamt Exp $ */
+/* $NetBSD: hp.c,v 1.48 2010/12/14 23:38:30 matt Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -42,10 +42,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.47 2009/01/13 13:35:52 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.48 2010/12/14 23:38:30 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/disklabel.h>
#include <sys/disk.h>
@@ -55,16 +57,9 @@
#include <sys/stat.h>
#include <sys/ioccom.h>
#include <sys/fcntl.h>
-#include <sys/syslog.h>
-#include <sys/reboot.h>
#include <sys/conf.h>
#include <sys/event.h>
-
-#include <machine/bus.h>
-#include <machine/trap.h>
-#include <machine/pte.h>
-#include <machine/mtpr.h>
-#include <machine/cpu.h>
+#include <sys/syslog.h>
#include <vax/mba/mbavar.h>
#include <vax/mba/mbareg.h>
Index: src/sys/arch/vax/mba/mba.c
diff -u src/sys/arch/vax/mba/mba.c:1.38 src/sys/arch/vax/mba/mba.c:1.39
--- src/sys/arch/vax/mba/mba.c:1.38 Tue Jan 13 13:35:52 2009
+++ src/sys/arch/vax/mba/mba.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mba.c,v 1.38 2009/01/13 13:35:52 yamt Exp $ */
+/* $NetBSD: mba.c,v 1.39 2010/12/14 23:38:30 matt Exp $ */
/*
* Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -38,25 +38,23 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mba.c,v 1.38 2009/01/13 13:35:52 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mba.c,v 1.39 2010/12/14 23:38:30 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/queue.h>
#include <sys/buf.h>
#include <sys/bufq.h>
#include <sys/proc.h>
-#include <uvm/uvm_extern.h>
-
-#include <machine/bus.h>
#include <machine/scb.h>
#include <machine/nexus.h>
#include <machine/pte.h>
-#include <machine/pcb.h>
#include <machine/sid.h>
-#include <machine/cpu.h>
+#include <machine/sid.h>
#include <vax/mba/mbareg.h>
#include <vax/mba/mbavar.h>
Index: src/sys/arch/vax/uba/uba_cmi.c
diff -u src/sys/arch/vax/uba/uba_cmi.c:1.14 src/sys/arch/vax/uba/uba_cmi.c:1.15
--- src/sys/arch/vax/uba/uba_cmi.c:1.14 Tue Mar 11 05:34:02 2008
+++ src/sys/arch/vax/uba/uba_cmi.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uba_cmi.c,v 1.14 2008/03/11 05:34:02 matt Exp $ */
+/* $NetBSD: uba_cmi.c,v 1.15 2010/12/14 23:38:30 matt Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -68,17 +68,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba_cmi.c,v 1.14 2008/03/11 05:34:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_cmi.c,v 1.15 2010/12/14 23:38:30 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/bus.h>
-#define _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/mtpr.h>
#include <machine/nexus.h>
-#include <machine/cpu.h>
#include <machine/sgmap.h>
#include <dev/qbus/ubavar.h>
Index: src/sys/arch/vax/uba/uba_dma.c
diff -u src/sys/arch/vax/uba/uba_dma.c:1.10 src/sys/arch/vax/uba/uba_dma.c:1.11
--- src/sys/arch/vax/uba/uba_dma.c:1.10 Mon Apr 28 20:23:39 2008
+++ src/sys/arch/vax/uba/uba_dma.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uba_dma.c,v 1.10 2008/04/28 20:23:39 martin Exp $ */
+/* $NetBSD: uba_dma.c,v 1.11 2010/12/14 23:38:30 matt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,18 +31,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba_dma.c,v 1.10 2008/04/28 20:23:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_dma.c,v 1.11 2010/12/14 23:38:30 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
+#include <sys/kernel.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/sgmap.h>
#include <dev/qbus/ubavar.h>
Index: src/sys/arch/vax/uba/uba_mainbus.c
diff -u src/sys/arch/vax/uba/uba_mainbus.c:1.9 src/sys/arch/vax/uba/uba_mainbus.c:1.10
--- src/sys/arch/vax/uba/uba_mainbus.c:1.9 Tue Mar 11 05:34:02 2008
+++ src/sys/arch/vax/uba/uba_mainbus.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uba_mainbus.c,v 1.9 2008/03/11 05:34:02 matt Exp $ */
+/* $NetBSD: uba_mainbus.c,v 1.10 2010/12/14 23:38:30 matt Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -68,17 +68,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba_mainbus.c,v 1.9 2008/03/11 05:34:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_mainbus.c,v 1.10 2010/12/14 23:38:30 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
-#define _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/mtpr.h>
#include <machine/nexus.h>
-#include <machine/cpu.h>
#include <machine/sgmap.h>
#include <machine/mainbus.h>
Index: src/sys/arch/vax/uba/uba_sbi.c
diff -u src/sys/arch/vax/uba/uba_sbi.c:1.28 src/sys/arch/vax/uba/uba_sbi.c:1.29
--- src/sys/arch/vax/uba/uba_sbi.c:1.28 Thu Jul 1 19:50:12 2010
+++ src/sys/arch/vax/uba/uba_sbi.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uba_sbi.c,v 1.28 2010/07/01 19:50:12 ragge Exp $ */
+/* $NetBSD: uba_sbi.c,v 1.29 2010/12/14 23:38:30 matt Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -75,18 +75,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba_sbi.c,v 1.28 2010/07/01 19:50:12 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_sbi.c,v 1.29 2010/12/14 23:38:30 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/kernel.h>
-#define _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/mtpr.h>
#include <machine/nexus.h>
-#include <machine/cpu.h>
#include <machine/sgmap.h>
#include <machine/scb.h>
Index: src/sys/arch/vax/uba/uba_ubi.c
diff -u src/sys/arch/vax/uba/uba_ubi.c:1.1 src/sys/arch/vax/uba/uba_ubi.c:1.2
--- src/sys/arch/vax/uba/uba_ubi.c:1.1 Thu Jan 22 18:49:02 2009
+++ src/sys/arch/vax/uba/uba_ubi.c Tue Dec 14 23:38:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uba_ubi.c,v 1.1 2009/01/22 18:49:02 christos Exp $ */
+/* $NetBSD: uba_ubi.c,v 1.2 2010/12/14 23:38:30 matt Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -68,17 +68,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba_ubi.c,v 1.1 2009/01/22 18:49:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_ubi.c,v 1.2 2010/12/14 23:38:30 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
-#define _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/mtpr.h>
#include <machine/nexus.h>
-#include <machine/cpu.h>
#include <machine/sgmap.h>
#include <dev/qbus/ubavar.h>
