board.h overhaul. split definitions by arch.

5 files changed, 170 insertions, 8 deletions

diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h
index b2fac596c7a..1267d6d0049 100644
--- a/sys/arch/mvme88k/include/board.h
+++ b/sys/arch/mvme88k/include/board.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: board.h,v 1.13 2001/12/16 23:49:46 miod Exp $ */
+/*	$OpenBSD: board.h,v 1.14 2001/12/19 05:06:26 smurph Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -108,13 +108,20 @@
 #define FPUP_BIT	0x400		/* FPU precise exception	*/
 #define FPUI_BIT	0x800		/* FPU imprecise exception	*/
 
+/* machine dependant definitions */
+
 #if defined(MVME187) || defined(MVME197)
 #include <machine/mvme1x7.h>
 #endif
-
+#ifdef MVME187
+#include <machine/mvme187.h>
+#endif 
 #ifdef MVME188
 #include <machine/mvme188.h>
 #endif
+#ifdef MVME197
+#include <machine/mvme197.h>
+#endif
 
 #endif /* __MACHINE_BOARD_H__ */
 
diff --git a/sys/arch/mvme88k/include/mvme187.h b/sys/arch/mvme88k/include/mvme187.h
new file mode 100644
index 00000000000..3312cfb85fe
--- /dev/null
+++ b/sys/arch/mvme88k/include/mvme187.h
@@ -0,0 +1,77 @@
+/*	$OpenBSD: mvme187.h,v 1.4 2001/12/19 05:06:26 smurph Exp $ */
+/*
+ * Copyright (c) 1996 Nivas Madhur
+ * Copyright (c) 1999 Steve Murphree, Jr.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Nivas Madhur.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+/*
+ * Mach Operating System
+ * Copyright (c) 1991 Carnegie Mellon University
+ * Copyright (c) 1991 OMRON Corporation
+ * All Rights Reserved.
+ *
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ */
+#ifndef __MACHINE_MVME187_H__
+#define __MACHINE_MVME187_H__
+/*
+ *      VME187 CPU board constants - derived from Luna88k
+ *      This file is include from <machine/board.h>
+ */
+
+/*
+ * Something to put append a 'U' to a long constant if it's C so that
+ * it'll be unsigned in both ANSI and traditional.
+ */
+#ifndef UDEFINED
+#if defined(_LOCORE)
+#	define U(num)	num
+#else
+#  if defined(__STDC__)
+#	define U(num)	num ## U
+#  else
+#	define U(num)	num/**/U
+#  endif
+#endif
+#endif
+
+#define SBC_CMMU_I	U(0xFFF77000) 	/* Single Board Computer code CMMU */
+#define SBC_CMMU_D	U(0xFFF7F000) 	/* Single Board Computer data CMMU */
+
+#define M187_ILEVEL	U(0xFFF4203E)	/* interrupt priority level */
+#define M187_IMASK	U(0xFFF4203F)	/* interrupt mask level */
+#define M187_ISRC	U(0x00000000)	/* interrupt mask src (NULL) */
+#define M187_IACK	U(0xFFFE0000)	/* interrupt ACK base */
+
+#endif __MACHINE_MVME187_H__
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
index e5e2aab757d..df192ed9155 100644
--- a/sys/arch/mvme88k/include/mvme188.h
+++ b/sys/arch/mvme88k/include/mvme188.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme188.h,v 1.9 2001/12/16 23:49:46 miod Exp $ */
+/*	$OpenBSD: mvme188.h,v 1.10 2001/12/19 05:06:26 smurph Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -62,6 +62,14 @@
 #endif
 #endif
 
+#define VME_CMMU_I0	U(0xFFF7E000) 	/* MVME188 code CMMU 0 */
+#define VME_CMMU_I1	U(0xFFF7D000) 	/* MVME188 code CMMU 1 */
+#define VME_CMMU_I2	U(0xFFF7B000) 	/* MVME188 code CMMU 2 */
+#define VME_CMMU_I3	U(0xFFF77000) 	/* MVME188 code CMMU 3 */
+#define VME_CMMU_D0	U(0xFFF6F000) 	/* MVME188 data CMMU 0 */
+#define VME_CMMU_D1	U(0xFFF5F000) 	/* MVME188 data CMMU 1 */
+#define VME_CMMU_D2	U(0xFFF3F000) 	/* MVME188 data CMMU 2 */
+#define VME_CMMU_D3	U(0xFFF7F000) 	/* MVME188 data CMMU 3 */
 
 #define MVME188_EPROM		U(0xFFC00000)
 #define MVME188_EPROM_SIZE	U(0x00080000)
