[src/trunk]: src/sys/arch Cleanup powerpc param.h. If compiling a MODULE, ig...

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

details:   https://anonhg.NetBSD.org/src/rev/f91424656fdd
branches:  trunk
changeset: 766280:f91424656fdd
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 20 06:29:53 2011 +0000

description:
Cleanup powerpc param.h.  If compiling a MODULE, ignore port-specific stuff.
Only include <machine/cpu.h> in <powerpc/param.h> at the end.

diffstat:

 sys/arch/amigappc/include/param.h  |  14 +++++---------
 sys/arch/bebox/include/param.h     |  23 ++++++++---------------
 sys/arch/evbppc/include/param.h    |   9 ++++++---
 sys/arch/ibmnws/include/param.h    |  14 +++++---------
 sys/arch/macppc/include/param.h    |  28 +++++++++++++---------------
 sys/arch/mvmeppc/include/param.h   |  14 +++++---------
 sys/arch/ofppc/include/param.h     |  11 ++++++++---
 sys/arch/powerpc/include/param.h   |   9 +++++----
 sys/arch/prep/include/param.h      |  22 +++++++++-------------
 sys/arch/rs6000/include/param.h    |  14 +++++---------
 sys/arch/sandpoint/include/param.h |  15 +++++----------
 11 files changed, 74 insertions(+), 99 deletions(-)

diffs (truncated from 371 to 300 lines):

diff -r 16dfbabc1bea -r f91424656fdd sys/arch/amigappc/include/param.h
--- a/sys/arch/amigappc/include/param.h Mon Jun 20 06:24:30 2011 +0000
+++ b/sys/arch/amigappc/include/param.h Mon Jun 20 06:29:53 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.12 2009/07/21 09:49:16 phx Exp $   */
+/*     $NetBSD: param.h,v 1.13 2011/06/20 06:29:53 matt Exp $  */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,19 +31,15 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef _KERNEL
-#ifndef        _LOCORE
-#include <machine/cpu.h>
-#endif /* _LOCORE */
-#endif
-
 /*
  * Machine dependent constants for PowerPC (32-bit only currently)
  */
-#define        MACHINE         "amigappc"
+#if defined(_KERNEL) && !defined(_MODULE)
 
+#define        MACHINE                 "amigappc"
+#define        KERNBASE                0x8000000 /* XXX valid for CyberstormPPC */
 #define        __NO_FIXED_MSGBUF
 
-#define        KERNBASE        0x8000000       /* XXX valid for CyberstormPPC */
+#endif /* _KERNEL && !_MODULE */
 
 #include <powerpc/param.h>
diff -r 16dfbabc1bea -r f91424656fdd sys/arch/bebox/include/param.h
--- a/sys/arch/bebox/include/param.h    Mon Jun 20 06:24:30 2011 +0000
+++ b/sys/arch/bebox/include/param.h    Mon Jun 20 06:29:53 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.13 2011/06/12 07:04:55 kiyohara Exp $      */
+/*     $NetBSD: param.h,v 1.14 2011/06/20 06:29:53 matt Exp $  */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,25 +31,18 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef _KERNEL
-#ifndef        _LOCORE
-#include <machine/cpu.h>
-#endif /* _LOCORE */
-#endif
-
-
 /*
  * Machine dependent constants for PowerPC (32-bit only currently)
  */
-#ifdef _KERNEL
-#define        MACHINE         "bebox"
-#endif
+#if defined(_KERNEL) && !defined(_MODULE)
 
+#define        MACHINE                 "bebox"
+#define        KERNBASE                0x3100  /* EXC_AST + 0x100 */
 #define        __NO_FIXED_MSGBUF
 
-#define        KERNBASE        0x3100
-
-#include <powerpc/param.h>
-
 /* at this offset we mmap() the PCI IO range in display drivers */
 #define PCI_MAGIC_IO_RANGE     0xf2000000
+
+#endif /* _KERNEL && !_MODULE */
+
+#include <powerpc/param.h>
diff -r 16dfbabc1bea -r f91424656fdd sys/arch/evbppc/include/param.h
--- a/sys/arch/evbppc/include/param.h   Mon Jun 20 06:24:30 2011 +0000
+++ b/sys/arch/evbppc/include/param.h   Mon Jun 20 06:29:53 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.2 2003/03/04 07:50:59 matt Exp $   */
+/*     $NetBSD: param.h,v 1.3 2011/06/20 06:29:53 matt Exp $   */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -34,7 +34,10 @@
 /*
  * Machine dependent constants for PowerPC (32-bit only currently)
  */
