from netbsd; Switch to ncr_si (will just do PIO for now) and cleanup

4 files changed, 165 insertions, 57 deletions

diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS
index eaa150bb1b2..15b24d9f074 100644
--- a/sys/arch/sun3/conf/DISKLESS
+++ b/sys/arch/sun3/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$NetBSD: DISKLESS,v 1.10 1995/10/08 23:38:41 gwr Exp $
+#	$NetBSD: DISKLESS,v 1.10.2.1 1995/11/18 07:15:46 gwr Exp $
 
 #
 # DISKLESS Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
@@ -19,9 +19,9 @@ maxusers	4
 options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
 options		KTRACE				# system call tracing support
 #makeoptions	DEBUG="-g"			# symbols for kgdb + nm
+#options 	DDB
 
 # Filesystem options
-#options 	NFSSERVER			# nfs server support
 options 	NFSCLIENT			# nfs client support
 #
 options 	FDESC		# /dev/fd/*
@@ -37,11 +37,11 @@ options		INET				# IP prototol stack support
 options 	NFS_BOOT_RWSIZE=1024
 
 # Compatability options
-options		COMPAT_SUNOS	# can run SunOS 4.1.1 executables
+options 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
 #options 	COMPAT_09	# NetBSD 0.9,
-options		COMPAT_10	# NetBSD 1.0,
-options		COMPAT_43	# and 4.3BSD
-options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+options 	COMPAT_10	# NetBSD 1.0,
+options 	COMPAT_43	# and 4.3BSD
+options 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
 # Sun3-specific debugging options
 #options 	CONTEXT_DEBUG
@@ -50,23 +50,53 @@ options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 #options 	SYSCALL_DEBUG
 #options 	EXEC_DEBUG
 #options 	DIAGNOSTIC
-#options 	SCSIDEBUG
 
 config		netbsd root on nfs swap on nfs
 
-# Devices
-
-bwtwo0 at obmem0 addr ?
-cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
-cgfour0 at obmem0 addr ?
+#
+# Network devices
+#
 
+# Intel Ethernet (onboard, or VME)
 ie0 at obio0 addr ? level ?
 ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75
 
+# Lance Ethernet (only onboard)
 le0 at obio0 addr ? level ?
 
+#
+# Frame buffer devices
+#
+
+# The default cgfour address depends on the machine:
+# 3/60: obio 0xFF200000 .. 0xFF9fffff
+# 3/110: different? (not tested)
+cgfour0 at obmem0 addr ?
+
+# 3/60 P4 accelerated 8-bit color frame buffer
+# cgsix0 at obmem0 addr ?
+
+# 3/60 P4 24-bit color frame buffer
+# cgeight0 at obmem0 addr ?
+
+# The default bwtwo address depends on the machine:
+# 3/50: obio   0x100000
+# else: obio 0xff000000
+bwtwo0 at obmem0 addr ?
+# 3/60 P4 color frame buffer overlay plane, or P4 monochrome frame buffer
+#bwtwo1 at obmem0 addr 0xff300000
+# 3/60 plug-in color frame buffer overlay plane
+#bwtwo1 at obmem0 addr 0xff400000
+
+# Sun-3 color board, or CG5 8-bit VME frame buffer.
+cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
+
+# Support for the CG9 24-bit VME frame buffer.
+# cgnine0 at vmel0 addr 0x08000000
+
+# Misc.
 pseudo-device	loop	1		# network loopback
-#pseudo-device	bpfilter 4		# packet filter
+#pseudo-device	bpfilter 8		# packet filter
 #pseudo-device	sl	2		# CSLIP
 #pseudo-device	ppp	2		# PPP
 #pseudo-device	tun	2		# network tunneling over tty
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index eb317efa799..9c69d4f17f6 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.24 1995/10/08 23:38:43 gwr Exp $
+#	$NetBSD: GENERIC,v 1.24.2.1 1995/11/18 07:15:57 gwr Exp $
 
 #
 # GENERIC Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
@@ -19,7 +19,7 @@ maxusers	4
 options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
 options		KTRACE				# system call tracing support
 #makeoptions	DEBUG="-g"			# symbols for kgdb + nm
-options		DDB
+options 	DDB
 
 # Filesystem options
 options 	NFSSERVER			# nfs server support
@@ -36,7 +36,7 @@ options 	UNION		# union file system
 
 # Networking options
 options		INET				# IP prototol stack support
-# XXX - Work-around for slow SunOS/Sun3 servers (sigh...)
+# XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
 options 	NFS_BOOT_RWSIZE=1024
 
 # Compatability options
@@ -47,31 +47,81 @@ options 	COMPAT_43	# and 4.3BSD
 options 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
 # Sun3-specific debugging options
