backed out prev. netbsd merge except for smaller proc table

15 files changed, 225 insertions, 192 deletions

diff --git a/sys/arch/sun3/include/autoconf.h b/sys/arch/sun3/include/autoconf.h
index aecad6ea546..e1322fc8f12 100644
--- a/sys/arch/sun3/include/autoconf.h
+++ b/sys/arch/sun3/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.h,v 1.13 1996/12/17 21:11:01 gwr Exp $	*/
+/*	$NetBSD: autoconf.h,v 1.12 1996/11/20 18:57:05 gwr Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,6 @@
 
 /*
  * Autoconfiguration information.
- * (machdep parts of driver/kernel interface)
  */
 
 /* These are the "bus" types: */
@@ -67,16 +66,3 @@ int bus_print __P((void *, const char *));
 int bus_peek __P((int, int, int));
 char * bus_mapin __P((int, int, int));
 
-/* These are how drivers connect interrupt handlers. */
-typedef int (*isr_func_t) __P((void *));
-void isr_add_autovect __P((isr_func_t, void *arg, int level));
-void isr_add_vectored __P((isr_func_t, void *arg, int pri, int vec));
-void isr_add_custom __P((int, void *));
-
-/* These control the software interrupt register. */
-void isr_soft_request __P((int level));
-void isr_soft_clear __P((int level));
-
-/* Bus-error tolerant access to mapped address. */
-int 	peek_byte __P((caddr_t));
-int 	peek_word __P((caddr_t));
diff --git a/sys/arch/sun3/include/conf.h b/sys/arch/sun3/include/conf.h
index 69670cd4da5..b510287fa31 100644
--- a/sys/arch/sun3/include/conf.h
+++ b/sys/arch/sun3/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.3 1996/12/31 06:13:05 kstailey Exp $	*/
+/*	$OpenBSD: conf.h,v 1.4 1997/01/07 23:36:15 kstailey Exp $	*/
 
 /*-
  * Copyright (c) 1996 Kenneth Stailey.  All rights reserved.
@@ -67,11 +67,8 @@ cdev_decl(kd);
 /* frame-buffer devices */
 cdev_decl(fb);
 #include "bwtwo.h"
-#define bw2poll seltrue
 cdev_decl(bw2);
 #include "cgtwo.h"
-#define cg2poll seltrue
 cdev_decl(cg2);
 #include "cgfour.h"
-#define cg4poll seltrue
 cdev_decl(cg4);
diff --git a/sys/arch/sun3/include/control.h b/sys/arch/sun3/include/control.h
index bbd940478b6..56c7d26bd67 100644
--- a/sys/arch/sun3/include/control.h
+++ b/sys/arch/sun3/include/control.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: control.h,v 1.15 1996/12/17 21:11:02 gwr Exp $	*/
+/*	$NetBSD: control.h,v 1.14 1996/11/20 18:57:06 gwr Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -84,19 +84,17 @@
 
 #include <sys/types.h>
 
-/* ctrlsp.S */
 unsigned char get_control_byte __P((char *));
 unsigned int get_control_word __P((char *));
 void set_control_byte __P((char *, unsigned char));
 void set_control_word __P((char *, unsigned int));
 
-/* control.c */
 int get_context __P((void));
 void set_context __P((int));
-
+     
 vm_offset_t get_pte __P((vm_offset_t va));
 void set_pte __P((vm_offset_t, vm_offset_t));
-
+     
 unsigned char get_segmap __P((vm_offset_t));
 void set_segmap __P((vm_offset_t va, unsigned char));
 void set_segmap_allctx __P((vm_offset_t va, unsigned char));
diff --git a/sys/arch/sun3/include/cpu.h b/sys/arch/sun3/include/cpu.h
index 38cce484065..dfd987164cf 100644
--- a/sys/arch/sun3/include/cpu.h
+++ b/sys/arch/sun3/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.21 1996/12/17 21:11:03 gwr Exp $	*/
+/*	$NetBSD: cpu.h,v 1.20 1995/12/21 05:02:10 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -44,58 +44,53 @@
  *	cpu.h,v 1.2 1993/05/22 07:58:17 cgd Exp
  */
 
