Add and move declarations to fix all of the warnings from `gcc -Wimplicit'

(except in netccitt, netiso and netns) and most of the warnings from
`gcc -Wnested-externs'.  Fix all the bugs found.  There were no serious
ones.

4 files changed, 82 insertions, 12 deletions

diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 33f8e74..3d87a07 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -49,13 +49,6 @@
 #include <machine/frame.h>
 
 /*
- * Kernel to clock driver interface.
- */
-void	inittodr __P((time_t base));
-void	resettodr __P((void));
-void	startrtclock __P((void));
-
-/*
  * i386 to clock driver interface.
  * XXX almost all of it is misplaced.  i586 stuff is done in isa/clock.c
  * and isa stuff is done in i386/microtime.s and i386/support.s.
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index db2993e..9bee6ed 100644
--- a/sys/i386/include/frame.h
+++ b/sys/i386/include/frame.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- *	$Id: frame.h,v 1.7 1994/01/03 07:55:32 davidg Exp $
+ *	$Id: frame.h,v 1.9 1994/05/25 08:56:02 rgrimes Exp $
  */
 
 #ifndef _MACHINE_FRAME_H_
@@ -72,8 +72,6 @@ struct trapframe {
 	int	tf_ss;
 };
 
-extern int kdb_trap(int, int, struct trapframe *);
-
 /* Interrupt stack frame */
 
 struct intrframe {
@@ -137,4 +135,8 @@ struct sigframe {
 	sig_t	sf_handler;
 	struct	sigcontext sf_sc;
 };
+
+int	kdb_trap __P((int, int, struct trapframe *));
+int	math_emulate __P((struct trapframe * info));
+
 #endif /* _MACHINE_FRAME_H_ */
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
new file mode 100644
index 0000000..ad8ba37
--- /dev/null
+++ b/sys/i386/include/md_var.h
@@ -0,0 +1,68 @@
+/*-
+ * Copyright (c) 1995 Bruce D. Evans.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the author nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ *	$Id: $
+ */
+
+#ifndef _MACHINE_MD_VAR_H_
+#define	_MACHINE_MD_VAR_H_
+
+/*
+ * Miscellaneous machine-dependent declarations.
+ */
+
+extern	int	Maxmem;
+extern	u_long	cpu_feature;
+extern	u_long	cpu_high;
+extern	u_long	cpu_id;
+extern	char	cpu_vendor[];
+extern	char	etext[];	
+extern	vm_offset_t isaphysmem;
+extern	char	kstack[];
+extern	void	(*netisrs[32]) __P((void));
+extern	int	nfs_diskless_valid;
+extern	int	sigcode;
+extern	int	szsigcode;
+
+struct	proc;
+struct	reg;
+
+void	configure __P((void));
+void	cpu_reset __P((void));
+void	doreti_iret __P((void)) __asm(__STRING(doreti_iret));
+void	doreti_iret_fault __P((void)) __asm(__STRING(doreti_iret_fault));
+void	doreti_popl_ds __P((void)) __asm(__STRING(doreti_popl_ds));
+void	doreti_popl_ds_fault __P((void)) __asm(__STRING(doreti_popl_ds_fault));
+void	doreti_popl_es __P((void)) __asm(__STRING(doreti_popl_es));
+void	doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault));
+int	fill_regs __P((struct proc *p, struct reg *regs));
+int	mvesp __P((void));
+void	setconf __P((void));
+void	userconfig __P((void));
+
+#endif /* !_MACHINE_MD_VAR_H_ */
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 694d5af..ece8588 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.22 1995/02/14 06:55:42 phk Exp $
+ * 	$Id: pmap.h,v 1.23 1995/02/14 06:57:45 phk Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
@@ -190,7 +190,14 @@ typedef struct pv_entry {
 
 #ifdef	KERNEL
 
-pv_entry_t	pv_table;		/* array of entries, one per page */
+extern caddr_t	CADDR1;
+extern pt_entry_t *CMAP1;
+extern vm_offset_t avail_end;
+extern vm_offset_t avail_start;
+extern vm_offset_t phys_avail[6];
+extern pv_entry_t pv_table;	/* array of entries, one per page */
+extern vm_offset_t virtual_avail;
+extern vm_offset_t virtual_end;
 
 #define	pa_index(pa)		atop(pa - vm_first_phys)
 #define	pa_to_pvh(pa)		(&pv_table[pa_index(pa)])