update from netbsd (verbatim)

15 files changed, 33 insertions, 35 deletions

diff --git a/sys/arch/pc532/To.Do b/sys/arch/pc532/To.Do
index 88173f4628d..225f3d636bc 100644
--- a/sys/arch/pc532/To.Do
+++ b/sys/arch/pc532/To.Do
@@ -1,37 +1,31 @@
-$NetBSD: To.Do,v 1.4 1995/06/09 06:03:45 phil Exp $
+$NetBSD: To.Do,v 1.5 1995/12/07 07:55:11 phil Exp $
 
 This is the "To Do" list for NetBSD/pc532
   (Order is not in order of importance.)
+  (Last updated, 12/6/95)
 
 - improve scn driver (integrate mods from Phil Bunde)
 
 - get kernel debugger working
 
-- get the dp scsi driver working
+- get the ncr interrupt driven scsi driver working debugged
 
 - write an aic scsi driver
 
-- improve copyin/out and friends
+- improve copyin/out and friends  (kernel work)
 
-- get gdb working (partially done)
+- remove double mapping of the user area (kernel work)
 
-- ptrace syscall (?)
-
-- improve bim (detect a non-writeable disklabel, ...)
+- get gdb working (partially done) including kernel debugging
 
 - man4 man pages
 
 - man8 man pages
 
-- mods to better support ufs boot loader
-
-- integrate printer driver from matthias  (partially done)
+- mods to better support ffs boot loader
 
-- verify all devices including vn, tun, ...
-
-- integrate other machine independent "devices"
-
-- write a bim.8
+- improve bim (detect a non-writeable disklabel, ...)
+  write a bim.8
 
 - find or write a "usable" comm package to replace kermit for
 	initial downloading.
diff --git a/sys/arch/pc532/conf/DEFAULT b/sys/arch/pc532/conf/DEFAULT
index f25774619f9..47217dacfbe 100644
--- a/sys/arch/pc532/conf/DEFAULT
+++ b/sys/arch/pc532/conf/DEFAULT
@@ -63,7 +63,8 @@ options		GENERIC
 
 membus0 at root
 
-ncr0 at membus?
+#ncr0 at membus?
+oldncr0 at membus?
 
 scsibus0 at scsi?
 
diff --git a/sys/arch/pc532/conf/INSTALL b/sys/arch/pc532/conf/INSTALL
index 2ae8556d6c4..4261d846ab3 100644
--- a/sys/arch/pc532/conf/INSTALL
+++ b/sys/arch/pc532/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.3 1995/09/29 04:16:48 phil Exp $
+#	$NetBSD: INSTALL,v 1.4 1995/11/30 00:58:39 jtc Exp $
 #
 # INSTALL -- install kernel
 #
@@ -43,7 +43,8 @@ membus0 at root
 rd0 at membus?
 options 	RD_SIZE=0x200000
 
-ncr0 at membus?
+#ncr0 at membus?
+oldncr0 at membus?
 scsibus0 at scsi?
 
 sd* at scsibus? target ? lun ?
diff --git a/sys/arch/pc532/conf/STEELHEAD b/sys/arch/pc532/conf/STEELHEAD
index 076615e0393..b78d97c35e5 100644
--- a/sys/arch/pc532/conf/STEELHEAD
+++ b/sys/arch/pc532/conf/STEELHEAD
@@ -1,4 +1,4 @@
-#	$NetBSD: STEELHEAD,v 1.9 1995/09/26 20:16:02 phil Exp $
+#	$NetBSD: STEELHEAD,v 1.10 1995/11/30 00:58:40 jtc Exp $
 #
 # STEELHEAD: Phil Nelson's pc532
 #
@@ -59,7 +59,8 @@ membus0 at root
 
 #rd0 at membus?
 
-ncr0 at membus?
+#ncr0 at membus?
+oldncr0 at membus?
 
 scsibus0 at scsi?
 
diff --git a/sys/arch/pc532/conf/files.pc532 b/sys/arch/pc532/conf/files.pc532
index 06d6a76db93..7e561c9e402 100644
--- a/sys/arch/pc532/conf/files.pc532
+++ b/sys/arch/pc532/conf/files.pc532
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pc532,v 1.15.2.1 1995/10/17 00:18:56 phil Exp $
+#	$NetBSD: files.pc532,v 1.16 1995/11/30 00:58:42 jtc Exp $
 #
 # new style config file for pc532 architecture
 #
diff --git a/sys/arch/pc532/dev/lpt.c b/sys/arch/pc532/dev/lpt.c
index 0bd190c85ea..b851f22b527 100644
--- a/sys/arch/pc532/dev/lpt.c
+++ b/sys/arch/pc532/dev/lpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lpt.c,v 1.6.2.1 1995/10/19 01:33:06 phil Exp $	*/
+/*	$NetBSD: lpt.c,v 1.7 1995/11/30 00:58:45 jtc Exp $	*/
 
 /*
  * Copyright (c) 1994 Matthias Pfaller.
diff --git a/sys/arch/pc532/dev/ncr.c b/sys/arch/pc532/dev/ncr.c
index a67d5d620bd..414a31d1a0d 100644
--- a/sys/arch/pc532/dev/ncr.c
+++ b/sys/arch/pc532/dev/ncr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr.c,v 1.20.2.1 1995/10/19 01:33:08 phil Exp $ */
+/*	$NetBSD: ncr.c,v 1.21 1995/11/30 00:58:47 jtc Exp $ */
 
 /*
  * Copyright (c) 1994 Matthias Pfaller.
@@ -29,7 +29,7 @@
  * (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: ncr.c,v 1.2 1995/10/26 01:11:45 deraadt Exp $
+ *	$Id: ncr.c,v 1.3 1995/12/14 05:29:21 deraadt Exp $
  */
 
 #include <sys/param.h>
