sync + our changes

7 files changed, 126 insertions, 16 deletions

diff --git a/sys/arch/sun3/include/autoconf.h b/sys/arch/sun3/include/autoconf.h
index 9b90ac4c081..88b546db3c6 100644
--- a/sys/arch/sun3/include/autoconf.h
+++ b/sys/arch/sun3/include/autoconf.h
@@ -58,7 +58,7 @@ struct confargs {
 #define cf_intvec	cf_loc[2]
 
 int bus_scan __P((struct device *, void *, void *));
-int  bus_print __P((void *, char *));
-int  bus_peek __P((int, int, int));
+int bus_print __P((void *, char *));
+int bus_peek __P((int, int, int));
 char * bus_mapin __P((int, int, int));
 
diff --git a/sys/arch/sun3/include/exec.h b/sys/arch/sun3/include/exec.h
index 53310fea489..b28a4ea597d 100644
--- a/sys/arch/sun3/include/exec.h
+++ b/sys/arch/sun3/include/exec.h
@@ -44,11 +44,4 @@ struct relocation_info_m68k {
 };
 #define relocation_info	relocation_info_m68k
 
-#define ELF_TARG_CLASS		ELFCLASS32
-#define ELF_TARG_DATA		ELFDATA2MSB
-#define ELF_TARG_MACH		EM_68K
-
-#define DO_AOUT			/* support a.out */
-#define DO_ELF			/* support ELF */
-
 #endif  /* _LDPGSZ */
diff --git a/sys/arch/sun3/include/kcore.h b/sys/arch/sun3/include/kcore.h
new file mode 100644
index 00000000000..77e95ce93bc
--- /dev/null
+++ b/sys/arch/sun3/include/kcore.h
@@ -0,0 +1,47 @@
+/*	$NetBSD: kcore.h,v 1.1 1996/05/05 04:19:31 gwr Exp $	*/
+
+/*
+ * Copyright (c) 1996 Leo Weppelman.
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Leo Weppelman.
+ * 4. 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_KCORE_H_
+#define _MACHINE_KCORE_H_
+
+/*
+ * In the dump device, there is a kcore_seg_t
+ * followed by one of these.  The size will be
+ * padded out appropriately by the kernel.
+ */
+
+typedef struct cpu_kcore_hdr {
+	phys_ram_seg_t	ram_segs[4];
+	u_char ksegmap[256];
+} cpu_kcore_hdr_t;
+
+#endif	/* _MACHINE_KCORE_H_ */
diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h
index 561a62fd55e..befd54ed918 100644
--- a/sys/arch/sun3/include/param.h
+++ b/sys/arch/sun3/include/param.h
@@ -48,11 +48,11 @@
 /*
  * Machine dependent constants for the Sun3 series.
  */
-#define	_MACHINE     sun3
-#define	MACHINE     "sun3"
+#define	_MACHINE	sun3
+#define	MACHINE		"sun3"
 #define	_MACHINE_ARCH	m68k
 #define	MACHINE_ARCH	"m68k"
-#define MID_MACHINE MID_M68K
+#define	MID_MACHINE	MID_M68K
 
 /*
  * Round p (pointer or byte index) up to a correctly-aligned value
diff --git a/sys/arch/sun3/include/pcb.h b/sys/arch/sun3/include/pcb.h
index e94da41a646..f2797c5f5e4 100644
--- a/sys/arch/sun3/include/pcb.h
+++ b/sys/arch/sun3/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcb.h,v 1.8 1994/11/21 21:34:02 gwr Exp $	*/
+/*	$NetBSD: pcb.h,v 1.9 1996/06/18 16:03:45 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -48,10 +48,10 @@
 /*
  * Sun3 process control block
  */
-struct pcb
-{
+struct pcb {
 	short	pcb_flags;	/* misc. process flags */
 	short	pcb_ps; 	/* processor status word */
+	int	pcb_mmuctx;	/* MMU context number */
 	int	pcb_usp;	/* user stack pointer */
 	int	pcb_regs[12];	/* D2-D7, A2-A7 */
 	caddr_t	pcb_onfault;	/* for copyin/out faults */
diff --git a/sys/arch/sun3/include/pte.h b/sys/arch/sun3/include/pte.h
index f0bee459629..adc91551c75 100644
--- a/sys/arch/sun3/include/pte.h
+++ b/sys/arch/sun3/include/pte.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pte.h,v 1.9 1995/03/10 02:28:01 gwr Exp $	*/
+/*	$NetBSD: pte.h,v 1.10 1996/05/05 04:18:28 gwr Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -74,6 +74,8 @@
 #define	PGT_VME_D16	MAKE_PGTYPE(VME_D16)	/* VMEbus 16-bit data */
 #define	PGT_VME_D32	MAKE_PGTYPE(VME_D32)	/* VMEbus 32-bit data */
 
+#define VA_SEGNUM(x)	((u_int)(x) >> SEGSHIFT)
+
 #define VA_PTE_NUM_SHIFT  13
 #define VA_PTE_NUM_MASK (0xF << VA_PTE_NUM_SHIFT)
 #define VA_PTE_NUM(va) ((va & VA_PTE_NUM_MASK) >> VA_PTE_NUM_SHIFT)
diff --git a/sys/arch/sun3/include/remote-sl.h b/sys/arch/sun3/include/remote-sl.h
new file mode 100644
index 00000000000..4ae37abc504
--- /dev/null
+++ b/sys/arch/sun3/include/remote-sl.h
@@ -0,0 +1,68 @@
+/*	$NetBSD: remote-sl.h,v 1.1 1996/06/15 14:34:35 gwr Exp $ */
+
+/*
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Lawrence Berkeley Laboratory.
+ *
+ * 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 University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University 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 REGENTS 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.
+ *
+ *	@(#)remote-sl.h	8.1 (Berkeley) 6/11/93
+ */
+
+/*
+ * These definitions are factored out into an include file so
+ * the kernel stub has access to them.
+ */
+#define FRAME_START		0xc1		/* Frame End */
+#define FRAME_END		0xc0		/* Frame End */
+#define FRAME_ESCAPE		0xdb		/* Frame Esc */
+#define TRANS_FRAME_START	0xde		/* transposed frame start */
+#define TRANS_FRAME_END		0xdc		/* transposed frame esc */
+#define TRANS_FRAME_ESCAPE	0xdd		/* transposed frame esc */
+
+/*
+ * Message limits. SL_MAXDATA is the maximum number of bytes that can
+ * be read or written. SL_BUFSIZE is the maximum amount of data that
+ * can be passed across the serial link. The actual MTU is two times
+ * the max message (since each byte might be escaped), plus the two
+ * framing bytes. We add two to the message length to account for the
+ * type byte and checksum.
+ */
+#define SL_MAXDATA 62			/* max data that can be read */
+#define SL_RPCSIZE (1 + SL_MAXDATA)	/* errno byte + data */
+#define SL_MTU ((2 * (SL_RPCSIZE + 2) + 2))