Get rid of a few useless defines, as well as a few duplicated ones; and

move 8820x-only definitions to the adequate header.

Also crank MAXPHYSMEM to a more realistic value.

3 files changed, 25 insertions, 51 deletions

diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h
index 78ffb9b94f1..fe1a5848257 100644
--- a/sys/arch/mvme88k/include/board.h
+++ b/sys/arch/mvme88k/include/board.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: board.h,v 1.19 2003/11/09 00:32:00 miod Exp $ */
+/*	$OpenBSD: board.h,v 1.20 2004/01/19 17:21:23 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -44,55 +44,13 @@
  */
 #ifndef __MACHINE_BOARD_H__
 #define __MACHINE_BOARD_H__
-/*
- *      VME187 CPU board constants - derived from Luna88k
- */
-
-#define MAX_CPUS	4	/* no. of CPUs */
-#define MAX_CMMUS	8	/* 2 CMMUs per CPU - 1 data and 1 code */
-
-#define SYSV_BASE	0x00000000	/* system virtual base */
-
-#define MAXU_ADDR	0x40000000	/* size of user virtual space */
-#define MAXPHYSMEM	0x10000000	/* max physical memory */
-
-#define VMEA16		0xFFFF0000	/* VMEbus A16 */
-#define VMEA16_SIZE	0x0000EFFF	/* VMEbus A16 size */
-#define VMEA32D16    	0xFF000000	/* VMEbus A32/D16 */
-#define VMEA32D16_SIZE	0x007FFFFF	/* VMEbus A32/D16 size */
-
-
-/* These need to be here because of the way m18x_cmmu.c
-   handles the CMMU's. */
-#define CMMU_SIZE	0x1000
-
-#define SBC_CMMU_I	0xFFF77000 	/* Single Board Computer code CMMU */
-#define SBC_CMMU_D	0xFFF7F000 	/* Single Board Computer data CMMU */
 
-#define VME_CMMU_I0	0xFFF7E000 	/* MVME188 code CMMU 0 */
-#define VME_CMMU_I1	0xFFF7D000 	/* MVME188 code CMMU 1 */
-#define VME_CMMU_I2	0xFFF7B000 	/* MVME188 code CMMU 2 */
-#define VME_CMMU_I3	0xFFF77000 	/* MVME188 code CMMU 3 */
-#define VME_CMMU_D0	0xFFF6F000 	/* MVME188 data CMMU 0 */
-#define VME_CMMU_D1	0xFFF5F000 	/* MVME188 data CMMU 1 */
-#define VME_CMMU_D2	0xFFF3F000 	/* MVME188 data CMMU 2 */
-#define VME_CMMU_D3	0xFFF7F000 	/* MVME188 data CMMU 3 */
+#define MAX_CPUS	4	/* maximum number of CPUs */
+#define MAX_CMMUS	8	/* maximum number of CMMUs */
 
-/* These are the hardware exceptions. */
-#define INT_BIT		0x1		/* interrupt exception		*/
-#define IACC_BIT	0x2		/* instruction access exception	*/
-#define DACC_BIT	0x4		/* data access exception	*/
-#define MACC_BIT	0x8		/* misaligned access exception	*/
-#define UOPC_BIT	0x10		/* unimplemented opcode exception*/
-#define PRIV_BIT	0x20		/* privilege violation exception*/
-#define BND_BIT		0x40		/* bounds check violation	*/
-#define IDE_BIT		0x80		/* illegal integer divide	*/
-#define IOV_BIT		0x100		/* integer overflow exception	*/
-#define ERR_BIT		0x200		/* error exception		*/
-#define FPUP_BIT	0x400		/* FPU precise exception	*/
-#define FPUI_BIT	0x800		/* FPU imprecise exception	*/
+#define MAXPHYSMEM	0x30000000	/* maximum physical memory (768MB) */
 
-/* machine dependent definitions */
+/* Board-dependent definitions */
 
 #if defined(MVME187) || defined(MVME197)
 #include <machine/mvme1x7.h>
diff --git a/sys/arch/mvme88k/include/m8820x.h b/sys/arch/mvme88k/include/m8820x.h
index a2e68facdbd..1e705a6a28f 100644
--- a/sys/arch/mvme88k/include/m8820x.h
+++ b/sys/arch/mvme88k/include/m8820x.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.h,v 1.11 2004/01/14 20:46:02 miod Exp $ */
+/*	$OpenBSD: m8820x.h,v 1.12 2004/01/19 17:21:23 miod Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -175,4 +175,17 @@
 #define CMMU_A14_MASK		(1 << 14)
 #define CMMU_SRAM_MASK		((1 << 31) | (1 << 30))
 
+/*
+ * HYPERmodule CMMU addresses
+ */
+
+#define VME_CMMU_I0	0xfff7e000
+#define VME_CMMU_I1	0xfff7d000
+#define VME_CMMU_I2	0xfff7b000
+#define VME_CMMU_I3	0xfff77000
+#define VME_CMMU_D0	0xfff6f000
+#define VME_CMMU_D1	0xfff5f000
+#define VME_CMMU_D2	0xfff3f000
+#define VME_CMMU_D3	0xfff7f000
+
 #endif	/* __MACHINE_M8820X_H__ */
diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S
index 571d9408f20..bc44b556ceb 100644
--- a/sys/arch/mvme88k/mvme88k/eh.S
+++ b/sys/arch/mvme88k/mvme88k/eh.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh.S,v 1.47 2004/01/09 00:24:25 miod Exp $   */
+/*   $OpenBSD: eh.S,v 1.48 2004/01/19 17:21:25 miod Exp $   */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -199,10 +199,13 @@
 
 #include "assym.h"
 
+#include <machine/param.h>
 #include <machine/asm.h>
 #include <machine/board.h>
-#include <machine/param.h>		/* CPU_ and BRD_ defines */
-#include <machine/trap.h>		/* for T_ defines */
+#ifdef MVME188
+#include <machine/m8820x.h>
+#endif
+#include <machine/trap.h>
 
 /*
  * The exception frame as defined in "machine/pcb.h" (among other places) is