-#define        MACHINE         "evbppc"
-#define        MID_MACHINE     MID_POWERPC
+#if defined(_KERNEL) && !defined(_MODULE)
+
+#define        MACHINE                 "evbppc"
+
+#endif /* _KERNEL && !_MODULE */
 
 #include <powerpc/param.h>
diff -r 16dfbabc1bea -r f91424656fdd sys/arch/ibmnws/include/param.h
--- a/sys/arch/ibmnws/include/param.h   Mon Jun 20 06:24:30 2011 +0000
+++ b/sys/arch/ibmnws/include/param.h   Mon Jun 20 06:29:53 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.2 2005/12/11 12:17:50 christos Exp $       */
+/*     $NetBSD: param.h,v 1.3 2011/06/20 06:29:53 matt Exp $   */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,19 +31,15 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef _KERNEL
-#ifndef        _LOCORE
-#include <machine/cpu.h>
-#endif /* _LOCORE */
-#endif
-
 /*
  * Machine dependent constants for PowerPC (32-bit only currently)
  */
-#define        MACHINE         "ibmnws"
+#if defined(_KERNEL) && !defined(_MODULE)
 
+#define        MACHINE                 "ibmnws"
+#define        KERNBASE                0x100000
 #define        __NO_FIXED_MSGBUF
 
-#define        KERNBASE        0x100000
+#endif /* _KERNEL && !_MODULE */
 
 #include <powerpc/param.h>
diff -r 16dfbabc1bea -r f91424656fdd sys/arch/macppc/include/param.h
--- a/sys/arch/macppc/include/param.h   Mon Jun 20 06:24:30 2011 +0000
+++ b/sys/arch/macppc/include/param.h   Mon Jun 20 06:29:53 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.16 2008/02/28 00:18:08 macallan Exp $      */
+/*     $NetBSD: param.h,v 1.17 2011/06/20 06:29:53 matt Exp $  */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,33 +31,31 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef _KERNEL
-#ifndef        _LOCORE
-#include <machine/cpu.h>
-#endif /* _LOCORE */
-#endif
-
 /*
  * Machine dependent constants for PowerPC (32-bit only currently)
  */
-#define        MACHINE         "macppc"
-#define        KERNBASE        0x100000
+#if defined(_KERNEL) && !defined(_MODULE)
+
+#define        MACHINE                 "macppc"
+#define        KERNBASE                0x100000
 
 /*
  * 4KB isn't enough for a full boot message for a macppc system anymore
  */
 #ifndef MSGBUFSIZE
-#define        MSGBUFSIZE      (3*NBPG)
+#define        MSGBUFSIZE              (3*NBPG)
 #endif
 
 /*
  * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
  * logical pages.
  */
-#define        NKMEMPAGES_MIN_DEFAULT  ((8 * 1024 * 1024) >> PAGE_SHIFT)
-#define        NKMEMPAGES_MAX_DEFAULT  ((48 * 1024 * 1024) >> PAGE_SHIFT)
+#define        NKMEMPAGES_MIN_DEFAULT          ((8 * 1024 * 1024) >> PAGE_SHIFT)
+#define        NKMEMPAGES_MAX_DEFAULT          ((48 * 1024 * 1024) >> PAGE_SHIFT)
+
+/* at this offset we mmap() the PCI IO range in display drivers */
+#define PCI_MAGIC_IO_RANGE             0xf2000000
+
+#endif /* _KERNEL && !_MODULE */
 
 #include <powerpc/param.h>
