Module Name: src
Committed By: matt
Date: Thu Aug 13 05:15:10 UTC 2009
Modified Files:
src/sys/arch/algor/include: param.h
src/sys/arch/arc/include: param.h
src/sys/arch/cobalt/include: param.h
src/sys/arch/evbmips/include: param.h
src/sys/arch/ews4800mips/include: param.h
src/sys/arch/hpcmips/include: param.h
src/sys/arch/mips/include: mips_param.h
src/sys/arch/mipsco/include: param.h
src/sys/arch/newsmips/include: param.h
src/sys/arch/playstation2/include: param.h
src/sys/arch/pmax/include: param.h
src/sys/arch/sbmips/include: param.h
src/sys/arch/sgimips/include: param.h
Log Message:
Move MID_MACHINE to <mips/mips_param.h> and use local values so we don't
need to include exec_aout.h
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/algor/include/param.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arc/include/param.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/cobalt/include/param.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/include/param.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ews4800mips/include/param.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpcmips/include/param.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mips/include/mips_param.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mipsco/include/param.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/newsmips/include/param.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/playstation2/include/param.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/pmax/include/param.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sbmips/include/param.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/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/algor/include/param.h
diff -u src/sys/arch/algor/include/param.h:1.7 src/sys/arch/algor/include/param.h:1.8
--- src/sys/arch/algor/include/param.h:1.7 Tue Sep 5 01:33:24 2006
+++ src/sys/arch/algor/include/param.h Thu Aug 13 05:15:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.7 2006/09/05 01:33:24 gdamore Exp $ */
+/* $NetBSD: param.h,v 1.8 2009/08/13 05:15:08 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,6 @@
#define MACHINE_ARCH "mipsel"
#define _MACHINE algor
#define MACHINE "algor"
-#define MID_MACHINE MID_PMAX /* XXX Bogus, but needed for now... */
#define DEV_BSIZE 512
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
Index: src/sys/arch/arc/include/param.h
diff -u src/sys/arch/arc/include/param.h:1.24 src/sys/arch/arc/include/param.h:1.25
--- src/sys/arch/arc/include/param.h:1.24 Sun Dec 11 12:16:39 2005
+++ src/sys/arch/arc/include/param.h Thu Aug 13 05:15:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.24 2005/12/11 12:16:39 christos Exp $ */
+/* $NetBSD: param.h,v 1.25 2009/08/13 05:15:08 matt Exp $ */
/* $OpenBSD: param.h,v 1.9 1997/04/30 09:54:15 niklas Exp $ */
/*
@@ -94,7 +94,6 @@
#define MACHINE_ARCH "mipsel"
#define _MACHINE arc
#define MACHINE "arc"
-#define MID_MACHINE MID_PMAX /* XXX Bogus, but needed for now... */
#define KERNBASE 0x80000000 /* start of kernel virtual */
#define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT)
Index: src/sys/arch/cobalt/include/param.h
diff -u src/sys/arch/cobalt/include/param.h:1.14 src/sys/arch/cobalt/include/param.h:1.15
--- src/sys/arch/cobalt/include/param.h:1.14 Tue Sep 26 13:11:59 2006
+++ src/sys/arch/cobalt/include/param.h Thu Aug 13 05:15:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.14 2006/09/26 13:11:59 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.15 2009/08/13 05:15:08 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,6 @@
#define MACHINE_ARCH "mipsel"
#define _MACHINE cobalt
#define MACHINE "cobalt"
-#define MID_MACHINE MID_MIPS
#define DEV_BSIZE 512
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
Index: src/sys/arch/evbmips/include/param.h
diff -u src/sys/arch/evbmips/include/param.h:1.5 src/sys/arch/evbmips/include/param.h:1.6
--- src/sys/arch/evbmips/include/param.h:1.5 Sun Dec 11 12:17:11 2005
+++ src/sys/arch/evbmips/include/param.h Thu Aug 13 05:15:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.5 2005/12/11 12:17:11 christos Exp $ */
+/* $NetBSD: param.h,v 1.6 2009/08/13 05:15:09 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,6 @@
#define _MACHINE evbmips
#define MACHINE "evbmips"
-#define MID_MACHINE MID_PMAX /* XXX Bogus, but needed for now... */
#define DEV_BSIZE 512
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
Index: src/sys/arch/ews4800mips/include/param.h
diff -u src/sys/arch/ews4800mips/include/param.h:1.1 src/sys/arch/ews4800mips/include/param.h:1.2
--- src/sys/arch/ews4800mips/include/param.h:1.1 Thu Dec 29 15:20:08 2005
+++ src/sys/arch/ews4800mips/include/param.h Thu Aug 13 05:15:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.1 2005/12/29 15:20:08 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.2 2009/08/13 05:15:09 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,6 @@
#define MACHINE_ARCH "mipseb"
#define _MACHINE ews4800mips
#define MACHINE "ews4800mips"
-#define MID_MACHINE MID_MIPS
#define DEV_BSIZE 512
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
Index: src/sys/arch/hpcmips/include/param.h
diff -u src/sys/arch/hpcmips/include/param.h:1.12 src/sys/arch/hpcmips/include/param.h:1.13
--- src/sys/arch/hpcmips/include/param.h:1.12 Tue Sep 26 13:11:59 2006
+++ src/sys/arch/hpcmips/include/param.h Thu Aug 13 05:15:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.12 2006/09/26 13:11:59 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.13 2009/08/13 05:15:09 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -94,8 +94,6 @@
#define _MACHINE hpcmips
#define MACHINE "hpcmips"
-#define MID_HPCMIPS MID_PMAX /* XXX For the moment */
-#define MID_MACHINE MID_HPCMIPS
#define KERNBASE 0x80000000 /* start of kernel virtual */
#define KERNTEXTOFF 0x80001000 /* start of kernel text for kvm_mkdb */
Index: src/sys/arch/mips/include/mips_param.h
diff -u src/sys/arch/mips/include/mips_param.h:1.24 src/sys/arch/mips/include/mips_param.h:1.25
--- src/sys/arch/mips/include/mips_param.h:1.24 Sun Aug 9 04:02:40 2009
+++ src/sys/arch/mips/include/mips_param.h Thu Aug 13 05:15:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_param.h,v 1.24 2009/08/09 04:02:40 matt Exp $ */
+/* $NetBSD: mips_param.h,v 1.25 2009/08/13 05:15:09 matt Exp $ */
#ifdef _KERNEL
#include <machine/cpu.h>
@@ -69,3 +69,11 @@
#define mips_trunc_page(x) ((uintptr_t)(x) & ~(NBPG-1))
#define mips_btop(x) ((paddr_t)(x) >> PGSHIFT)
#define mips_ptob(x) ((paddr_t)(x) << PGSHIFT)
+
+#ifdef __MIPSEL__
+#define MID_MACHINE 135 /* MID_PMAX (little-endian) */
+#endif
+#ifdef __MIPSEB__
+#define MID_MACHINE 152 /* MID_MIPS (big-endian) */
+#endif
+
Index: src/sys/arch/mipsco/include/param.h
diff -u src/sys/arch/mipsco/include/param.h:1.10 src/sys/arch/mipsco/include/param.h:1.11
--- src/sys/arch/mipsco/include/param.h:1.10 Sat Mar 14 14:46:02 2009
+++ src/sys/arch/mipsco/include/param.h Thu Aug 13 05:15:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.10 2009/03/14 14:46:02 dsl Exp $ */
+/* $NetBSD: param.h,v 1.11 2009/08/13 05:15:09 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,6 @@
#define MACHINE_ARCH "mipseb"
#define _MACHINE mipsco
#define MACHINE "mipsco"
-#define MID_MACHINE MID_MIPS
#define KERNBASE 0x80000000 /* start of kernel virtual */
#define KERNTEXTOFF 0x80001000 /* start of kernel text for kvm_mkdb */
Index: src/sys/arch/newsmips/include/param.h
diff -u src/sys/arch/newsmips/include/param.h:1.16 src/sys/arch/newsmips/include/param.h:1.17
--- src/sys/arch/newsmips/include/param.h:1.16 Wed Oct 17 19:55:55 2007
+++ src/sys/arch/newsmips/include/param.h Thu Aug 13 05:15:09 2009
@@ -1,4 +1,4 @@
-/* from $NetBSD: param.h,v 1.16 2007/10/17 19:55:55 garbled Exp $ */
+/* from $NetBSD: param.h,v 1.17 2009/08/13 05:15:09 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,6 @@
#define MACHINE_ARCH "mipseb"
#define _MACHINE newsmips
#define MACHINE "newsmips"
-#define MID_MACHINE MID_MIPS
#define KERNBASE 0x80000000 /* start of kernel virtual */
#define KERNTEXTOFF 0x80001000 /* start of kernel text for kvm_mkdb */
Index: src/sys/arch/playstation2/include/param.h
diff -u src/sys/arch/playstation2/include/param.h:1.5 src/sys/arch/playstation2/include/param.h:1.6
--- src/sys/arch/playstation2/include/param.h:1.5 Tue Sep 26 13:11:59 2006
+++ src/sys/arch/playstation2/include/param.h Thu Aug 13 05:15:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.5 2006/09/26 13:11:59 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.6 2009/08/13 05:15:09 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,6 @@
#define MACHINE_ARCH "mipsel"
#define _MACHINE playstation2
#define MACHINE "playstation2"
-#define MID_MACHINE MID_PMAX /* XXX no suitable MID for mipsel */
#define DEV_BSIZE 512
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
Index: src/sys/arch/pmax/include/param.h
diff -u src/sys/arch/pmax/include/param.h:1.39 src/sys/arch/pmax/include/param.h:1.40
--- src/sys/arch/pmax/include/param.h:1.39 Sat Mar 14 14:46:04 2009
+++ src/sys/arch/pmax/include/param.h Thu Aug 13 05:15:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.39 2009/03/14 14:46:04 dsl Exp $ */
+/* $NetBSD: param.h,v 1.40 2009/08/13 05:15:09 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,6 @@
#define MACHINE_ARCH "mipsel"
#define _MACHINE pmax
#define MACHINE "pmax"
-#define MID_MACHINE MID_PMAX
#define DEV_BSIZE 512
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
Index: src/sys/arch/sbmips/include/param.h
diff -u src/sys/arch/sbmips/include/param.h:1.5 src/sys/arch/sbmips/include/param.h:1.6
--- src/sys/arch/sbmips/include/param.h:1.5 Tue Jan 8 14:38:48 2008
+++ src/sys/arch/sbmips/include/param.h Thu Aug 13 05:15:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.5 2008/01/08 14:38:48 simonb Exp $ */
+/* $NetBSD: param.h,v 1.6 2009/08/13 05:15:10 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,6 @@
#define _MACHINE sbmips
#define MACHINE "sbmips"
-#define MID_MACHINE MID_PMAX /* XXX Bogus, but needed for now... */
#define DEV_BSIZE 512
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
Index: src/sys/arch/sgimips/include/param.h
diff -u src/sys/arch/sgimips/include/param.h:1.10 src/sys/arch/sgimips/include/param.h:1.11
--- src/sys/arch/sgimips/include/param.h:1.10 Thu Feb 21 09:32:12 2008
+++ src/sys/arch/sgimips/include/param.h Thu Aug 13 05:15:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.10 2008/02/21 09:32:12 sekiya Exp $ */
+/* $NetBSD: param.h,v 1.11 2009/08/13 05:15:10 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -81,7 +81,6 @@
#define MACHINE_ARCH "mipseb"
#define _MACHINE sgimips
#define MACHINE "sgimips"
-#define MID_MACHINE MID_MIPS
#define DEV_BSIZE 512
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