diff --git a/sys/arch/pc532/dev/ncr5380.c b/sys/arch/pc532/dev/ncr5380.c
index a0372cdef00..068161e7c55 100644
--- a/sys/arch/pc532/dev/ncr5380.c
+++ b/sys/arch/pc532/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr5380.c,v 1.5.2.1 1995/10/19 01:33:09 phil Exp $	*/
+/*	$NetBSD: ncr5380.c,v 1.6 1995/11/30 00:58:50 jtc Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
diff --git a/sys/arch/pc532/dev/ncr5380reg.h b/sys/arch/pc532/dev/ncr5380reg.h
index 11945a4341c..07fc0c00be3 100644
--- a/sys/arch/pc532/dev/ncr5380reg.h
+++ b/sys/arch/pc532/dev/ncr5380reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr5380reg.h,v 1.3.2.1 1995/10/19 01:33:11 phil Exp $	*/
+/*	$NetBSD: ncr5380reg.h,v 1.4 1995/11/30 00:58:54 jtc Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
diff --git a/sys/arch/pc532/dev/ncrreg.h b/sys/arch/pc532/dev/ncrreg.h
index 41f91fe446f..7016e37550d 100644
--- a/sys/arch/pc532/dev/ncrreg.h
+++ b/sys/arch/pc532/dev/ncrreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncrreg.h,v 1.2.2.1 1995/10/19 01:33:12 phil Exp $ */
+/*	$NetBSD: ncrreg.h,v 1.3 1995/11/30 00:58:56 jtc Exp $ */
 
 /*
  * Copyright (c) 1994 Matthias Pfaller.
@@ -29,7 +29,7 @@
  * (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: ncrreg.h,v 1.2 1995/10/26 01:11:48 deraadt Exp $
+ *	$Id: ncrreg.h,v 1.3 1995/12/14 05:29:24 deraadt Exp $
  */
 
 #ifndef _NCRREG_H
diff --git a/sys/arch/pc532/include/types.h b/sys/arch/pc532/include/types.h
index c048c9ae906..776ea0dc7ea 100644
--- a/sys/arch/pc532/include/types.h
+++ b/sys/arch/pc532/include/types.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.11 1995/08/25 07:52:20 phil Exp $	*/
+/*	$NetBSD: types.h,v 1.12 1995/12/09 04:41:41 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -70,5 +70,6 @@ typedef	unsigned long long	u_int64_t;
 typedef int32_t			register_t;
 
 #define	__SWAP_BROKEN
+#define	__FORK_BRAINDAMAGE
 
 #endif	/* _MACHTYPES_H_ */
diff --git a/sys/arch/pc532/pc532/locore.s b/sys/arch/pc532/pc532/locore.s
index f468675555d..2862bf29997 100644
--- a/sys/arch/pc532/pc532/locore.s
+++ b/sys/arch/pc532/pc532/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.29.2.1 1995/10/17 00:19:05 phil Exp $	*/
+/*	$NetBSD: locore.s,v 1.30 1995/11/30 00:59:00 jtc Exp $	*/
 
 /*
  * Copyright (c) 1993 Philip A. Nelson.
diff --git a/sys/arch/pc532/pc532/machdep.c b/sys/arch/pc532/pc532/machdep.c
index 42289c3da3a..cf6b5fa0c22 100644
--- a/sys/arch/pc532/pc532/machdep.c
+++ b/sys/arch/pc532/pc532/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.40.2.2 1995/11/22 20:36:08 phil Exp $	*/
+/*	$NetBSD: machdep.c,v 1.41 1995/11/30 00:59:02 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
diff --git a/sys/arch/pc532/stand/Makefile b/sys/arch/pc532/stand/Makefile
index e3b12949760..70405bfa716 100644
--- a/sys/arch/pc532/stand/Makefile
+++ b/sys/arch/pc532/stand/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7.2.2 1995/10/24 19:23:09 phil Exp $
+#	$NetBSD: Makefile,v 1.8 1995/11/30 00:59:05 jtc Exp $
 
 #	@(#)Makefile	8.1 (Berkeley) 6/10/93
 
diff --git a/sys/arch/pc532/stand/boot.c b/sys/arch/pc532/stand/boot.c
index bd69ffb0b41..2aa99d1e2d7 100644
--- a/sys/arch/pc532/stand/boot.c
+++ b/sys/arch/pc532/stand/boot.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.4.2.1 1995/10/17 00:19:15 phil Exp $	*/
+/*	$NetBSD: boot.c,v 1.5 1995/11/30 00:59:06 jtc Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$NetBSD: boot.c,v 1.4.2.1 1995/10/17 00:19:15 phil Exp $";
+static char rcsid[] = "$NetBSD: boot.c,v 1.5 1995/11/30 00:59:06 jtc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -74,7 +74,7 @@ main()
 	cninit();
 	scsiinit();
 
-	printf("\n>> NetBSD BOOT pc532 [$Revision: 1.2 $]\n");
+	printf("\n>> NetBSD BOOT pc532 [$Revision: 1.3 $]\n");
 
 	bdev  = B_TYPE(bootdev);
 	bctlr = B_CONTROLLER(bootdev);