-
-/* at this offset we mmap() the PCI IO range in display drivers */
-#define PCI_MAGIC_IO_RANGE     0xf2000000
diff -r 16dfbabc1bea -r f91424656fdd sys/arch/mvmeppc/include/param.h
--- a/sys/arch/mvmeppc/include/param.h  Mon Jun 20 06:24:30 2011 +0000
+++ b/sys/arch/mvmeppc/include/param.h  Mon Jun 20 06:29:53 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.3 2002/03/09 23:35:58 chs Exp $    */
+/*     $NetBSD: param.h,v 1.4 2011/06/20 06:29:53 matt Exp $   */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,18 +31,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef _KERNEL
-#ifndef        _LOCORE
-#include <machine/cpu.h>
-#endif /* _LOCORE */
-#endif /* _KERNEL */
-
+#if defined(_KERNEL) && !defined(_MODULE)
 /*
  * Machine dependent constants for PowerPC (32-bit only currently)
  */
-#define        MACHINE         "mvmeppc"
+#define        MACHINE                 "mvmeppc"
+#define        KERNBASE                0x4000
 
-#define        KERNBASE        0x4000
+#endif /* _KERNEL && !_MODULE */
 
 #include <powerpc/param.h>
 
diff -r 16dfbabc1bea -r f91424656fdd sys/arch/ofppc/include/param.h
--- a/sys/arch/ofppc/include/param.h    Mon Jun 20 06:24:30 2011 +0000
+++ b/sys/arch/ofppc/include/param.h    Mon Jun 20 06:29:53 2011 +0000
@@ -1,7 +1,12 @@
-/*     $NetBSD: param.h,v 1.11 2008/03/07 17:13:49 phx Exp $   */
+/*     $NetBSD: param.h,v 1.12 2011/06/20 06:29:53 matt Exp $  */
 
-#define MACHINE                "ofppc"
-#include <powerpc/param.h>
+#if defined(_KERNEL) && !defined(_MODULE)
+
+#define MACHINE                        "ofppc"
 
 /* at this offset we mmap() the PCI IO range in display drivers */
 #define PCI_MAGIC_IO_RANGE      0xfeff0000
+
+#endif /* _KERNEL && !_MODULE */
+
+#include <powerpc/param.h>
diff -r 16dfbabc1bea -r f91424656fdd sys/arch/powerpc/include/param.h
--- a/sys/arch/powerpc/include/param.h  Mon Jun 20 06:24:30 2011 +0000
+++ b/sys/arch/powerpc/include/param.h  Mon Jun 20 06:29:53 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.23 2011/03/05 14:27:48 matt Exp $  */
+/*     $NetBSD: param.h,v 1.24 2011/06/20 06:29:54 matt Exp $  */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -38,9 +38,6 @@
 #if defined(_KERNEL_OPT)
 #include "opt_ppcarch.h"
 #endif
-#ifndef        _LOCORE
-#include <machine/cpu.h>
-#endif /* _LOCORE */
 #endif
 
 /*
@@ -117,4 +114,8 @@
 #define        NKMEMPAGES_MAX_DEFAULT  ((128 * 1024 * 1024) >> PAGE_SHIFT)
 #endif
 
+#if defined(_KERNEL) && !defined(_LOCORE)
+#include <machine/cpu.h>
+#endif /* _KERNEL && !_LOCORE */
+
 #endif /* _POWERPC_PARAM_H_ */
diff -r 16dfbabc1bea -r f91424656fdd sys/arch/prep/include/param.h
--- a/sys/arch/prep/include/param.h     Mon Jun 20 06:24:30 2011 +0000
+++ b/sys/arch/prep/include/param.h     Mon Jun 20 06:29:53 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.5 2010/07/12 07:54:13 kiyohara Exp $       */
+/*     $NetBSD: param.h,v 1.6 2011/06/20 06:29:54 matt Exp $   */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,22 +31,18 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef _KERNEL
-#ifndef        _LOCORE
-#include <machine/cpu.h>
-#endif /* _LOCORE */
-#endif
-
 /*
  * Machine dependent constants for PowerPC (32-bit only currently)
  */
-#define        MACHINE         "prep"
-
-#define        __NO_FIXED_MSGBUF
+#if defined(_KERNEL) && !defined(_MODULE)
 
-#define        KERNBASE        0x100000
-
-#include <powerpc/param.h>
+#define        MACHINE                 "prep"
+#define        KERNBASE                0x100000
+#define        __NO_FIXED_MSGBUF
 
 /* at this offset we mmap() the PCI IO range in display drivers */
 #define PCI_MAGIC_IO_RANGE     0xf2000000