Merge Luna88k and mvme88k M88200 management code. Features:

- simpler structures (no more redundant or easily computable information).
- split scheme configuration (for 4:1 and 8:1 designs) is only compiled in
  if necessary (read: only on a mvme88k kernel configured for MVME188 support),
  which speeds up CMMU operations on the Luna88k.
- will not enable bus snopping on a monoprocessor system.

Tested on Luna88k-2, MVME187 and various MVME188 by aoyama@ and I.

1 files changed, 14 insertions, 2 deletions

diff --git a/sys/arch/mvme88k/include/m8820x.h b/sys/arch/mvme88k/include/m8820x.h
index 4b881800351..1a763f05f48 100644
--- a/sys/arch/mvme88k/include/m8820x.h
+++ b/sys/arch/mvme88k/include/m8820x.h
@@ -1,4 +1,6 @@
-/*	$OpenBSD: m8820x.h,v 1.14 2004/08/02 08:35:00 miod Exp $ */
+#ifndef	_MVME88K_M8820X_H_
+#define	_MVME88K_M8820X_H_
+/*	$OpenBSD: m8820x.h,v 1.15 2004/08/06 13:23:49 miod Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -49,7 +51,13 @@
  * the rights to redistribute these changes.
  */
 
-#include <m88k/m8820x.h>
+/*
+ * Code features to enable
+ */
+
+#ifdef MVME188
+#define	M88200_HAS_SPLIT_ADDRESS
+#endif
 
 /*
  * Address masks for MVME188 CMMU configs
@@ -59,3 +67,7 @@
 #define CMMU_A12_MASK		(1 << 12)
 #define CMMU_A14_MASK		(1 << 14)
 #define CMMU_SRAM_MASK		((1 << 31) | (1 << 30))
+
+#include <m88k/m8820x.h>
+
+#endif	/* _MVME88K_M8820X_H_ */