+#ifndef _SUN3_CPU_H_
+#define _SUN3_CPU_H_
+
 #ifdef _KERNEL
 
 /*
- * External definitions unique to sun3/68k cpu support.
- * These are the "public" declarations - those needed in
- * machine-independent source code.  The "priviate" ones
- * are in machdep.h (used only inside sys/arch/sun3).
- *
- * Note that the name of this file is NOT meant to imply
- * that it has anything to do with mc68020 CPU stuff.
- * The name "cpu" is historical, and used in the common
- * code to identify machine-dependent functions, etc.
+ * Exported definitions unique to sun3/68k cpu support.
  */
 
 /*
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
+#define	cpu_swapin(p)			/* nothing */
 #define	cpu_wait(p)			/* nothing */
 
 /*
  * Arguments to hardclock and gatherstats encapsulate the previous
  * machine state in an opaque clockframe.  One the sun3, we use
- * what the locore.s glue puts on the stack before calling C-code.
+ * what the hardware pushes on an interrupt (frame format 0).
  */
 struct clockframe {
-	u_int	cf_regs[4];	/* d0,d1,a0,a1 */
-	u_short	cf_sr;		/* sr at time of interrupt */
-	u_long	cf_pc;		/* pc at time of interrupt */
-	u_short	cf_vo;		/* vector offset (4-word frame) */
+	u_short	sr;		/* sr at time of interrupt */
+	u_long	pc;		/* pc at time of interrupt */
+	u_short	vo;		/* vector offset (4-word frame) */
 };
 
-#define	CLKF_USERMODE(framep)	(((framep)->cf_sr & PSL_S) == 0)
-#define	CLKF_BASEPRI(framep)	(((framep)->cf_sr & PSL_IPL) == 0)
-#define	CLKF_PC(framep)		((framep)->cf_pc)
+#define	CLKF_USERMODE(framep)	(((framep)->sr & PSL_S) == 0)
+#define	CLKF_BASEPRI(framep)	(((framep)->sr & PSL_IPL) == 0)
+#define	CLKF_PC(framep)		((framep)->pc)
 #if 0
 /* We would like to do it this way... */
-#define	CLKF_INTR(framep)	(((framep)->cf_sr & PSL_M) == 0)
+#define	CLKF_INTR(framep)	(((framep)->sr & PSL_M) == 0)
 #else
 /* but until we start using PSL_M, we have to do this instead */
 #define	CLKF_INTR(framep)	(0)	/* XXX */
 #endif
 
 extern int astpending;	 /* need to trap before returning to user mode */
-#define aston() (astpending = 1)
+#define aston() (astpending++)
 
 /*
  * Preempt the current process if in interrupt from user mode,
  * or after the current trap/syscall if in system mode.
  */
 extern int want_resched; /* resched() was called */
