Module Name: src
Committed By: matt
Date: Sat Jun 18 06:41:44 UTC 2011
Modified Files:
src/sys/arch/powerpc/ibm4xx: board_prop.c clock.c cpu.c
ibm40x_machdep.c ibm4xx_autoconf.c ibm4xx_machdep.c intr.c pmap.c
trap.c
src/sys/arch/powerpc/ibm4xx/dev: com_opb.c ecc_plb.c gpiic_opb.c
ibm405gp.c if_emac.c mal.c opb.c opbvar.h plb.c plbvar.h
src/sys/arch/powerpc/ibm4xx/openbios: openbios.c
src/sys/arch/powerpc/ibm4xx/pci: pci_machdep.c
src/sys/arch/powerpc/isa: isa_machdep_common.c
src/sys/arch/powerpc/marvell: pic_discovery.c
src/sys/arch/powerpc/pci: pci_machdep_common.c pci_machdep_ofw.c
pciconf_indirect.c pciconf_ofmethod.c
src/sys/arch/powerpc/pic: i8259_common.c pic_i8259.c pic_prepivr.c
picvar.h
src/sys/arch/powerpc/powerpc: bus_dma.c db_interface.c
Removed Files:
src/sys/arch/powerpc/pic: pic_soft.c
Log Message:
Use <sys/foo.h> instead of <machine/foo.h> if such a file exists.
Don't assume <sys/cpu.h> includes <powerpc/subarch/cpu*.h>. Include it
explicitly.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/ibm4xx/board_prop.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/ibm4xx/clock.c \
src/sys/arch/powerpc/ibm4xx/intr.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/ibm4xx/cpu.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/ibm4xx/ibm40x_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/powerpc/ibm4xx/pmap.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/powerpc/ibm4xx/trap.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/ibm4xx/dev/ibm405gp.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/ibm4xx/dev/mal.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/ibm4xx/dev/opb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/ibm4xx/dev/opbvar.h \
src/sys/arch/powerpc/ibm4xx/dev/plbvar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/ibm4xx/dev/plb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/ibm4xx/openbios/openbios.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/isa/isa_machdep_common.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/marvell/pic_discovery.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/pci/pci_machdep_common.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/pci/pci_machdep_ofw.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/pci/pciconf_indirect.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/pci/pciconf_ofmethod.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/pic/i8259_common.c \
src/sys/arch/powerpc/pic/pic_prepivr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/pic/pic_i8259.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/powerpc/pic/pic_soft.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/pic/picvar.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/powerpc/powerpc/bus_dma.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/powerpc/powerpc/db_interface.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/powerpc/ibm4xx/board_prop.c
diff -u src/sys/arch/powerpc/ibm4xx/board_prop.c:1.3 src/sys/arch/powerpc/ibm4xx/board_prop.c:1.4
--- src/sys/arch/powerpc/ibm4xx/board_prop.c:1.3 Fri May 5 18:04:41 2006
+++ src/sys/arch/powerpc/ibm4xx/board_prop.c Sat Jun 18 06:41:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: board_prop.c,v 1.3 2006/05/05 18:04:41 thorpej Exp $ */
+/* $NetBSD: board_prop.c,v 1.4 2011/06/18 06:41:41 matt Exp $ */
/*
* Copyright (c) 2004 Shigeyuki Fukushima.
@@ -31,14 +31,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: board_prop.c,v 1.3 2006/05/05 18:04:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: board_prop.c,v 1.4 2011/06/18 06:41:41 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
#include <prop/proplib.h>
-#include <machine/cpu.h>
+#include <powerpc/ibm4xx/cpu.h>
prop_dictionary_t board_properties;
Index: src/sys/arch/powerpc/ibm4xx/clock.c
diff -u src/sys/arch/powerpc/ibm4xx/clock.c:1.24 src/sys/arch/powerpc/ibm4xx/clock.c:1.25
--- src/sys/arch/powerpc/ibm4xx/clock.c:1.24 Tue Jan 18 01:02:53 2011
+++ src/sys/arch/powerpc/ibm4xx/clock.c Sat Jun 18 06:41:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.24 2011/01/18 01:02:53 matt Exp $ */
+/* $NetBSD: clock.c,v 1.25 2011/06/18 06:41:41 matt Exp $ */
/* $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */
/*
@@ -33,21 +33,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.24 2011/01/18 01:02:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.25 2011/06/18 06:41:41 matt Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/timetc.h>
+#include <sys/cpu.h>
#include <uvm/uvm_extern.h>
#include <prop/proplib.h>
-#include <machine/cpu.h>
-
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
+#include <powerpc/ibm4xx/cpu.h>
/*
* Initially we assume a processor with a bus frequency of 12.5 MHz.
Index: src/sys/arch/powerpc/ibm4xx/intr.c
diff -u src/sys/arch/powerpc/ibm4xx/intr.c:1.24 src/sys/arch/powerpc/ibm4xx/intr.c:1.25
--- src/sys/arch/powerpc/ibm4xx/intr.c:1.24 Mon Dec 20 00:25:41 2010
+++ src/sys/arch/powerpc/ibm4xx/intr.c Sat Jun 18 06:41:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.24 2010/12/20 00:25:41 matt Exp $ */
+/* $NetBSD: intr.c,v 1.25 2011/06/18 06:41:41 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,19 +36,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.24 2010/12/20 00:25:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.25 2011/06/18 06:41:41 matt Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/evcnt.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
-#include <machine/intr.h>
-#include <machine/psl.h>
-
-#include <powerpc/cpu.h>
+#include <powerpc/psl.h>
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
+#include <powerpc/ibm4xx/cpu.h>
/*
Index: src/sys/arch/powerpc/ibm4xx/cpu.c
diff -u src/sys/arch/powerpc/ibm4xx/cpu.c:1.29 src/sys/arch/powerpc/ibm4xx/cpu.c:1.30
--- src/sys/arch/powerpc/ibm4xx/cpu.c:1.29 Sun Jun 5 17:03:17 2011
+++ src/sys/arch/powerpc/ibm4xx/cpu.c Sat Jun 18 06:41:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.29 2011/06/05 17:03:17 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.30 2011/06/18 06:41:41 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,18 +36,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.29 2011/06/05 17:03:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.30 2011/06/18 06:41:41 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/evcnt.h>
+#include <sys/cpu.h>
#include <uvm/uvm_extern.h>
#include <prop/proplib.h>
-#include <machine/cpu.h>
+#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/dev/plbvar.h>
struct cputab {
Index: src/sys/arch/powerpc/ibm4xx/ibm40x_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm40x_machdep.c:1.5 src/sys/arch/powerpc/ibm4xx/ibm40x_machdep.c:1.6
--- src/sys/arch/powerpc/ibm4xx/ibm40x_machdep.c:1.5 Sun Dec 11 12:18:42 2005
+++ src/sys/arch/powerpc/ibm4xx/ibm40x_machdep.c Sat Jun 18 06:41:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm40x_machdep.c,v 1.5 2005/12/11 12:18:42 christos Exp $ */
+/* $NetBSD: ibm40x_machdep.c,v 1.6 2011/06/18 06:41:41 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,14 +67,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm40x_machdep.c,v 1.5 2005/12/11 12:18:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm40x_machdep.c,v 1.6 2011/06/18 06:41:41 matt Exp $");
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
#include <machine/powerpc.h>
+#include <powerpc/ibm4xx/cpu.h>
+
/*
* Global variables used here and there
*/
Index: src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c:1.14 src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c:1.15
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c:1.14 Fri Jun 17 19:03:01 2011
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c Sat Jun 18 06:41:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm4xx_autoconf.c,v 1.14 2011/06/17 19:03:01 matt Exp $ */
+/* $NetBSD: ibm4xx_autoconf.c,v 1.15 2011/06/18 06:41:41 matt Exp $ */
/* Original Tag: ibm4xxgpx_autoconf.c,v 1.2 2004/10/23 17:12:22 thorpej Exp $ */
/*
@@ -33,18 +33,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_autoconf.c,v 1.14 2011/06/17 19:03:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_autoconf.c,v 1.15 2011/06/18 06:41:41 matt Exp $");
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
#include <net/if.h>
#include <net/if_ether.h>
-#include <machine/cpu.h>
-
+#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/dev/opbvar.h>
void
Index: src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.15 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.16
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.15 Tue Jan 18 01:02:54 2011
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c Sat Jun 18 06:41:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm4xx_machdep.c,v 1.15 2011/01/18 01:02:54 matt Exp $ */
+/* $NetBSD: ibm4xx_machdep.c,v 1.16 2011/06/18 06:41:41 matt Exp $ */
/* Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.15 2011/01/18 01:02:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.16 2011/06/18 06:41:41 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -78,6 +78,7 @@
#include <sys/param.h>
#include <sys/msgbuf.h>
#include <sys/proc.h>
+#include <sys/cpu.h>
#include <uvm/uvm_extern.h>
@@ -96,9 +97,12 @@
#include <machine/powerpc.h>
#include <powerpc/pcb.h>
+#include <machine/trap.h>
+
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
-#include <machine/trap.h>
+
+#include <powerpc/ibm4xx/cpu.h>
/*
* Global variables used here and there
Index: src/sys/arch/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.66 src/sys/arch/powerpc/ibm4xx/pmap.c:1.67
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.66 Mon Feb 7 07:02:24 2011
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Sat Jun 18 06:41:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.66 2011/02/07 07:02:24 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.67 2011/06/18 06:41:41 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.66 2011/02/07 07:02:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.67 2011/06/18 06:41:41 matt Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -76,16 +76,18 @@
#include <sys/systm.h>
#include <sys/pool.h>
#include <sys/device.h>
+#include <sys/cpu.h>
#include <uvm/uvm.h>
-#include <machine/cpu.h>
#include <machine/pcb.h>
#include <machine/powerpc.h>
+#include <machine/tlb.h>
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
-#include <machine/tlb.h>
+
+#include <powerpc/ibm4xx/cpu.h>
/*
* kernmap is an array of PTEs large enough to map in
Index: src/sys/arch/powerpc/ibm4xx/trap.c
diff -u src/sys/arch/powerpc/ibm4xx/trap.c:1.60 src/sys/arch/powerpc/ibm4xx/trap.c:1.61
--- src/sys/arch/powerpc/ibm4xx/trap.c:1.60 Tue Jun 14 05:50:24 2011
+++ src/sys/arch/powerpc/ibm4xx/trap.c Sat Jun 18 06:41:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.60 2011/06/14 05:50:24 matt Exp $ */
+/* $NetBSD: trap.c,v 1.61 2011/06/18 06:41:41 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.60 2011/06/14 05:50:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.61 2011/06/18 06:41:41 matt Exp $");
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -82,6 +82,7 @@
#include <sys/savar.h>
#include <sys/userret.h>
#include <sys/kauth.h>
+#include <sys/cpu.h>
#if defined(KGDB)
#include <sys/kgdb.h>
@@ -91,18 +92,20 @@
#include <dev/cons.h>
-#include <machine/cpu.h>
-#include <machine/db_machdep.h>
#include <machine/fpu.h>
#include <machine/frame.h>
#include <machine/pcb.h>
#include <machine/psl.h>
#include <machine/trap.h>
+#include <powerpc/db_machdep.h>
#include <powerpc/spr.h>
#include <powerpc/ibm4xx/spr.h>
+
+#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/pmap.h>
#include <powerpc/ibm4xx/tlb.h>
+
#include <powerpc/fpu/fpu_extern.h>
/* These definitions should probably be somewhere else XXX */
Index: src/sys/arch/powerpc/ibm4xx/dev/com_opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.20 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.21
--- src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.20 Fri Mar 14 15:09:10 2008
+++ src/sys/arch/powerpc/ibm4xx/dev/com_opb.c Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_opb.c,v 1.20 2008/03/14 15:09:10 cube Exp $ */
+/* $NetBSD: com_opb.c,v 1.21 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -61,16 +61,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.20 2008/03/14 15:09:10 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.21 2011/06/18 06:41:42 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/tty.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
#include <lib/libkern/libkern.h>
-#include <machine/cpu.h>
+#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/dev/opbvar.h>
#include <powerpc/ibm4xx/dev/comopbvar.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c:1.13 src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c:1.14
--- src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c:1.13 Fri Jun 17 19:03:01 2011
+++ src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ecc_plb.c,v 1.13 2011/06/17 19:03:01 matt Exp $ */
+/* $NetBSD: ecc_plb.c,v 1.14 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,17 +36,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ecc_plb.c,v 1.13 2011/06/17 19:03:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ecc_plb.c,v 1.14 2011/06/18 06:41:42 matt Exp $");
#include "locators.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
+#include <sys/cpu.h>
#include <prop/proplib.h>
-#include <machine/cpu.h>
+#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/dcr4xx.h>
#include <powerpc/ibm4xx/dev/plbvar.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c:1.8 src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c:1.9
--- src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c:1.8 Fri Jun 17 19:03:02 2011
+++ src/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiic_opb.c,v 1.8 2011/06/17 19:03:02 matt Exp $ */
+/* $NetBSD: gpiic_opb.c,v 1.9 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright 2002, 2003 Wasabi Systems, Inc.
@@ -47,6 +47,7 @@
#include <dev/i2c/i2cvar.h>
#include <dev/i2c/i2c_bitbang.h>
+#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/dev/opbvar.h>
#include <powerpc/ibm4xx/dev/gpiicreg.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/ibm405gp.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/ibm405gp.c:1.4 src/sys/arch/powerpc/ibm4xx/dev/ibm405gp.c:1.5
--- src/sys/arch/powerpc/ibm4xx/dev/ibm405gp.c:1.4 Sun Dec 11 12:18:42 2005
+++ src/sys/arch/powerpc/ibm4xx/dev/ibm405gp.c Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm405gp.c,v 1.4 2005/12/11 12:18:42 christos Exp $ */
+/* $NetBSD: ibm405gp.c,v 1.5 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,14 +36,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm405gp.c,v 1.4 2005/12/11 12:18:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm405gp.c,v 1.5 2011/06/18 06:41:42 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/extent.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <dev/pci/pcivar.h>
#include <powerpc/ibm4xx/ibm405gp.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/if_emac.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.38 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.39
--- src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.38 Fri Jun 17 19:03:02 2011
+++ src/sys/arch/powerpc/ibm4xx/dev/if_emac.c Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_emac.c,v 1.38 2011/06/17 19:03:02 matt Exp $ */
+/* $NetBSD: if_emac.c,v 1.39 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.38 2011/06/17 19:03:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.39 2011/06/18 06:41:42 matt Exp $");
#include "opt_emac.h"
@@ -62,6 +62,8 @@
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <uvm/uvm_extern.h> /* for PAGE_SIZE */
@@ -72,6 +74,7 @@
#include <net/bpf.h>
+#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/dcr4xx.h>
#include <powerpc/ibm4xx/mal405gp.h>
#include <powerpc/ibm4xx/dev/emacreg.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/mal.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/mal.c:1.1 src/sys/arch/powerpc/ibm4xx/dev/mal.c:1.2
--- src/sys/arch/powerpc/ibm4xx/dev/mal.c:1.1 Thu Mar 18 13:47:04 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/mal.c Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mal.c,v 1.1 2010/03/18 13:47:04 kiyohara Exp $ */
+/* $NetBSD: mal.c,v 1.2 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,14 +26,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mal.c,v 1.1 2010/03/18 13:47:04 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mal.c,v 1.2 2011/06/18 06:41:42 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
-#include <machine/intr.h>
-
-#include <powerpc/cpu.h>
+#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/dcr4xx.h>
#include <powerpc/ibm4xx/dev/if_emacvar.h>
#include <powerpc/ibm4xx/dev/malvar.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.25 src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.26
--- src/sys/arch/powerpc/ibm4xx/dev/opb.c:1.25 Thu Mar 18 13:47:04 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/opb.c Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: opb.c,v 1.25 2010/03/18 13:47:04 kiyohara Exp $ */
+/* $NetBSD: opb.c,v 1.26 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright 2001,2002 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opb.c,v 1.25 2010/03/18 13:47:04 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opb.c,v 1.26 2011/06/18 06:41:42 matt Exp $");
#include "locators.h"
#include "opt_emac.h"
@@ -75,16 +75,19 @@
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/extent.h>
+#include <sys/cpu.h>
#include <powerpc/ibm4xx/cpu.h>
+#include <powerpc/ibm4xx/dcr4xx.h>
+
#include <powerpc/ibm4xx/dev/opbreg.h>
#include <powerpc/ibm4xx/dev/opbvar.h>
#include <powerpc/ibm4xx/dev/plbvar.h>
#include <powerpc/ibm4xx/dev/rgmiireg.h>
#include <powerpc/ibm4xx/dev/zmiireg.h>
-#include <powerpc/ibm4xx/dcr4xx.h>
-#include <powerpc/ibm4xx/spr.h>
+
#include <powerpc/spr.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/ibm405gp.h>
#include <powerpc/ibm4xx/amcc405ex.h>
Index: src/sys/arch/powerpc/ibm4xx/dev/opbvar.h
diff -u src/sys/arch/powerpc/ibm4xx/dev/opbvar.h:1.5 src/sys/arch/powerpc/ibm4xx/dev/opbvar.h:1.6
--- src/sys/arch/powerpc/ibm4xx/dev/opbvar.h:1.5 Thu Mar 18 13:47:04 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/opbvar.h Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: opbvar.h,v 1.5 2010/03/18 13:47:04 kiyohara Exp $ */
+/* $NetBSD: opbvar.h,v 1.6 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct opb_softc {
device_t sc_dev;
Index: src/sys/arch/powerpc/ibm4xx/dev/plbvar.h
diff -u src/sys/arch/powerpc/ibm4xx/dev/plbvar.h:1.5 src/sys/arch/powerpc/ibm4xx/dev/plbvar.h:1.6
--- src/sys/arch/powerpc/ibm4xx/dev/plbvar.h:1.5 Thu Mar 18 13:47:04 2010
+++ src/sys/arch/powerpc/ibm4xx/dev/plbvar.h Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: plbvar.h,v 1.5 2010/03/18 13:47:04 kiyohara Exp $ */
+/* $NetBSD: plbvar.h,v 1.6 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct plb_dev {
int plb_pvr;
Index: src/sys/arch/powerpc/ibm4xx/dev/plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.19 src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.20
--- src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.19 Mon Jun 6 16:42:18 2011
+++ src/sys/arch/powerpc/ibm4xx/dev/plb.c Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.19 2011/06/06 16:42:18 matt Exp $ */
+/* $NetBSD: plb.c,v 1.20 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,24 +66,25 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.19 2011/06/06 16:42:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.20 2011/06/18 06:41:42 matt Exp $");
#include "locators.h"
#include "emac.h"
+#define _POWERPC_BUS_DMA_PRIVATE
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/extent.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
-#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-
-#include <powerpc/cpu.h>
+#include <powerpc/ibm4xx/cpu.h>
+#include <powerpc/ibm4xx/spr.h>
#include <powerpc/ibm4xx/dev/malvar.h>
#include <powerpc/ibm4xx/dev/plbvar.h>
-#include <powerpc/ibm4xx/spr.h>
/*
* The devices that attach to the processor local bus on the 405GP CPU.
Index: src/sys/arch/powerpc/ibm4xx/openbios/openbios.c
diff -u src/sys/arch/powerpc/ibm4xx/openbios/openbios.c:1.4 src/sys/arch/powerpc/ibm4xx/openbios/openbios.c:1.5
--- src/sys/arch/powerpc/ibm4xx/openbios/openbios.c:1.4 Thu Feb 22 16:57:57 2007
+++ src/sys/arch/powerpc/ibm4xx/openbios/openbios.c Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: openbios.c,v 1.4 2007/02/22 16:57:57 thorpej Exp $ */
+/* $NetBSD: openbios.c,v 1.5 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright (c) 2004 Shigeyuki Fukushima.
@@ -31,13 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openbios.c,v 1.4 2007/02/22 16:57:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openbios.c,v 1.5 2011/06/18 06:41:42 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
-#include <machine/cpu.h>
-
+#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/openbios.h>
/*
Index: src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c:1.8 src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c:1.9
--- src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c:1.8 Fri Jun 17 19:03:02 2011
+++ src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c Sat Jun 18 06:41:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.8 2011/06/17 19:03:02 matt Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.9 2011/06/18 06:41:42 matt Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.8 2011/06/17 19:03:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.9 2011/06/18 06:41:42 matt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -52,12 +52,11 @@
#include <sys/errno.h>
#include <sys/device.h>
#include <sys/extent.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
-
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcidevs.h>
Index: src/sys/arch/powerpc/isa/isa_machdep_common.c
diff -u src/sys/arch/powerpc/isa/isa_machdep_common.c:1.6 src/sys/arch/powerpc/isa/isa_machdep_common.c:1.7
--- src/sys/arch/powerpc/isa/isa_machdep_common.c:1.6 Fri Jun 17 19:05:20 2011
+++ src/sys/arch/powerpc/isa/isa_machdep_common.c Sat Jun 18 06:41:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep_common.c,v 1.6 2011/06/17 19:05:20 matt Exp $ */
+/* $NetBSD: isa_machdep_common.c,v 1.7 2011/06/18 06:41:43 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,15 +30,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep_common.c,v 1.6 2011/06/17 19:05:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep_common.c,v 1.7 2011/06/18 06:41:43 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/device.h>
+#include <sys/intr.h>
#include <machine/pio.h>
-#include <machine/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/powerpc/marvell/pic_discovery.c
diff -u src/sys/arch/powerpc/marvell/pic_discovery.c:1.3 src/sys/arch/powerpc/marvell/pic_discovery.c:1.4
--- src/sys/arch/powerpc/marvell/pic_discovery.c:1.3 Wed Apr 28 13:51:55 2010
+++ src/sys/arch/powerpc/marvell/pic_discovery.c Sat Jun 18 06:41:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_discovery.c,v 1.3 2010/04/28 13:51:55 kiyohara Exp $ */
+/* $NetBSD: pic_discovery.c,v 1.4 2011/06/18 06:41:43 matt Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -38,13 +38,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_discovery.c,v 1.3 2010/04/28 13:51:55 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_discovery.c,v 1.4 2011/06/18 06:41:43 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/malloc.h>
-
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <powerpc/pic/picvar.h>
Index: src/sys/arch/powerpc/pci/pci_machdep_common.c
diff -u src/sys/arch/powerpc/pci/pci_machdep_common.c:1.11 src/sys/arch/powerpc/pci/pci_machdep_common.c:1.12
--- src/sys/arch/powerpc/pci/pci_machdep_common.c:1.11 Fri Jun 17 19:03:01 2011
+++ src/sys/arch/powerpc/pci/pci_machdep_common.c Sat Jun 18 06:41:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_common.c,v 1.11 2011/06/17 19:03:01 matt Exp $ */
+/* $NetBSD: pci_machdep_common.c,v 1.12 2011/06/18 06:41:43 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,7 +37,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep_common.c,v 1.11 2011/06/17 19:03:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep_common.c,v 1.12 2011/06/18 06:41:43 matt Exp $");
+
+#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/types.h>
#include <sys/param.h>
@@ -47,13 +49,11 @@
#include <sys/extent.h>
#include <sys/device.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
-#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/intr.h>
-
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcidevs.h>
Index: src/sys/arch/powerpc/pci/pci_machdep_ofw.c
diff -u src/sys/arch/powerpc/pci/pci_machdep_ofw.c:1.15 src/sys/arch/powerpc/pci/pci_machdep_ofw.c:1.16
--- src/sys/arch/powerpc/pci/pci_machdep_ofw.c:1.15 Mon Apr 4 20:37:53 2011
+++ src/sys/arch/powerpc/pci/pci_machdep_ofw.c Sat Jun 18 06:41:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_ofw.c,v 1.15 2011/04/04 20:37:53 dyoung Exp $ */
+/* $NetBSD: pci_machdep_ofw.c,v 1.16 2011/06/18 06:41:43 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep_ofw.c,v 1.15 2011/04/04 20:37:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep_ofw.c,v 1.16 2011/06/18 06:41:43 matt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -43,14 +43,13 @@
#include <sys/errno.h>
#include <sys/device.h>
#include <sys/malloc.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-
#include <machine/autoconf.h>
#include <machine/pio.h>
-#include <machine/intr.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/arch/powerpc/pci/pciconf_indirect.c
diff -u src/sys/arch/powerpc/pci/pciconf_indirect.c:1.4 src/sys/arch/powerpc/pci/pciconf_indirect.c:1.5
--- src/sys/arch/powerpc/pci/pciconf_indirect.c:1.4 Fri Jun 17 19:03:01 2011
+++ src/sys/arch/powerpc/pci/pciconf_indirect.c Sat Jun 18 06:41:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pciconf_indirect.c,v 1.4 2011/06/17 19:03:01 matt Exp $ */
+/* $NetBSD: pciconf_indirect.c,v 1.5 2011/06/18 06:41:43 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciconf_indirect.c,v 1.4 2011/06/17 19:03:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciconf_indirect.c,v 1.5 2011/06/18 06:41:43 matt Exp $");
+
+#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/types.h>
#include <sys/param.h>
@@ -43,12 +45,11 @@
#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/device.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
-#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/intr.h>
#include <machine/pio.h>
#if NISA > 0
Index: src/sys/arch/powerpc/pci/pciconf_ofmethod.c
diff -u src/sys/arch/powerpc/pci/pciconf_ofmethod.c:1.3 src/sys/arch/powerpc/pci/pciconf_ofmethod.c:1.4
--- src/sys/arch/powerpc/pci/pciconf_ofmethod.c:1.3 Fri Jun 17 19:03:01 2011
+++ src/sys/arch/powerpc/pci/pciconf_ofmethod.c Sat Jun 18 06:41:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pciconf_ofmethod.c,v 1.3 2011/06/17 19:03:01 matt Exp $ */
+/* $NetBSD: pciconf_ofmethod.c,v 1.4 2011/06/18 06:41:43 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciconf_ofmethod.c,v 1.3 2011/06/17 19:03:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciconf_ofmethod.c,v 1.4 2011/06/18 06:41:43 matt Exp $");
+
+#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/types.h>
#include <sys/param.h>
@@ -43,13 +45,13 @@
#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/device.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
-#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/intr.h>
#include <machine/pio.h>
+
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_pci.h>
Index: src/sys/arch/powerpc/pic/i8259_common.c
diff -u src/sys/arch/powerpc/pic/i8259_common.c:1.4 src/sys/arch/powerpc/pic/i8259_common.c:1.5
--- src/sys/arch/powerpc/pic/i8259_common.c:1.4 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/pic/i8259_common.c Sat Jun 18 06:41:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: i8259_common.c,v 1.4 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: i8259_common.c,v 1.5 2011/06/18 06:41:43 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,16 +30,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i8259_common.c,v 1.4 2008/04/28 20:23:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i8259_common.c,v 1.5 2011/06/18 06:41:43 matt Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
#include <machine/pio.h>
-#include <machine/intr.h>
#include <arch/powerpc/pic/picvar.h>
Index: src/sys/arch/powerpc/pic/pic_prepivr.c
diff -u src/sys/arch/powerpc/pic/pic_prepivr.c:1.4 src/sys/arch/powerpc/pic/pic_prepivr.c:1.5
--- src/sys/arch/powerpc/pic/pic_prepivr.c:1.4 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/pic/pic_prepivr.c Sat Jun 18 06:41:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_prepivr.c,v 1.4 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: pic_prepivr.c,v 1.5 2011/06/18 06:41:43 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,16 +30,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_prepivr.c,v 1.4 2008/04/28 20:23:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_prepivr.c,v 1.5 2011/06/18 06:41:43 matt Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
#include <machine/pio.h>
-#include <machine/intr.h>
#include <arch/powerpc/pic/picvar.h>
Index: src/sys/arch/powerpc/pic/pic_i8259.c
diff -u src/sys/arch/powerpc/pic/pic_i8259.c:1.3 src/sys/arch/powerpc/pic/pic_i8259.c:1.4
--- src/sys/arch/powerpc/pic/pic_i8259.c:1.3 Mon Apr 28 20:23:32 2008
+++ src/sys/arch/powerpc/pic/pic_i8259.c Sat Jun 18 06:41:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_i8259.c,v 1.3 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: pic_i8259.c,v 1.4 2011/06/18 06:41:43 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,16 +30,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_i8259.c,v 1.3 2008/04/28 20:23:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_i8259.c,v 1.4 2011/06/18 06:41:43 matt Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
#include <machine/pio.h>
-#include <machine/intr.h>
#include <arch/powerpc/pic/picvar.h>
Index: src/sys/arch/powerpc/pic/picvar.h
diff -u src/sys/arch/powerpc/pic/picvar.h:1.8 src/sys/arch/powerpc/pic/picvar.h:1.9
--- src/sys/arch/powerpc/pic/picvar.h:1.8 Fri Jun 17 05:15:23 2011
+++ src/sys/arch/powerpc/pic/picvar.h Sat Jun 18 06:41:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: picvar.h,v 1.8 2011/06/17 05:15:23 matt Exp $ */
+/* $NetBSD: picvar.h,v 1.9 2011/06/18 06:41:44 matt Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,12 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: picvar.h,v 1.8 2011/06/17 05:15:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: picvar.h,v 1.9 2011/06/18 06:41:44 matt Exp $");
#ifndef PIC_VAR_H
#define PIC_VAR_H
-#include <machine/intr.h>
+#include <sys/intr.h>
struct pic_ops {
void *pic_cookie; /* private stuff / hardware info */
Index: src/sys/arch/powerpc/powerpc/bus_dma.c
diff -u src/sys/arch/powerpc/powerpc/bus_dma.c:1.40 src/sys/arch/powerpc/powerpc/bus_dma.c:1.41
--- src/sys/arch/powerpc/powerpc/bus_dma.c:1.40 Mon Jun 13 21:19:38 2011
+++ src/sys/arch/powerpc/powerpc/bus_dma.c Sat Jun 18 06:41:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.40 2011/06/13 21:19:38 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.41 2011/06/18 06:41:44 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.40 2011/06/13 21:19:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.41 2011/06/18 06:41:44 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,12 +41,11 @@
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/mbuf.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
-
#ifdef PPC_BOOKE
#define EIEIO __asm volatile("mbar\t0")
#define SYNC __asm volatile("msync")
Index: src/sys/arch/powerpc/powerpc/db_interface.c
diff -u src/sys/arch/powerpc/powerpc/db_interface.c:1.45 src/sys/arch/powerpc/powerpc/db_interface.c:1.46
--- src/sys/arch/powerpc/powerpc/db_interface.c:1.45 Tue Jan 18 01:02:55 2011
+++ src/sys/arch/powerpc/powerpc/db_interface.c Sat Jun 18 06:41:44 2011
@@ -1,8 +1,8 @@
-/* $NetBSD: db_interface.c,v 1.45 2011/01/18 01:02:55 matt Exp $ */
+/* $NetBSD: db_interface.c,v 1.46 2011/06/18 06:41:44 matt Exp $ */
/* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.45 2011/01/18 01:02:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.46 2011/06/18 06:41:44 matt Exp $");
#define USERACC
@@ -13,21 +13,22 @@
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
#include <dev/cons.h>
#include <machine/db_machdep.h>
#include <machine/frame.h>
#include <powerpc/spr.h>
-#include <powerpc/cpu.h>
-#include <powerpc/bat.h>
#include <powerpc/pte.h>
#if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
#include <powerpc/oea/spr.h>
+#include <powerpc/oea/bat.h>
#endif
#ifdef PPC_IBM4XX
+#include <powerpc/ibm4xx/cpu.h>
#include <powerpc/ibm4xx/spr.h>
#include <machine/tlb.h>
#include <uvm/uvm_extern.h>
