Include files serve a purpose. Move lots of extern statements from

foo_cmmu.c to cmmu.h ; also don't check for 197 in m18x_cmmu.c, as this
code is 18x specific.

3 files changed, 9 insertions, 31 deletions

diff --git a/sys/arch/mvme88k/include/cmmu.h b/sys/arch/mvme88k/include/cmmu.h
index 242d78cde52..580a0106c40 100644
--- a/sys/arch/mvme88k/include/cmmu.h
+++ b/sys/arch/mvme88k/include/cmmu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmmu.h,v 1.3 2001/03/09 05:44:40 smurph Exp $ */
+/*	$OpenBSD: cmmu.h,v 1.4 2001/08/11 01:55:52 miod Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -67,8 +67,9 @@
  */
 extern unsigned cpu_sets[MAX_CPUS];
 extern int cpu_cmmu_ratio;
-extern unsigned ncpus;
+extern unsigned number_cpus, master_cpu;
 extern unsigned cache_policy;
+extern int max_cpus, max_cmmus;
 
 #ifdef CMMU_DEBUG
 void show_apr(unsigned value);
@@ -80,8 +81,9 @@ void cmmu_show_translation(unsigned, unsigned, unsigned, int);
 void cmmu_cache_state(unsigned, unsigned);
 void show_cmmu_info(unsigned);
 #endif 
+
 /*
- * Prototypes from "mvme88k/mvme88k/cmmu.c
+ * Prototypes from "mvme88k/mvme88k/cmmu.c"
  */
 
 unsigned cmmu_cpu_number(void);
diff --git a/sys/arch/mvme88k/mvme88k/m18x_cmmu.c b/sys/arch/mvme88k/mvme88k/m18x_cmmu.c
index c8192dc6593..f43a33fe99a 100644
--- a/sys/arch/mvme88k/mvme88k/m18x_cmmu.c
+++ b/sys/arch/mvme88k/mvme88k/m18x_cmmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m18x_cmmu.c,v 1.9 2001/06/14 21:30:45 miod Exp $	*/
+/*	$OpenBSD: m18x_cmmu.c,v 1.10 2001/08/11 01:55:55 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -172,13 +172,6 @@ error("ack gag barf!");
  * May be used from "db_interface.c".
  */
 
-extern unsigned cache_policy;
-extern unsigned cpu_sets[];
-extern unsigned number_cpus;
-extern unsigned master_cpu;
-extern int      max_cpus, max_cmmus;
-extern int      cpu_cmmu_ratio;
-
 int      vme188_config;
 
 /* prototypes */
@@ -350,11 +343,6 @@ m18x_setup_board_config()
 	switch (cputyp) {
 #ifdef MVME187
 	case CPU_187:
-#endif
-#ifdef MVME197
-	case CPU_197:
-#endif
-#if defined(MVME187) || defined(MVME197)
 		vme188_config = 10; /* There is no WHOAMI reg on MVME1x7 - fake it... */
 		cmmu[0].cmmu_regs = (void *)SBC_CMMU_I;
 		cmmu[0].cmmu_cpu = 0;
@@ -369,7 +357,7 @@ m18x_setup_board_config()
 		max_cpus = 1;
 		max_cmmus = 2;
 		break;
-#endif /* defined(MVME187) || defined(MVME197) */
+#endif /* defined(MVME187) */
 #ifdef MVME188
 	case CPU_188:
 		whoami = (volatile unsigned long *)MVME188_WHOAMI;
@@ -638,13 +626,8 @@ m18x_cmmu_dump_config()
 	switch (cputyp) {
 #ifdef MVME187
 	case CPU_187:
-#endif
-#ifdef MVME197
-	case CPU_197:
-#endif
-#if defined(MVME187) || defined(MVME197)
 		DEBUG_MSG("VME1x7 split mode\n\n");
-#endif /* defined(MVME187) || defined(MVME197) */
+#endif /* defined(MVME187) */
 #ifdef MVME188
 	case CPU_188:
 		DEBUG_MSG("VME188 address decoder: PCNFA = 0x%1x, PCNFB = 0x%1x\n\n", *pcnfa & 0xf, *pcnfb & 0xf);
diff --git a/sys/arch/mvme88k/mvme88k/m197_cmmu.c b/sys/arch/mvme88k/mvme88k/m197_cmmu.c
index c4ab34d2c4c..fbe87c4605e 100644
--- a/sys/arch/mvme88k/mvme88k/m197_cmmu.c
+++ b/sys/arch/mvme88k/mvme88k/m197_cmmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m197_cmmu.c,v 1.4 2001/08/07 22:12:31 miod Exp $	*/
+/*	$OpenBSD: m197_cmmu.c,v 1.5 2001/08/11 01:55:55 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -91,13 +91,6 @@ unsigned int debuglevel = 0;
  * May be used from "db_interface.c".
  */
 
-extern unsigned cache_policy;
-extern unsigned cpu_sets[];
-extern unsigned number_cpus;
-extern unsigned master_cpu;
-extern int      cpu_cmmu_ratio;
-int init_done;
-
 /* FORWARDS */
 void m197_setup_cmmu_config(void);
 void m197_setup_board_config(void);