-options 	CONTEXT_DEBUG
-options 	PMAP_DEBUG
+#options 	CONTEXT_DEBUG
+#options 	PMAP_DEBUG
 #options 	VMFAULT_TRACE
 #options 	SYSCALL_DEBUG
-options 	EXEC_DEBUG
+#options 	EXEC_DEBUG
 options 	DIAGNOSTIC
 options 	SCSIDEBUG
 
 config		netbsd swap generic
 
-# Devices
-
-bwtwo0 at obmem0 addr ?
-cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
-cgfour0 at obmem0 addr ?
+#
+# Network devices
+#
 
+# Intel Ethernet (onboard, or VME)
 ie0 at obio0 addr ? level ?
 ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75
 
+# Lance Ethernet (only onboard)
 le0 at obio0 addr ? level ?
 
-si0 at obio0 addr ? level ?
-si0 at vmes0 addr 0xff200000 level 2 vect 0x40
-si1 at vmes0 addr 0xff204000 level 2 vect 0x41
+#
+# Disk and tape devices
+#
+
+# Sun3 "si" SCSI controller (NCR 5380)
+ncr_si0 at obio0 addr ? level ?
+ncr_si0 at vmes0 addr 0xff200000 level 2 vect 0x40
+ncr_si1 at vmes0 addr 0xff204000 level 2 vect 0x41
+
+# Xylogics 7053 controllers
+# xdc0 at vmel0 addr 0xffffee80 level 2 vect 0x44
+# xdc1 at vmel0 addr 0xffffee90 level 2 vect 0x45
+# xd* at xdc? drive ?
+
+# Xylogics 450/451 controllers
+# xyc0 at vmes0 addr 0xffffee40 level 2 vect 0x48
+# xyc1 at vmes0 addr 0xffffee48 level 2 vect 0x49
+# xy* at xyc? drive ?
 
+# Xylogics 472 tape controllers?
+
+#
+# Frame buffer devices
+#
+
+# The default cgfour address depends on the machine:
+# 3/60: obio 0xFF200000 .. 0xFF9fffff
+# 3/110: different? (not tested)
+cgfour0 at obmem0 addr ?
+
+# 3/60 P4 accelerated 8-bit color frame buffer
+# cgsix0 at obmem0 addr ?
+
+# 3/60 P4 24-bit color frame buffer
+# cgeight0 at obmem0 addr ?
+
+# The default bwtwo address depends on the machine:
+# 3/50: obio   0x100000
+# else: obio 0xff000000
+bwtwo0 at obmem0 addr ?
+# 3/60 P4 color frame buffer overlay plane, or P4 monochrome frame buffer
+#bwtwo1 at obmem0 addr 0xff300000
+# 3/60 plug-in color frame buffer overlay plane
+#bwtwo1 at obmem0 addr 0xff400000
+
+# Sun-3 color board, or CG5 8-bit VME frame buffer.
+cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
+
+# Support for the CG9 24-bit VME frame buffer.
+# cgnine0 at vmel0 addr 0x08000000
+
+#
+# SCSI infrastructure
+#
 scsibus* at scsi?
 
 # Sun compatible scsi device mappings
@@ -90,9 +140,12 @@ cd* at scsibus? target ? lun ?
 
 #ch* at scsibus? target ? lun ?
 
+
+# RAM-disk drivers
 rd0 at mainbus?
 rd1 at mainbus?
 
+# Misc.
 pseudo-device	loop	1		# network loopback
 pseudo-device	bpfilter 8		# packet filter
 pseudo-device	sl	2		# CSLIP
diff --git a/sys/arch/sun3/conf/Makefile.sun3 b/sys/arch/sun3/conf/Makefile.sun3
index 658532698c5..7a1d907d841 100644
--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sun3,v 1.34 1995/09/19 23:54:29 thorpej Exp $
+#	$NetBSD: Makefile.sun3,v 1.34.2.1 1995/11/18 07:16:06 gwr Exp $
 
 #
 # Makefile for NetBSD
@@ -6,11 +6,11 @@
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
-#	/sys/conf/``machineid''
+#	/sys/arch/sun3/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Machine generic makefile changes should be made in
-#	/sys/conf/Makefile.``machinetype''
+#	/sys/arch/sun3/conf/Makefile.sun3
 # after which config should be rerun for all machines of that type.
 #
 # N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
@@ -111,7 +111,7 @@ clean::
 lint: /tmp param.c
 	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \
 	    ${SUN3}/sun3/Locore.c ${CFILES} ${SUN3}/sun3/swapgeneric.c \
-	    ioconf.c param.c| \
+	    ioconf.c param.c | \
 	    grep -v 'struct/union .* never defined' | \
 	    grep -v 'possible pointer alignment problem'
 
@@ -119,19 +119,14 @@ locore.o: assym.s ${SUN3}/sun3/locore.s ${SUN3}/include/asm.h \
 	  ${SUN3}/include/trap.h $S/arch/m68k/include/trap.h
 	${CPP} -DLOCORE ${COPTS} ${SUN3}/sun3/locore.s | ${AS} -o locore.o
 
