Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/powerpc Use <sys/foo.h> instead of <machine/foo.h> ...
details: https://anonhg.NetBSD.org/src/rev/82a33d1b2e53
branches: trunk
changeset: 766187:82a33d1b2e53
user: matt <matt%NetBSD.org@localhost>
date: Sat Jun 18 06:41:41 2011 +0000
description:
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.
diffstat:
sys/arch/powerpc/ibm4xx/board_prop.c | 7 +-
sys/arch/powerpc/ibm4xx/clock.c | 8 +-
sys/arch/powerpc/ibm4xx/cpu.c | 7 +-
sys/arch/powerpc/ibm4xx/dev/com_opb.c | 7 +-
sys/arch/powerpc/ibm4xx/dev/ecc_plb.c | 7 +-
sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c | 3 +-
sys/arch/powerpc/ibm4xx/dev/ibm405gp.c | 6 +-
sys/arch/powerpc/ibm4xx/dev/if_emac.c | 7 +-
sys/arch/powerpc/ibm4xx/dev/mal.c | 10 +-
sys/arch/powerpc/ibm4xx/dev/opb.c | 11 +-
sys/arch/powerpc/ibm4xx/dev/opbvar.h | 4 +-
sys/arch/powerpc/ibm4xx/dev/plb.c | 15 +-
sys/arch/powerpc/ibm4xx/dev/plbvar.h | 4 +-
sys/arch/powerpc/ibm4xx/ibm40x_machdep.c | 7 +-
sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c | 8 +-
sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c | 10 +-
sys/arch/powerpc/ibm4xx/intr.c | 12 +-
sys/arch/powerpc/ibm4xx/openbios/openbios.c | 8 +-
sys/arch/powerpc/ibm4xx/pci/pci_machdep.c | 9 +-
sys/arch/powerpc/ibm4xx/pmap.c | 10 +-
sys/arch/powerpc/ibm4xx/trap.c | 11 +-
sys/arch/powerpc/isa/isa_machdep_common.c | 6 +-
sys/arch/powerpc/marvell/pic_discovery.c | 7 +-
sys/arch/powerpc/pci/pci_machdep_common.c | 12 +-
sys/arch/powerpc/pci/pci_machdep_ofw.c | 9 +-
sys/arch/powerpc/pci/pciconf_indirect.c | 11 +-
sys/arch/powerpc/pci/pciconf_ofmethod.c | 12 +-
sys/arch/powerpc/pic/i8259_common.c | 6 +-
sys/arch/powerpc/pic/pic_i8259.c | 6 +-
sys/arch/powerpc/pic/pic_prepivr.c | 6 +-
sys/arch/powerpc/pic/pic_soft.c | 152 ----------------------------
sys/arch/powerpc/pic/picvar.h | 6 +-
sys/arch/powerpc/powerpc/bus_dma.c | 9 +-
sys/arch/powerpc/powerpc/db_interface.c | 9 +-
34 files changed, 147 insertions(+), 275 deletions(-)
diffs (truncated from 1185 to 300 lines):
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/board_prop.c
--- a/sys/arch/powerpc/ibm4xx/board_prop.c Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/board_prop.c Sat Jun 18 06:41:41 2011 +0000
@@ -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;
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/clock.c
--- a/sys/arch/powerpc/ibm4xx/clock.c Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/clock.c Sat Jun 18 06:41:41 2011 +0000
@@ -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.
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/cpu.c
--- a/sys/arch/powerpc/ibm4xx/cpu.c Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/cpu.c Sat Jun 18 06:41:41 2011 +0000
@@ -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 {
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/dev/com_opb.c
--- a/sys/arch/powerpc/ibm4xx/dev/com_opb.c Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/com_opb.c Sat Jun 18 06:41:41 2011 +0000
@@ -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>
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/dev/ecc_plb.c
--- a/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c Sat Jun 18 06:41:41 2011 +0000
@@ -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>
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c
--- a/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/gpiic_opb.c Sat Jun 18 06:41:41 2011 +0000
@@ -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>
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/dev/ibm405gp.c
--- a/sys/arch/powerpc/ibm4xx/dev/ibm405gp.c Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/ibm405gp.c Sat Jun 18 06:41:41 2011 +0000
@@ -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>
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/dev/if_emac.c
--- a/sys/arch/powerpc/ibm4xx/dev/if_emac.c Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/if_emac.c Sat Jun 18 06:41:41 2011 +0000
@@ -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>
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/dev/mal.c
--- a/sys/arch/powerpc/ibm4xx/dev/mal.c Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/mal.c Sat Jun 18 06:41:41 2011 +0000
@@ -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>
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/dev/opb.c
--- a/sys/arch/powerpc/ibm4xx/dev/opb.c Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/opb.c Sat Jun 18 06:41:41 2011 +0000
@@ -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/spr.h>
#include <powerpc/ibm4xx/spr.h>
-#include <powerpc/spr.h>
#include <powerpc/ibm4xx/ibm405gp.h>
#include <powerpc/ibm4xx/amcc405ex.h>
diff -r 468778cc19cc -r 82a33d1b2e53 sys/arch/powerpc/ibm4xx/dev/opbvar.h
--- a/sys/arch/powerpc/ibm4xx/dev/opbvar.h Sat Jun 18 06:37:38 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/opbvar.h Sat Jun 18 06:41:41 2011 +0000
Home |
Main Index |
Thread Index |
Old Index