Module Name: src
Committed By: matt
Date: Mon Jun 20 06:29:54 UTC 2011
Modified Files:
src/sys/arch/amigappc/include: param.h
src/sys/arch/bebox/include: param.h
src/sys/arch/evbppc/include: param.h
src/sys/arch/ibmnws/include: param.h
src/sys/arch/macppc/include: param.h
src/sys/arch/mvmeppc/include: param.h
src/sys/arch/ofppc/include: param.h
src/sys/arch/powerpc/include: param.h
src/sys/arch/prep/include: param.h
src/sys/arch/rs6000/include: param.h
src/sys/arch/sandpoint/include: param.h
Log Message:
Cleanup powerpc param.h. If compiling a MODULE, ignore port-specific stuff.
Only include <machine/cpu.h> in <powerpc/param.h> at the end.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amigappc/include/param.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/bebox/include/param.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/include/param.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ibmnws/include/param.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/include/param.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mvmeppc/include/param.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ofppc/include/param.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/include/param.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/prep/include/param.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/rs6000/include/param.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/include/param.h
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/amigappc/include/param.h
diff -u src/sys/arch/amigappc/include/param.h:1.12 src/sys/arch/amigappc/include/param.h:1.13
--- src/sys/arch/amigappc/include/param.h:1.12 Tue Jul 21 09:49:16 2009
+++ src/sys/arch/amigappc/include/param.h Mon Jun 20 06:29:53 2011
@@ -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>
Index: src/sys/arch/bebox/include/param.h
diff -u src/sys/arch/bebox/include/param.h:1.13 src/sys/arch/bebox/include/param.h:1.14
--- src/sys/arch/bebox/include/param.h:1.13 Sun Jun 12 07:04:55 2011
+++ src/sys/arch/bebox/include/param.h Mon Jun 20 06:29:53 2011
@@ -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>
Index: src/sys/arch/evbppc/include/param.h
diff -u src/sys/arch/evbppc/include/param.h:1.2 src/sys/arch/evbppc/include/param.h:1.3
--- src/sys/arch/evbppc/include/param.h:1.2 Tue Mar 4 07:50:59 2003
+++ src/sys/arch/evbppc/include/param.h Mon Jun 20 06:29:53 2011
@@ -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>
Index: src/sys/arch/ibmnws/include/param.h
diff -u src/sys/arch/ibmnws/include/param.h:1.2 src/sys/arch/ibmnws/include/param.h:1.3
--- src/sys/arch/ibmnws/include/param.h:1.2 Sun Dec 11 12:17:50 2005
+++ src/sys/arch/ibmnws/include/param.h Mon Jun 20 06:29:53 2011
@@ -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>
Index: src/sys/arch/macppc/include/param.h
diff -u src/sys/arch/macppc/include/param.h:1.16 src/sys/arch/macppc/include/param.h:1.17
--- src/sys/arch/macppc/include/param.h:1.16 Thu Feb 28 00:18:08 2008
+++ src/sys/arch/macppc/include/param.h Mon Jun 20 06:29:53 2011
@@ -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)
-
-#include <powerpc/param.h>
+#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
+#define PCI_MAGIC_IO_RANGE 0xf2000000
+
+#endif /* _KERNEL && !_MODULE */
+
+#include <powerpc/param.h>
Index: src/sys/arch/mvmeppc/include/param.h
diff -u src/sys/arch/mvmeppc/include/param.h:1.3 src/sys/arch/mvmeppc/include/param.h:1.4
--- src/sys/arch/mvmeppc/include/param.h:1.3 Sat Mar 9 23:35:58 2002
+++ src/sys/arch/mvmeppc/include/param.h Mon Jun 20 06:29:53 2011
@@ -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>
Index: src/sys/arch/ofppc/include/param.h
diff -u src/sys/arch/ofppc/include/param.h:1.11 src/sys/arch/ofppc/include/param.h:1.12
--- src/sys/arch/ofppc/include/param.h:1.11 Fri Mar 7 17:13:49 2008
+++ src/sys/arch/ofppc/include/param.h Mon Jun 20 06:29:53 2011
@@ -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>
Index: src/sys/arch/powerpc/include/param.h
diff -u src/sys/arch/powerpc/include/param.h:1.23 src/sys/arch/powerpc/include/param.h:1.24
--- src/sys/arch/powerpc/include/param.h:1.23 Sat Mar 5 14:27:48 2011
+++ src/sys/arch/powerpc/include/param.h Mon Jun 20 06:29:54 2011
@@ -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_ */
Index: src/sys/arch/prep/include/param.h
diff -u src/sys/arch/prep/include/param.h:1.5 src/sys/arch/prep/include/param.h:1.6
--- src/sys/arch/prep/include/param.h:1.5 Mon Jul 12 07:54:13 2010
+++ src/sys/arch/prep/include/param.h Mon Jun 20 06:29:54 2011
@@ -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"
+#if defined(_KERNEL) && !defined(_MODULE)
+#define MACHINE "prep"
+#define KERNBASE 0x100000
#define __NO_FIXED_MSGBUF
-#define KERNBASE 0x100000
-
-#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>
Index: src/sys/arch/rs6000/include/param.h
diff -u src/sys/arch/rs6000/include/param.h:1.1 src/sys/arch/rs6000/include/param.h:1.2
--- src/sys/arch/rs6000/include/param.h:1.1 Mon Dec 17 19:09:27 2007
+++ src/sys/arch/rs6000/include/param.h Mon Jun 20 06:29:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.1 2007/12/17 19:09:27 garbled Exp $ */
+/* $NetBSD: param.h,v 1.2 2011/06/20 06:29:54 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 "prep"
+#if defined(_KERNEL) && !defined(_MODULE)
+#define MACHINE "prep"
+#define KERNBASE 0x100000
#define __NO_FIXED_MSGBUF
-#define KERNBASE 0x100000
+#endif /* _KENREL && !_MODULE */
#include <powerpc/param.h>
Index: src/sys/arch/sandpoint/include/param.h
diff -u src/sys/arch/sandpoint/include/param.h:1.4 src/sys/arch/sandpoint/include/param.h:1.5
--- src/sys/arch/sandpoint/include/param.h:1.4 Thu Jun 21 16:30:05 2001
+++ src/sys/arch/sandpoint/include/param.h Mon Jun 20 06:29:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.4 2001/06/21 16:30:05 briggs Exp $ */
+/* $NetBSD: param.h,v 1.5 2011/06/20 06:29:54 matt Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -31,20 +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 "sandpoint"
+#if defined(_KERNEL) && !defined(_MODULE)
+#define MACHINE "sandpoint"
+#define KERNBASE 0x3100 /* EXC_AST + 0x100 */
#define __NO_FIXED_MSGBUF
-#define KERNBASE 0x3100
+#endif /* _KERNEL && !_MODULE */
#include <powerpc/param.h>
-
