More mvme88k code cleaning:

- merge locore_c_routines.c into machdep.c
- split machdep.c into really machdep.c content, and board-specific routines
  (memory sizing, early initialization, etc).

No functionnal change.

2 files changed, 5 insertions, 33 deletions

diff --git a/sys/arch/mvme88k/include/locore.h b/sys/arch/mvme88k/include/locore.h
index 642e77a7c87..dd554aaeafa 100644
--- a/sys/arch/mvme88k/include/locore.h
+++ b/sys/arch/mvme88k/include/locore.h
@@ -1,10 +1,8 @@
-/*	$OpenBSD: locore.h,v 1.24 2004/08/01 17:18:05 miod Exp $	*/
+/*	$OpenBSD: locore.h,v 1.25 2004/10/01 19:00:51 miod Exp $	*/
 
 #ifndef _MACHINE_LOCORE_H_
 #define _MACHINE_LOCORE_H_
 
-#include <uvm/uvm_param.h>
-
 /*
  * C prototypes for various routines defined in locore_* and friends
  */
@@ -17,8 +15,7 @@ int badaddr(vaddr_t addr, int size);
 void set_cpu_number(unsigned number);
 void doboot(void);
 
-int guarded_access(unsigned char *volatile address,
-    unsigned len, u_char *vec);
+int guarded_access(volatile u_int8_t *, unsigned, u_int8_t *);
 
 /* locore_c_routines.c */
 
@@ -26,25 +23,13 @@ unsigned getipl(void);
 
 /* machdep.c */
 
-void _doboot(void);
-vaddr_t get_slave_stack(void);
-void slave_pre_main(void);
-int slave_main(void);
 int intr_findvec(int, int, int);
-void bugsyscall(void);
 void myetheraddr(u_char *cp);
-void dosoftint(void);
-void mvme_bootstrap(void);
-void m187_ext_int(u_int v, struct trapframe *eframe);
-void m188_reset(void);
-void m188_ext_int(u_int v, struct trapframe *eframe);
-unsigned int safe_level(unsigned mask, unsigned curlevel);
-void m197_ext_int(u_int v, struct trapframe *eframe);
+
+extern volatile u_int8_t *ivec[8];
 
 /* eh.S */
 
-struct proc;
-void proc_do_uret(struct proc *);
 void sigsys(void);
 void sigtrap(void);
 void stepbpt(void);
@@ -56,8 +41,4 @@ void m88110_stepbpt(void);
 void m88110_userbpt(void);
 void m88110_syscall_handler(void);
 
-/* process.S */
-void savectx(struct pcb *);
-void switch_exit(struct proc *);
-
 #endif /* _MACHINE_LOCORE_H_ */
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
index f13da69f39f..90fa6ba7a97 100644
--- a/sys/arch/mvme88k/include/mvme188.h
+++ b/sys/arch/mvme88k/include/mvme188.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme188.h,v 1.19 2004/08/02 08:35:00 miod Exp $ */
+/*	$OpenBSD: mvme188.h,v 1.20 2004/10/01 19:00:51 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -363,15 +363,6 @@
 #define VME_CMMU_D2	0xfff3f000
 #define VME_CMMU_D3	0xfff7f000
 
-#ifndef _LOCORE
-
-extern unsigned int m188_curspl[MAX_CPUS];
-extern unsigned int int_mask_val[INT_LEVEL];
-extern unsigned int int_mask_shadow[MAX_CPUS];
-extern unsigned int *volatile int_mask_reg[MAX_CPUS];
-
-#endif
-
 #define M188_IACK		0xFFF85000
 #define M188_IVEC		0x40	/* vector returned upon MVME188 int */