More include files cleaning:

- move MAX_CPUS constant to <machine/cpu.h>
- do not include <machine/board.h> unless needed. In fact, remove this file
  entirely on mvme88k, and include <machine/mvme*.h> on a
  compiling-for-this-board basis
- keep MAX_CMMUS constant private to the m8820x code

6 files changed, 18 insertions, 10 deletions

diff --git a/sys/arch/mvme88k/dev/clock.c b/sys/arch/mvme88k/dev/clock.c
index 01ea15b533c..3a1fb7e2abe 100644
--- a/sys/arch/mvme88k/dev/clock.c
+++ b/sys/arch/mvme88k/dev/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.34 2004/07/30 22:09:59 miod Exp $ */
+/*	$OpenBSD: clock.c,v 1.35 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1995 Theo de Raadt
@@ -77,7 +77,6 @@
 #include <sys/systm.h>
 
 #include <machine/asm.h>
-#include <machine/board.h>	/* for register defines */
 #include <machine/psl.h>
 #include <machine/autoconf.h>
 #include <machine/bugio.h>
@@ -86,12 +85,14 @@
 
 #include "pcctwo.h"
 #if NPCCTWO > 0
+#include <machine/mvme1x7.h>
 #include <mvme88k/dev/pcctwovar.h>
 #include <mvme88k/dev/pcctworeg.h>
 #endif
 
 #include "syscon.h"
 #if NSYSCON > 0
+#include <machine/mvme188.h>
 #include <mvme88k/dev/sysconreg.h>
 #endif
 
diff --git a/sys/arch/mvme88k/dev/dart.c b/sys/arch/mvme88k/dev/dart.c
index 09bcbfaf59b..48f611842bf 100644
--- a/sys/arch/mvme88k/dev/dart.c
+++ b/sys/arch/mvme88k/dev/dart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dart.c,v 1.38 2004/07/31 22:26:27 miod Exp $	*/
+/*	$OpenBSD: dart.c,v 1.39 2004/08/02 08:35:00 miod Exp $	*/
 
 /*
  * Mach Operating System
@@ -47,6 +47,7 @@
 
 #include <dev/cons.h>
 
+#include <machine/mvme188.h>
 #include <mvme88k/dev/sysconreg.h>
 #include <mvme88k/dev/dartreg.h>
 
diff --git a/sys/arch/mvme88k/dev/if_ie.c b/sys/arch/mvme88k/dev/if_ie.c
index e93398a3a83..6651cbda9f1 100644
--- a/sys/arch/mvme88k/dev/if_ie.c
+++ b/sys/arch/mvme88k/dev/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.30 2004/07/30 19:02:05 miod Exp $ */
+/*	$OpenBSD: if_ie.c,v 1.31 2004/08/02 08:35:00 miod Exp $ */
 
 /*-
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -129,7 +129,6 @@ Mode of operation:
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
-#include <machine/board.h>
 #include <machine/cpu.h>
 #include <machine/pmap.h>
 
diff --git a/sys/arch/mvme88k/dev/mainbus.c b/sys/arch/mvme88k/dev/mainbus.c
index b13ed5a0060..a394254f76d 100644
--- a/sys/arch/mvme88k/dev/mainbus.c
+++ b/sys/arch/mvme88k/dev/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.12 2004/05/07 18:10:28 miod Exp $ */
+/*	$OpenBSD: mainbus.c,v 1.13 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 2004, Miodrag Vallat.
@@ -34,10 +34,16 @@
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>
-#include <machine/board.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
 
+#ifdef MVME188
+#include <machine/mvme188.h>
+#endif
+#if defined(MVME187) || defined(MVME197)
+#include <machine/mvme1x7.h>
+#endif
+
 void	mainbus_attach(struct device *, struct device *, void *);
 int 	mainbus_match(struct device *, void *, void *);
 int	mainbus_print(void *, const char *);
diff --git a/sys/arch/mvme88k/dev/syscon.c b/sys/arch/mvme88k/dev/syscon.c
index 2864afe0466..4c74cccebec 100644
--- a/sys/arch/mvme88k/dev/syscon.c
+++ b/sys/arch/mvme88k/dev/syscon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscon.c,v 1.21 2004/07/30 19:02:06 miod Exp $ */
+/*	$OpenBSD: syscon.c,v 1.22 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -36,9 +36,9 @@
 
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
-#include <machine/board.h>
 #include <machine/frame.h>
 
+#include <machine/mvme188.h>
 #include <mvme88k/dev/sysconreg.h>
 
 struct sysconsoftc {
diff --git a/sys/arch/mvme88k/dev/vme.c b/sys/arch/mvme88k/dev/vme.c
index cc1f4136944..80ac43dddd2 100644
--- a/sys/arch/mvme88k/dev/vme.c
+++ b/sys/arch/mvme88k/dev/vme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.c,v 1.38 2004/07/30 19:02:06 miod Exp $ */
+/*	$OpenBSD: vme.c,v 1.39 2004/08/02 08:35:00 miod Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -45,6 +45,7 @@
 
 #include <mvme88k/dev/vme.h>
 #if NSYSCON > 0
+#include <machine/mvme188.h>
 #include <mvme88k/dev/sysconreg.h>
 #endif