-#define	need_resched()	{ want_resched = 1; aston(); }
+#define	need_resched()	{ want_resched++; aston(); }
 
 /*
  * Give a profiling tick to the current process when the user profiling
@@ -116,7 +111,6 @@ extern int want_resched; /* resched() was called */
  * isr_soft_request() so this scheme just multiplexes four
  * software interrupt `sources' on the level one handler.
  */
-extern void isr_soft_request __P((int level));
 union sun3sir {
 	int 	sir_any;
 	char	sir_which[4];
@@ -127,10 +121,63 @@ union sun3sir {
 #define SIR_SPARE2	2
 #define SIR_SPARE3	3
 
-#define	setsoftint(x)	isr_soft_request(x)
-#define setsoftnet()	(sun3sir.sir_which[SIR_NET] = 1, setsoftint(1))
-#define setsoftclock()	(sun3sir.sir_which[SIR_CLOCK] = 1, setsoftint(1))
+#define	setsoftint()	isr_soft_request(1)
+#define setsoftnet()	(sun3sir.sir_which[SIR_NET] = 1, setsoftint())
+#define setsoftclock()	(sun3sir.sir_which[SIR_CLOCK] = 1, setsoftint())
+
+
+/*
+ * CTL_MACHDEP definitions.
+ */
+#define	CPU_CONSDEV		1	/* dev_t: console terminal device */
+#define	CPU_MAXID		2	/* number of valid machdep ids */
+
+#define	CTL_MACHDEP_NAMES { \
+	{ 0, 0 }, \
+	{ "console_device", CTLTYPE_STRUCT }, \
+}
+
+/* values for cpu_machine_id */
+
+#define CPU_ARCH_MASK  0xf0
+#define SUN3_ARCH      0x10
+#define SUN3_IMPL_MASK 0x0f
+#define SUN3_MACH_160  0x01
+#define SUN3_MACH_50   0x02
+#define SUN3_MACH_260  0x03
+#define SUN3_MACH_110  0x04
+#define SUN3_MACH_60   0x07
+#define SUN3_MACH_E    0x08
+
+extern	unsigned char cpu_machine_id;
+
+/* 680X0 function codes */
+#define	FC_USERD	1	/* user data space */
+#define	FC_USERP	2	/* user program space */
+#define	FC_CONTROL	3	/* sun control space */
+#define	FC_SUPERD	5	/* supervisor data space */
+#define	FC_SUPERP	6	/* supervisor program space */
+#define	FC_CPU		7	/* CPU space */
+
+/* fields in the 68020 cache control register */
+#define	IC_ENABLE	0x0001	/* enable instruction cache */
+#define	IC_FREEZE	0x0002	/* freeze instruction cache */
+#define	IC_CE		0x0004	/* clear instruction cache entry */
+#define	IC_CLR		0x0008	/* clear entire instruction cache */
+
+#define IC_CLEAR (IC_CLR|IC_ENABLE)
 
 #endif	/* _KERNEL */
 
-#include <m68k/sysctl.h>
+/* 
+ * CTL_MACHDEP definitions.
+ */
+#define	CPU_CONSDEV		1	/* dev_t: console terminal device */
+#define	CPU_MAXID		2	/* number of valid machdep ids */
+
+#define	CTL_MACHDEP_NAMES { \
+	{ 0, 0 }, \
+	{ "console_device", CTLTYPE_STRUCT }, \
+}
+
+#endif /* !_SUN3_CPU_H_ */
diff --git a/sys/arch/sun3/include/db_machdep.h b/sys/arch/sun3/include/db_machdep.h
index ef71424516b..543f101428a 100644
--- a/sys/arch/sun3/include/db_machdep.h
+++ b/sys/arch/sun3/include/db_machdep.h
@@ -1,14 +1,7 @@
-/*	$NetBSD: db_machdep.h,v 1.8 1996/12/17 21:11:05 gwr Exp $	*/
+/*	$NetBSD: db_machdep.h,v 1.7 1995/02/07 04:34:45 gwr Exp $	*/
 
 #include <m68k/db_machdep.h>
 
 /* This enables some code in db_command.c */
 #define DB_MACHINE_COMMANDS
 
-extern char	*esym;	/* end of symbols */
-void ddb_init __P((void));
-void db_machine_init __P((void));
-
-/* These are in db_memrw.c */
-extern void db_read_bytes  __P((vm_offset_t addr, size_t size, char *data));
-extern void db_write_bytes __P((vm_offset_t addr, size_t size, char *data));
diff --git a/sys/arch/sun3/include/dvma.h b/sys/arch/sun3/include/dvma.h
index 9d6abdeb560..796042aebac 100644
--- a/sys/arch/sun3/include/dvma.h
+++ b/sys/arch/sun3/include/dvma.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: dvma.h,v 1.5 1996/12/17 21:11:05 gwr Exp $	*/
+/*	$NetBSD: dvma.h,v 1.4 1996/11/20 18:57:08 gwr Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -75,16 +75,14 @@
 #define	DVMA_SPACE_START	0x0FF00000
 #define DVMA_SPACE_END  	0x0FFFE000
 
-void dvma_init __P((void));
-
 /* Allocate/free actual pages of DVMA space. */
-caddr_t dvma_malloc __P((size_t bytes));
+caddr_t dvma_malloc(size_t bytes);
 void dvma_free(caddr_t addr, size_t bytes);
 
 /* Remap/unmap kernel memory in DVMA space. */
-caddr_t dvma_mapin __P((char *kva, int len));
-void dvma_mapout __P((caddr_t dvma_addr, int len));
+caddr_t dvma_mapin(char *kva, int len);
+void dvma_mapout(caddr_t dvma_addr, int len);
 
 /* Convert a kernel DVMA pointer to a slave address. */
-long dvma_kvtopa __P((long kva, int bus));
+long dvma_kvtopa(long kva, int bus);
 
diff --git a/sys/arch/sun3/include/idprom.h b/sys/arch/sun3/include/idprom.h
index 2b8b682d18b..42c30ce4ed1 100644
--- a/sys/arch/sun3/include/idprom.h
+++ b/sys/arch/sun3/include/idprom.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: idprom.h,v 1.13 1996/12/17 21:11:07 gwr Exp $	*/
+/*	$NetBSD: idprom.h,v 1.12 1996/11/20 18:57:10 gwr Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,24 +53,8 @@ struct idprom {
 #define IDPROM_VERSION 1
 #define IDPROM_SIZE (sizeof(struct idprom))
 
-/* values for cpu_machine_id */
-
-#define CPU_ARCH_MASK  0xf0
-#define SUN3_ARCH      0x10
-#define SUN3_IMPL_MASK 0x0f
-#define SUN3_MACH_160  0x01
-#define SUN3_MACH_50   0x02
-#define SUN3_MACH_260  0x03
-#define SUN3_MACH_110  0x04
-#define SUN3_MACH_60   0x07
-#define SUN3_MACH_E    0x08
-
 #ifdef	_KERNEL
-
 extern struct idprom identity_prom;
-extern u_char cpu_machine_id;
-
-int idprom_init __P((void));
+int idprom_init();
 void idprom_etheraddr __P((u_char *));
-
-#endif	/* _KERNEL */
+#endif
diff --git a/sys/arch/sun3/include/isr.h b/sys/arch/sun3/include/isr.h
new file mode 100644
index 00000000000..228708ea082
--- /dev/null
+++ b/sys/arch/sun3/include/isr.h
@@ -0,0 +1,47 @@
+/*	$NetBSD: isr.h,v 1.10 1996/11/20 18:57:11 gwr Exp $	*/
+
+/*-
+ * Copyright (c) 1996 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Adam Glass and Gordon W. Ross.
+ *
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 REGENTS 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.
+ */
+
+void isr_init __P((void));
+void isr_config __P((void));
+
+void isr_add_custom __P((int, void (*handler)()));
+void isr_add_autovect __P((int (*handler)(), void *arg, int level));
+void isr_add_vectored __P((int (*handler)(), void *arg, int pri, int vec));
+
+void isr_soft_request __P((int level));
+void isr_soft_clear __P((int level));
diff --git a/sys/arch/sun3/include/mon.h b/sys/arch/sun3/include/mon.h
index fcf37ddfa84..447e1629524 100644
--- a/sys/arch/sun3/include/mon.h
+++ b/sys/arch/sun3/include/mon.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: mon.h,v 1.20 1996/12/17 21:11:08 gwr Exp $	*/
+/*	$NetBSD: mon.h,v 1.19 1996/11/20 18:57:12 gwr Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -103,44 +103,44 @@ typedef struct bootparam {
  *       translate these structs into Sprite format.
  */
 typedef struct {
-	char	*initSp;		/* Initial system stack ptr  
-					 * for hardware */
-	int	(*startMon)__P((void));	/* Initial PC for hardware */
+	char		*initSp;		/* Initial system stack ptr  
+						 * for hardware */
+	int		(*startMon)();		/* Initial PC for hardware */
 
-	int	*diagberr;		/* Bus err handler for diags */
+	int		*diagberr;		/* Bus err handler for diags */
 
 	/* 
 	 * Monitor and hardware revision and identification
 	 */
 
-	struct bootparam **bootParam;	/* Info for bootstrapped pgm */
- 	u_int	*memorySize;		/* Usable memory in bytes */
+	struct bootparam **bootParam;		/* Info for bootstrapped pgm */
+ 	unsigned	*memorySize;		/* Usable memory in bytes */
 
 	/* 
 	 * Single-character input and output 
 	 */
 
-	u_char	(*getChar)__P((void));	/* Get char from input source */
-	int	(*putChar)__P((int));	/* Put char to output sink */
-	int	(*mayGet)__P((void));	/* Maybe get char, or -1 */
-	int	(*mayPut)__P((int));	/* Maybe put char, or -1 */
-	u_char	*echo;		/* Should getchar echo? */
-	u_char	*inSource;	/* Input source selector */
-	u_char	*outSink;	/* Output sink selector */
+	unsigned char	(*getChar)();		/* Get char from input source */
+	int		(*putChar)();		/* Put char to output sink */
+	int		(*mayGet)();		/* Maybe get char, or -1 */
+	int		(*mayPut)();		/* Maybe put char, or -1 */
+	unsigned char	*echo;			/* Should getchar echo? */
+	unsigned char	*inSource;		/* Input source selector */
+	unsigned char	*outSink;		/* Output sink selector */
 
 	/* 
 	 * Keyboard input (scanned by monitor nmi routine) 
 	 */
 
-	int	(*getKey)__P((void));	/* Get next key if one exists */
-	int	(*initGetKey)__P((void*)); /* Initialize get key */
-	u_int	*translation;		/* Kbd translation selector 
-					   (see keyboard.h in sun 
-					    monitor code) */
-	u_char	*keyBid;		/* Keyboard ID byte */
-	int	*screen_x;		/* V2: Screen x pos (R/O) */
-	int	*screen_y;		/* V2: Screen y pos (R/O) */
-	struct keybuf	*keyBuf;	/* Up/down keycode buffer */
+	int		(*getKey)();		/* Get next key if one exists */
+	int		(*initGetKey)();	/* Initialize get key */
+	unsigned int	*translation;		/* Kbd translation selector 
+						   (see keyboard.h in sun 
+						    monitor code) */
+	unsigned char	*keyBid;		/* Keyboard ID byte */
+	int		*screen_x;		/* V2: Screen x pos (R/O) */
+	int		*screen_y;		/* V2: Screen y pos (R/O) */
+	struct keybuf	*keyBuf;		/* Up/down keycode buffer */
 
 	/*
 	 * Monitor revision level.
@@ -152,52 +152,51 @@ typedef struct {
 	 * Frame buffer output and terminal emulation 
 	 */
 
-	int	(*fbWriteChar)__P((int)); /* Write a character to FB */
-	int	*fbAddr;		/* Address of frame buffer */
-	char	**font;			/* Font table for FB */
-	/* Quickly write string to FB */
-	int	(*fbWriteStr)__P((char *buf, int len));
+	int		(*fbWriteChar)();	/* Write a character to FB */
+	int		*fbAddr;		/* Address of frame buffer */
+	char		**font;			/* Font table for FB */
+	int		(*fbWriteStr)();	/* Quickly write string to FB */
 
 	/* 
 	 * Reboot interface routine -- resets and reboots system.  No return. 
 	 */
 
-	int	(*reBoot)__P((char *));	/* e.g. reBoot("xy()vmunix") */
+	int		(*reBoot)();		/* e.g. reBoot("xy()vmunix") */
 
 	/* 
 	 * Line input and parsing 
 	 */
 
-	u_char	*lineBuf;	/* The line input buffer */
-	u_char	**linePtr;	/* Cur pointer into linebuf */
-	int		*lineSize;	/* length of line in linebuf */
-	int	(*getLine)__P((int));	/* Get line from user */
-	u_char	(*getNextChar)__P((void)); /* Get next char from linebuf */
-	u_char	(*peekNextChar)__P((void));	/* Peek at next char */
+	unsigned char	*lineBuf;		/* The line input buffer */
+	unsigned char	**linePtr;		/* Cur pointer into linebuf */
+	int		*lineSize;		/* length of line in linebuf */
+	int		(*getLine)();		/* Get line from user */
+	unsigned char	(*getNextChar)();	/* Get next char from linebuf */
+	unsigned char	(*peekNextChar)();	/* Peek at next char */
 	int		*fbThere;		/* =1 if frame buffer there */
-	int		(*getNum)__P((void));	/* Grab hex num from line */
+	int		(*getNum)();		/* Grab hex num from line */
 
 	/* 
 	 * Print formatted output to current output sink 
 	 */
 
-	int	(*printf)__P((char *, ...));	/* Like kernel printf */
-	int	(*printHex)__P((int,int));	/* Format N digits in hex */
+	int		(*printf)();		/* Similar to "Kernel printf" */
+	int		(*printHex)();		/* Format N digits in hex */
 
 	/*
 	 * Led stuff 
 	 */
 
-	u_char	*leds;			/* RAM copy of LED register */
-	int	(*setLeds)__P((int));	/* Sets LED's and RAM copy */
+	unsigned char	*leds;			/* RAM copy of LED register */
+	int		(*setLeds)();		/* Sets LED's and RAM copy */
 
 	/* 
 	 * Non-maskable interrupt  (nmi) information
 	 */ 
 
-	int	(*nmiAddr)__P((void*));	/* Addr for level 7 vector */
-	int	(*abortEntry)__P((void*)); /* Entry for keyboard abort */
-	int	*nmiClock;		/* Counts up in msec */
+	int		(*nmiAddr)();		/* Addr for level 7 vector */
+	int		(*abortEntry)();	/* Entry for keyboard abort */
+	int		*nmiClock;		/* Counts up in msec */
 
 	/*
 	 * Frame buffer type: see <sun/fbio.h>
@@ -209,28 +208,24 @@ typedef struct {
 	 * Assorted other things 
 	 */
 
-	u_int	romvecVersion;		/* Version # of Romvec */ 
-	struct globram  *globRam;	/* monitor global variables */
-	caddr_t		kbdZscc;	/* Addr of keyboard in use */
-
-	int	*keyrInit;		/* ms before kbd repeat */
-	u_char	*keyrTick; 		/* ms between repetitions */
-	u_int	*memoryAvail;		/* V1: Main mem usable size */
-	long	*resetAddr;		/* where to jump on a reset */
-	long	*resetMap;		/* pgmap entry for resetaddr */
-					/* Really struct pgmapent *  */
-	int	(*exitToMon)__P((void)); /* Exit from user program */
-	u_char	**memorybitmap;		/* V1: &{0 or &bits} */
-
-	/* Set seg in all contexts */
-	void	(*setcxsegmap)__P((int,int,int));
-
-	/* V2: Handler for 'v' cmd */
-	void	(**vector_cmd)__P((int, char*));
-	int	dummy1z;
-	int	dummy2z;
-	int	dummy3z;
-	int	dummy4z;
+	unsigned	romvecVersion;		/* Version # of Romvec */ 
+	struct globram  *globRam;		/* monitor global variables */
+	caddr_t		kbdZscc;		/* Addr of keyboard in use */
+
+	int		*keyrInit;		/* ms before kbd repeat */
+	unsigned char	*keyrTick; 		/* ms between repetitions */
+	unsigned	*memoryAvail;		/* V1: Main mem usable size */
+	long		*resetAddr;		/* where to jump on a reset */
+	long		*resetMap;		/* pgmap entry for resetaddr */
+						/* Really struct pgmapent *  */
+	int		(*exitToMon)();		/* Exit from user program */
+	unsigned char	**memorybitmap;		/* V1: &{0 or &bits} */
+	void		(*setcxsegmap)();	/* Set seg in any context */
+	void		(**vector_cmd)();	/* V2: Handler for 'v' cmd */
+	int		dummy1z;
+	int		dummy2z;
+	int		dummy3z;
+	int		dummy4z;
 } MachMonRomVector;
 
 /*
@@ -239,7 +234,7 @@ typedef struct {
  *
  * getChar -- Return the next character from the input source
  *
- *     u_char getChar()
+ *     unsigned char getChar()
  *
  * putChar -- Write the given character to the output source.
  *
@@ -270,12 +265,12 @@ typedef struct {
  * fbWriteChar -- Write a character to the frame buffer
  *
  *	void fwritechar(ch)
- *	    u_char ch;
+ *	    unsigned char ch;
  *
  * fbWriteStr -- Write a string to the frame buffer.
  *
  *   	void fwritestr(addr,len)
- *  	    register u_char *addr;	/ * String to be written * /
+ *  	    register unsigned char *addr;	/ * String to be written * /
  *  	    register short len;			/ * Length of string * /
  *
  * getLine -- read the next input line into a global buffer
@@ -285,11 +280,11 @@ typedef struct {
  *
  * getNextChar -- return the next character from the global line buffer.
  *
- *	u_char getNextChar()
+ *	unsigned char getNextChar()
  *
  * peekNextChar -- look at the next character in the global line buffer.
  *
- *	u_char peekNextChar()
+ *	unsigned char peekNextChar()
  *
  * getNum -- Grab hex num from the global line buffer.
  *
diff --git a/sys/arch/sun3/include/obio.h b/sys/arch/sun3/include/obio.h
index 2d2b118f320..e687a5a4206 100644
--- a/sys/arch/sun3/include/obio.h
+++ b/sys/arch/sun3/include/obio.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.h,v 1.17 1996/12/17 21:11:09 gwr Exp $	*/
+/*	$NetBSD: obio.h,v 1.16 1996/11/20 18:57:14 gwr Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -65,29 +65,21 @@
 #define OBIO_ZS_SIZE		0x00008
 #define OBIO_EEPROM_SIZE	0x00800
 #define OBIO_CLOCK_SIZE		0x00020
-#define OBIO_MEMERR_SIZE	0x00008
-#define OBIO_INTERREG_SIZE	0x00001
-#define OBIO_INTEL_ETHER_SIZE	0x00001
-#define OBIO_COLOR_MAP_SIZE	0x00400
-#define OBIO_EPROM_SIZE		0x10000
-#define OBIO_AMD_ETHER_SIZE	0x00004
-#define OBIO_NCR_SCSI_SIZE	0x00020
-#define OBIO_DES_SIZE		0x00004
-#define OBIO_ECCREG_SIZE	0x00100
+#define OBIO_MEMERR_SIZE	0x00008			
+#define OBIO_INTERREG_SIZE	0x00001			
+#define OBIO_INTEL_ETHER_SIZE	0x00001			
+#define OBIO_COLOR_MAP_SIZE	0x00400			
+#define OBIO_EPROM_SIZE		0x10000		
+#define OBIO_AMD_ETHER_SIZE	0x00004			
+#define OBIO_NCR_SCSI_SIZE	0x00020			
+#define OBIO_IO_BUS_SIZE      0x1000000			
+#define OBIO_DES_SIZE		0x00004		
+#define OBIO_ECCREG_SIZE	0x00100			
 
 #ifdef	_KERNEL
 
-caddr_t	obio_alloc __P((int, int));
-void	obio_init __P((void));
-caddr_t	obio_find_mapping __P((int pa, int size));
-caddr_t	obio_vm_alloc __P((int));
-
-/*
- * These are some OBIO devices that need early init calls.
- */
-void	zs_init     __P((void));
-void	eeprom_init __P((void));
-void	intreg_init __P((void));
-void	clock_init  __P((void));
+caddr_t obio_alloc __P((int, int));
+caddr_t obio_vm_alloc __P((int));
+caddr_t obio_find_mapping __P((int pa, int size));
 
 #endif	/* _KERNEL */
diff --git a/sys/arch/sun3/include/pmap.h b/sys/arch/sun3/include/pmap.h
index 0c4c3b274f9..6f9c9ecb03c 100644
--- a/sys/arch/sun3/include/pmap.h
+++ b/sys/arch/sun3/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.16 1996/12/17 21:11:10 gwr Exp $	*/
+/*	$NetBSD: pmap.h,v 1.15 1996/11/20 18:57:16 gwr Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -56,9 +56,6 @@ typedef struct pmap *pmap_t;
 
 #ifdef _KERNEL
 struct pmap	kernel_pmap_store;
-struct pcb;
-void   pmap_activate __P((pmap_t pmap, struct pcb *pcbp));
-void pmap_deactivate __P((pmap_t pmap, struct pcb *pcbp));
 
 #define	pmap_kernel()			(&kernel_pmap_store)
 
diff --git a/sys/arch/sun3/include/proc.h b/sys/arch/sun3/include/proc.h
index 9247a10294c..941e467d811 100644
--- a/sys/arch/sun3/include/proc.h
+++ b/sys/arch/sun3/include/proc.h
@@ -1,8 +1,9 @@
-/*	$NetBSD: proc.h,v 1.8 1996/11/25 22:09:11 gwr Exp $	*/
+/*	$NetBSD: proc.h,v 1.7 1994/11/21 21:34:06 gwr Exp $	*/
 
 /*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1994 Gordon W. Ross
+ * Copyright (c) 1991 Regents of the University of California.
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +33,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: proc.h	8.1 (Berkeley) 6/10/93
+ *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
+ *	proc.h,v 1.2 1993/05/22 07:58:30 cgd Exp
  */
 
 /*
diff --git a/sys/arch/sun3/include/psl.h b/sys/arch/sun3/include/psl.h
index aee1c2c7d33..4fe2914b7d0 100644
--- a/sys/arch/sun3/include/psl.h
+++ b/sys/arch/sun3/include/psl.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: psl.h,v 1.11 1996/12/17 21:11:11 gwr Exp $	*/
+/*	$NetBSD: psl.h,v 1.10 1996/11/20 18:57:17 gwr Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -101,12 +101,12 @@ extern __inline__ int _spl(int new)
 #define splclock()      spl5()
 #define splstatclock()  splclock()
 
+/* Zilog Serial hardware interrupts (hard-wired at 6) */
+#define splzs()         spl6()
+
 /* Block out all interrupts (except NMI of course). */
 #define splhigh()       spl7()
 #define splsched()      spl7()
 
-/* Get current sr value (debug, etc.) */
-extern int getsr __P((void));
-
 #endif	/* KERNEL && !_LOCORE */
 #endif	/* PSL_C */
diff --git a/sys/arch/sun3/include/types.h b/sys/arch/sun3/include/types.h
index 10346b657af..db77cff88b8 100644
--- a/sys/arch/sun3/include/types.h
+++ b/sys/arch/sun3/include/types.h
@@ -1,3 +1,3 @@
-/*	$NetBSD: types.h,v 1.10 1996/12/17 21:11:12 gwr Exp $	*/
+/*	$NetBSD: types.h,v 1.8 1996/11/20 18:57:21 gwr Exp $	*/
 
 #include <m68k/types.h>
diff --git a/sys/arch/sun3/include/z8530var.h b/sys/arch/sun3/include/z8530var.h
index 55bcf558709..1164ad3f7f7 100644
--- a/sys/arch/sun3/include/z8530var.h
+++ b/sys/arch/sun3/include/z8530var.h
@@ -80,6 +80,3 @@ void zs_abort();
  */
 #define	ZSTTY_MAJOR 	12		/* XXX */
 #define	ZSTTY_DEF_CFLAG 	(CREAD | CS8 | HUPCL)
-
-/* Zilog Serial hardware interrupts (hard-wired at 6) */
-#define splzs()         spl6()