-# the following is necessary because autoconf.o depends on #if GENERIC
-autoconf.o: Makefile
+# depends on root or device configuration
+autoconf.o conf.o : Makefile
 
-# depends on device configuration
-conf.o : Makefile
+# depends on the supported CPU types
+locore.o sun3_startup.o pmap.o trap.o : Makefile
 
 # depends on network or filesystem configuration
-uipc_proto.o vfs_conf.o : Makefile
-
-# depends on value of SYMTAB_SPACE
-db_aout.o : Makefile
-
-sun3_startup.o pmap.o kern_xxx.o: Makefile
+uipc_proto.o vfs_conf.o kern_xxx.o : Makefile
 
 # depend on maxusers
 assym.s: Makefile
diff --git a/sys/arch/sun3/conf/RAMDISK b/sys/arch/sun3/conf/RAMDISK
index b9db67cc3fa..162db395a3d 100644
--- a/sys/arch/sun3/conf/RAMDISK
+++ b/sys/arch/sun3/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.1 1995/10/08 23:38:44 gwr Exp $
+#	$NetBSD: RAMDISK,v 1.1.2.1 1995/11/18 07:16:14 gwr Exp $
 
 #
 # RAMDISK: Root/swap on ramdisk
@@ -13,15 +13,17 @@ include "std.sun3"
 # Machines to be supported by this kernel
 options 	HAVECACHE		# Sun3/260 VAC
 
-# Enable the hooks used for initializing the ram-disk.
-options 	RAMDISK_HOOKS
-options 	MINIROOTSIZE=512	# 256K
-
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	2
 
 # Standard system options
 options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+#makeoptions	DEBUG="-g"			# symbols for kgdb + nm
+#options 	DDB
+
+# Enable the hooks used for initializing the ram-disk.
+options 	RAMDISK_HOOKS
+options 	MINIROOTSIZE=512	# 256K
 
 # Filesystem options
 # May need NFSCLIENT to get miniroot image
@@ -32,8 +34,6 @@ options		FIFO		# FIFOs; RECOMMENDED
 
 # Networking options
 options		INET				# IP prototol stack support
-# XXX - Work-around for slow SunOS/Sun3 servers (sigh...)
-options 	NFS_BOOT_RWSIZE=1024
 
 # Compatability options (XXX - Need these?)
 #options 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
@@ -43,28 +43,51 @@ options 	COMPAT_43	# and 4.3BSD
 options 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
 # Sun3-specific debugging options
-# options 	DDB
 options 	DIAGNOSTIC
 
 # The config program assumes all devices have partions...
 # Is it OK to put swap on a non-existent partition?
 config		netbsd root on rd0a swap on rd0b
 
-# Devices
-
-# RAM Disk (root for install tape)
-rd0 at mainbus?
-
-# No frame-buffer devices.
+#
+# Network devices
+#
 
+# Intel Ethernet (onboard, or VME)
 ie0 at obio0 addr ? level ?
 ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75
 
+# Lance Ethernet (only onboard)
 le0 at obio0 addr ? level ?
 
-si0 at obio0 addr ? level ?
-si0 at vmes0 addr 0xff200000 level 2 vect 0x40
+#
+# Disk and tape devices
+#
+
+# Sun3 "si" SCSI controller (NCR 5380)
+ncr_si0 at obio0 addr ? level ?
+ncr_si0 at vmes0 addr 0xff200000 level 2 vect 0x40
+ncr_si1 at vmes0 addr 0xff204000 level 2 vect 0x41
+
+# Xylogics 7053 controllers
+# xdc0 at vmel0 addr 0xffffee80 level 2 vect 0x44
+# xdc1 at vmel0 addr 0xffffee90 level 2 vect 0x45
+# xd* at xdc? drive ?
+
+# Xylogics 450/451 controllers
+# xyc0 at vmes0 addr 0xffffee40 level 2 vect 0x48
+# xyc1 at vmes0 addr 0xffffee48 level 2 vect 0x49
+# xy* at xyc? drive ?
+
+# Xylogics 472 tape controllers?
+
+#
+# Frame buffer devices
+# (Not needed for the RAMDISK installation kernel)
 
+#
+# SCSI infrastructure
+#
 scsibus* at scsi?
 
 # Sun compatible scsi device mappings
@@ -83,5 +106,12 @@ cd* at scsibus? target ? lun ?
 
 #ch* at scsibus? target ? lun ?
 
+
+# RAM Disk (root for install tape)
+rd0 at mainbus?
+
+# Misc.
 pseudo-device	loop	1		# network loopback
+pseudo-device	sl	2		# CSLIP
+pseudo-device	ppp	2		# PPP