Jumbo commit to fix all compilation warnings on mvme68k (add prototypes,

add casts, fix a few errors and typos in the process, etc)

6 files changed, 149 insertions, 8 deletions

diff --git a/sys/arch/mvme68k/include/bugio.h b/sys/arch/mvme68k/include/bugio.h
new file mode 100644
index 00000000000..2af0c26fc00
--- /dev/null
+++ b/sys/arch/mvme68k/include/bugio.h
@@ -0,0 +1,44 @@
+/*	$OpenBSD: bugio.h,v 1.1 2002/04/27 23:21:05 miod Exp $	*/
+/*
+ * Copyright (c) 2002, Miodrag Vallat.
+ * All rights reserved.
+ *
+ * Permission to redistribute, use, copy, and modify this software
+ * without fee is hereby granted, provided that the following
+ * conditions are met:
+ *
+ * 1. This entire notice is included in all source code copies of any
+ *    software which is or includes a copy or modification of this
+ *    software.
+ * 2. 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.
+ */
+
+#ifndef _MACHINE_BUGIO_H_
+#define _MACHINE_BUGIO_H_
+
+#include <sys/cdefs.h>
+
+#include <machine/prom.h>
+
+int bug_instat(void);
+char bug_inchr(void);
+void bug_outchr(char);
+void bug_outstr(char *, char *);
+void bug_return(void);
+struct bug_brdid *bug_brdid(void);
+
+#endif /* _MACHINE_BUGIO_H_ */
diff --git a/sys/arch/mvme68k/include/conf.h b/sys/arch/mvme68k/include/conf.h
new file mode 100644
index 00000000000..92763e018aa
--- /dev/null
+++ b/sys/arch/mvme68k/include/conf.h
@@ -0,0 +1,48 @@
+/*	$OpenBSD: conf.h,v 1.1 2002/04/27 23:21:05 miod Exp $	*/
+/*
+ * Copyright (c) 2002, Miodrag Vallat.
+ * All rights reserved.
+ *
+ * Permission to redistribute, use, copy, and modify this software
+ * without fee is hereby granted, provided that the following
+ * conditions are met:
+ *
+ * 1. This entire notice is included in all source code copies of any
+ *    software which is or includes a copy or modification of this
+ *    software.
+ * 2. 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.
+ */
+
+#include <sys/conf.h>
+
+#define	mmread	mmrw
+#define	mmwrite	mmrw
+cdev_decl(mm);
+
+cdev_decl(vmel);
+cdev_decl(vmes);
+
+cdev_decl(flash);
+cdev_decl(nvram);
+cdev_decl(sram);
+
+cdev_decl(bugtty);
+cdev_decl(cl);
+cdev_decl(wl);
+cdev_decl(zs);
+
+cdev_decl(lp);
diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index c294452da6c..6ca9e45aaff 100644
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.11 2002/04/25 22:18:20 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.12 2002/04/27 23:21:05 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -137,7 +137,7 @@ struct clockframe {
  * Preempt the current process if in interrupt from user mode,
  * or after the current trap/syscall if in system mode.
  */
-int want_resched;
+extern int want_resched;
 #define	need_resched()	{ want_resched = 1; aston(); }
 
 /*
@@ -153,7 +153,7 @@ int want_resched;
  */
 #define	signotify(p)	aston()
 
-int astpending;
+extern int astpending;
 #define aston() (astpending = 1)
 
 extern	char *intiobase, *intiolimit;
@@ -193,17 +193,62 @@ extern int	cputyp;
 
 struct intrhand {
 	struct	intrhand *ih_next;
-	int	(*ih_fn)();
+	int	(*ih_fn)(void *);
 	void	*ih_arg;
 	int	ih_ipl;
 	int	ih_wantframe;
 };
 
+int intr_establish(int, struct intrhand *);
+
 struct haltvec {
 	struct haltvec *hv_next;
 	void	(*hv_fn)(void);
 	int	hv_pri;
 };
 
+struct frame;
+struct fpframe;
+struct pcb;
+
+void	m68881_save(struct fpframe *);
+void	m68881_restore(struct fpframe *);
+void	DCIA(void);
+void	DCIS(void);
+void	DCIAS(vaddr_t);
+void	DCIU(void);
+void	ICIA(void);
+void	ICPA(void);
+void	PCIA(void);
+void	TBIA(void);
+void	TBIS(vaddr_t);
+void	TBIAS(void);
+void	TBIAU(void);
+#if defined(M68040)
+void	DCFA(void);
+void	DCFP(paddr_t);
+void	DCFL(paddr_t);
+void	DCPL(paddr_t);
+void	DCPP(paddr_t);
+void	ICPL(paddr_t);
+void	ICPP(paddr_t);
+#endif
+int	suline(caddr_t, caddr_t);
+void	savectx(struct pcb *);
+void	switch_exit(struct proc *);
+__dead void	doboot(void);
+void	loadustp(int);
+void	proc_trampoline(void);
+
+int badpaddr(paddr_t, int);
+int badvaddr(vaddr_t, int);
+void nmihand(void *);
+int intr_findvec(int, int);
+
+void dma_cachectl(caddr_t, int);
+paddr_t kvtop(vaddr_t);
+void physaccess(vaddr_t, paddr_t, size_t, int);
+void physunaccess(vaddr_t, size_t);
+
 #endif	/* _KERNEL */
 #endif	/* _MVME68K_CPU_H_ */
diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h
index f13dd140750..a395d966625 100644
--- a/sys/arch/mvme68k/include/intr.h
+++ b/sys/arch/mvme68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.6 2002/03/14 03:15:56 millert Exp $	*/
+/*	$OpenBSD: intr.h,v 1.7 2002/04/27 23:21:05 miod Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -42,7 +42,7 @@ extern unsigned char ssir;
 #define setsoftint(x)	ssir |= (x)
 #define setsoftnet()	ssir |= SIR_NET
 #define setsoftclock()	ssir |= SIR_CLOCK
-u_long	allocate_sir(void (*proc)(), void *arg);
+u_long	allocate_sir(void (*proc)(void *), void *arg);
 
 #define _spl(s) \
 ({ \
diff --git a/sys/arch/mvme68k/include/param.h b/sys/arch/mvme68k/include/param.h
index a5bede421ac..67626190349 100644
--- a/sys/arch/mvme68k/include/param.h
+++ b/sys/arch/mvme68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.17 2002/02/22 22:45:34 miod Exp $ */
+/*	$OpenBSD: param.h,v 1.18 2002/04/27 23:21:05 miod Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -83,6 +83,7 @@
 
 
 #ifdef _KERNEL
+extern void delay(int);
 #define DELAY(n)	delay(n)
 #endif
 
diff --git a/sys/arch/mvme68k/include/prom.h b/sys/arch/mvme68k/include/prom.h
index f9706a9a2f7..4eaff06c0a8 100644
--- a/sys/arch/mvme68k/include/prom.h
+++ b/sys/arch/mvme68k/include/prom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prom.h,v 1.9 2001/06/12 22:53:16 miod Exp $ */
+/*	$OpenBSD: prom.h,v 1.10 2002/04/27 23:21:05 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -30,6 +30,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#ifndef _MACHINE_PROM_H_
+#define _MACHINE_PROM_H_
 
 #define MVMEPROM_INCHR		0x00
 #define MVMEPROM_INSTAT		0x01
@@ -190,3 +192,4 @@ struct mvmeprom_args {
 #define RB_NOSYM 0x4000
 #endif
 
+#endif /* _MACHINE_PROM_H_ */