Sync with GENERIC, minor cleanups.

4 files changed, 10 insertions, 136 deletions

diff --git a/sys/arch/sun3/conf/COYOTE b/sys/arch/sun3/conf/COYOTE
index 244750a07b7..1eca5a2f7d6 100644
--- a/sys/arch/sun3/conf/COYOTE
+++ b/sys/arch/sun3/conf/COYOTE
@@ -1,5 +1,5 @@
 #
-# $OpenBSD: COYOTE,v 1.11 2000/05/26 00:44:20 miod Exp $
+# $OpenBSD: COYOTE,v 1.12 2001/01/03 02:03:28 miod Exp $
 #
 
 #
@@ -84,8 +84,12 @@ bwtwo0 at obmem0 addr ?
 #
 scsibus* at scsi?
 
-# Sun incompatible scsi device mappings
 sd* at scsibus? target ? lun ?
+st* at scsibus? target ? lun ?
+cd* at scsibus? target ? lun ?
+ch* at scsibus? target ? lun ?
+ss* at scsibus? target ? lun ?
+uk* at scsibus? target ? lun ?
 
 # Compatibility options
 option	 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
diff --git a/sys/arch/sun3/conf/FOUR_TTYS b/sys/arch/sun3/conf/FOUR_TTYS
index 9e41f706d7f..0d048b1dca3 100644
--- a/sys/arch/sun3/conf/FOUR_TTYS
+++ b/sys/arch/sun3/conf/FOUR_TTYS
@@ -1,4 +1,4 @@
-#	$OpenBSD: FOUR_TTYS,v 1.11 2000/05/26 00:44:21 miod Exp $
+#	$OpenBSD: FOUR_TTYS,v 1.12 2001/01/03 02:03:28 miod Exp $
 #	$NetBSD: FOUR_TTYS,v 1.1.4.1 1996/08/19 23:35:05 gwr Exp $
 
 #
@@ -61,104 +61,6 @@ zstty3 at zsc0 channel 1	# ttyd
 #
 
 # 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 ?
-
-#
-# Disk and tape devices
-#
-
-# Sun3 "si" SCSI controller (NCR 5380)
-si0 at obio0 addr ? level ?
-si0 at vmes0 addr 0xff200000 level 2 vect 0x40
-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: obmem 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: obmem   0x100000
-# else: obmem 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
-sd0 at scsibus? target 0 lun 0
-sd1 at scsibus? target 0 lun 1
-sd2 at scsibus? target 1 lun 0
-sd3 at scsibus? target 1 lun 1
-sd* at scsibus? target ? lun ?
-
-st0 at scsibus? target 4 lun 0
-st1 at scsibus? target 5 lun 0
-st* at scsibus? target ? lun ?
-
-cd0 at scsibus? target 6 lun 0
-cd* at scsibus? target ? lun ?
-
-#ch* at scsibus? target ? lun ?
-
-# RAM-disk drivers
-pseudo-device	rd	2
-
-# Misc.
-pseudo-device	loop	1		# network loopback
-pseudo-device	bpfilter 8		# packet filter
-pseudo-device	sl	2		# CSLIP
-pseudo-device	ppp	2		# PPP
-pseudo-device	tun	2		# network tunneling over tty
-
-pseudo-device	pty	64		# pseudo-terminals
-#pseudo-device	vnd	4		# paging to files
-kbd0   at zsc0 channel 0	# keyboard
-ms0    at zsc0 channel 1	# mouse
-
-#
-# Network devices
-#
-
-# Intel Ethernet (onboard, or VME)
 ie0 at obio0 addr   0x0C0000 level 3
 ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75
 
@@ -234,20 +136,9 @@ cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
 #
 scsibus* at scsi?
 
-# Sun compatible scsi device mappings
-sd0 at scsibus? target 0 lun 0
-sd1 at scsibus? target 0 lun 1
-sd2 at scsibus? target 1 lun 0
-sd3 at scsibus? target 1 lun 1
 sd* at scsibus? target ? lun ?
-
-st0 at scsibus? target 4 lun 0
-st1 at scsibus? target 5 lun 0
 st* at scsibus? target ? lun ?
-
-cd0 at scsibus? target 6 lun 0
 cd* at scsibus? target ? lun ?
-
 ch* at scsibus? target ? lun ?
 ss* at scsibus? target ? lun ?
 uk* at scsibus? target ? lun ?
diff --git a/sys/arch/sun3/conf/RAMDISK b/sys/arch/sun3/conf/RAMDISK
index 5ea37635100..2e202614e13 100644
--- a/sys/arch/sun3/conf/RAMDISK
+++ b/sys/arch/sun3/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.16 2000/06/19 01:22:34 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.17 2001/01/03 02:03:28 miod Exp $
 #	$NetBSD: RAMDISK,v 1.3.4.1 1996/08/19 23:35:10 gwr Exp $
 
 # Machine architecture; required by config(8)
@@ -113,19 +113,9 @@ si1 at vmes0 addr 0xff204000 level 2 vect 0x41 flags 0x07
 #
 scsibus* at scsi?
 
-# Sun compatible scsi device mappings
-sd0 at scsibus? target 0 lun 0
-sd1 at scsibus? target 0 lun 1
-sd2 at scsibus? target 1 lun 0
-sd3 at scsibus? target 1 lun 1
 sd* at scsibus? target ? lun ?
-
-st0 at scsibus? target 4 lun 0
-st1 at scsibus? target 5 lun 0
 st* at scsibus? target ? lun ?
-
-#cd0 at scsibus? target 6 lun 0
-#cd* at scsibus? target ? lun ?
+cd* at scsibus? target ? lun ?
 
 # RAM-disk (root for install tape)
 pseudo-device	rd		2	# RAM-disk
diff --git a/sys/arch/sun3/conf/SMD_TEST b/sys/arch/sun3/conf/SMD_TEST
index 9bc3437a5d5..eb986a5dd16 100644
--- a/sys/arch/sun3/conf/SMD_TEST
+++ b/sys/arch/sun3/conf/SMD_TEST
@@ -1,4 +1,4 @@
-#	$OpenBSD: SMD_TEST,v 1.13 2000/05/26 00:44:22 miod Exp $
+#	$OpenBSD: SMD_TEST,v 1.14 2001/01/03 02:03:28 miod Exp $
 #	$NetBSD: SMD_TEST,v 1.2.4.1 1996/08/19 23:35:11 gwr Exp $
 
 #
@@ -130,20 +130,9 @@ cgtwo0 at vmes0 addr 0xff400000 level 4 vect 0xA8
 #
 scsibus* at scsi?
 
-# Sun compatible scsi device mappings
-sd0 at scsibus? target 0 lun 0
-sd1 at scsibus? target 0 lun 1
-sd2 at scsibus? target 1 lun 0
-sd3 at scsibus? target 1 lun 1
 sd* at scsibus? target ? lun ?
-
-st0 at scsibus? target 4 lun 0
-st1 at scsibus? target 5 lun 0
 st* at scsibus? target ? lun ?
-
-cd0 at scsibus? target 6 lun 0
 cd* at scsibus? target ? lun ?
-
 ch* at scsibus? target ? lun ?
 ss* at scsibus? target ? lun ?
 uk* at scsibus? target ? lun ?