diff --git a/sys/arch/mvme88k/include/mvme197.h b/sys/arch/mvme88k/include/mvme197.h
new file mode 100644
index 00000000000..0f77f07e1f2
--- /dev/null
+++ b/sys/arch/mvme88k/include/mvme197.h
@@ -0,0 +1,74 @@
+/*	$OpenBSD: mvme197.h,v 1.3 2001/12/19 05:06:26 smurph Exp $ */
+/*
+ * Copyright (c) 1996 Nivas Madhur
+ * Copyright (c) 1999 Steve Murphree, Jr.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Nivas Madhur.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+/*
+ * Mach Operating System
+ * Copyright (c) 1991 Carnegie Mellon University
+ * Copyright (c) 1991 OMRON Corporation
+ * All Rights Reserved.
+ *
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ */
+#ifndef __MACHINE_MVME197_H__
+#define __MACHINE_MVME197_H__
+/*
+ *      VME187 CPU board constants - derived from Luna88k
+ *      This file is include from <machine/board.h>
+ */
+
+/*
+ * Something to put append a 'U' to a long constant if it's C so that
+ * it'll be unsigned in both ANSI and traditional.
+ */
+#ifndef UDEFINED
+#if defined(_LOCORE)
+#	define U(num)	num
+#else
+#  if defined(__STDC__)
+#	define U(num)	num ## U
+#  else
+#	define U(num)	num/**/U
+#  endif
+#endif
+#endif
+
+#define M197_ILEVEL	U(0xFFF00064)	/* interrupt priority level */
+#define M197_IMASK	U(0xFFF00065)	/* interrupt mask level */
+#define M197_ISRC	U(0xFFF0006F)	/* interrupt SRC */
+#define M197_IACK	U(0xFFF00100)	/* interrupt ACK base */
+
+#endif __MACHINE_MVME197_H__
diff --git a/sys/arch/mvme88k/include/mvme1x7.h b/sys/arch/mvme88k/include/mvme1x7.h
index c74499204f7..fe1e74f5e53 100644
--- a/sys/arch/mvme88k/include/mvme1x7.h
+++ b/sys/arch/mvme88k/include/mvme1x7.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme1x7.h,v 1.8 2001/12/16 23:49:46 miod Exp $ */
+/*	$OpenBSD: mvme1x7.h,v 1.9 2001/12/19 05:06:26 smurph Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -79,7 +79,6 @@
 
 #define LOCAL_IO_DEVS	U(0xFFF00000)	/* local IO devices */
 
-#define PCC2_ADDR	U(0xFFF42000)	/* PCCchip2 Regs */
 #define UTIL_ADDR	U(0xFFC02000)	/* PCCchip2 Regs */
 #define MEM_CTLR	U(0xFFF43000)	/* MEMC040 mem controller */
 #define SCC_ADDR	U(0xFFF45000) 	/* Cirrus Chip */
@@ -97,7 +96,4 @@
 #define TOD_CAL_MON	U(0xFFFC1FFE) 	/* months */
 #define TOD_CAL_YEAR	U(0xFFFC1FFF) 	/* years */
 
-#define M187_IACK	U(0xFFFE0000)
-#define M197_IACK	U(0xFFF00100)
-
 #endif /* __MACHINE_MVME1X7_H__ */