Add $OpenBSD$, update pseudo-device settings

7 files changed, 135 insertions, 90 deletions

diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS
index a2a7a9fe7f4..6141c0b4387 100644
--- a/sys/arch/sun3/conf/DISKLESS
+++ b/sys/arch/sun3/conf/DISKLESS
@@ -1,3 +1,4 @@
+#	$OpenBSD: DISKLESS,v 1.13 2000/04/30 15:27:57 miod Exp $
 #	$NetBSD: DISKLESS,v 1.12.4.1 1996/08/19 23:35:03 gwr Exp $
 
 #
diff --git a/sys/arch/sun3/conf/FOUR_TTYS b/sys/arch/sun3/conf/FOUR_TTYS
index fa3ee545ec7..2d8af9eca14 100644
--- a/sys/arch/sun3/conf/FOUR_TTYS
+++ b/sys/arch/sun3/conf/FOUR_TTYS
@@ -1,3 +1,4 @@
+#	$OpenBSD: FOUR_TTYS,v 1.9 2000/04/30 15:27:57 miod Exp $
 #	$NetBSD: FOUR_TTYS,v 1.1.4.1 1996/08/19 23:35:05 gwr Exp $
 
 #
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index a88af80bfcf..d0b80ce345f 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -1,3 +1,4 @@
+#	$OpenBSD: GENERIC,v 1.19 2000/04/30 15:27:57 miod Exp $
 #	$NetBSD: GENERIC,v 1.27.4.1 1996/08/19 23:35:06 gwr Exp $
 
 #
@@ -10,18 +11,18 @@ include "arch/sun3/conf/std.sun3"
 # Machines to be supported by this kernel
 option	 	GENERIC
 option	 	FPU_EMULATE
-option	 	HAVECACHE		# Sun3/260 VAC
+option	 	HAVECACHE	# Sun3/260 VAC
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	4
 
 # Standard system options
-option	 	KTRACE				# system call tracing support
+option	 	KTRACE		# system call tracing support
 
 # Debugging options.  Uncomment either this:
 option	 	DDB
 # ... or these two: (for KGDB on another machine)
-#makeoptions DEBUG="-g"			# symbols for kgdb + nm
+#makeoptions DEBUG="-g"		# symbols for kgdb + nm
 #option 	KGDB
 
 # Filesystem options
@@ -99,9 +100,9 @@ le0 at obio0 addr   0x120000 level 3
 #
 # E.g. "flags 0x07" would enable DMA, interrupts, and reselect.
 # Note: these values are quite a bit paranoid...
-si0 at obio0 addr   0x140000 level 2
-si0 at vmes0 addr 0xff200000 level 2 vect 0x40
-si1 at vmes0 addr 0xff204000 level 2 vect 0x41
+si0 at obio0 addr   0x140000 level 2 flags 0x07
+si0 at vmes0 addr 0xff200000 level 2 vect 0x40 flags 0x07
+si1 at vmes0 addr 0xff204000 level 2 vect 0x41 flags 0x07
 
 # Xylogics 7053 controllers
 # xdc0 at vmel0 addr 0xffffee80 level 2 vect 0x44
@@ -168,20 +169,17 @@ ch* at scsibus? target ? lun ?
 ss* at scsibus? target ? lun ?
 uk* at scsibus? target ? lun ?
 
-# RAM-disk drivers
-pseudo-device	rd	2
+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	enc		4	# encryption device
 
-# 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
+pseudo-device	pty		64	# pseudo-terminals
+pseudo-device	vnd		4	# paging to files
+pseudo-device	ksyms		1	# kernel symbols device
 
 # for IPv6
 pseudo-device	gif		4
 #pseudo-device	faith		1
-pseudo-device	ksyms	1		# kernel symbols device
diff --git a/sys/arch/sun3/conf/GENERIC_KGDB b/sys/arch/sun3/conf/GENERIC_KGDB
index 0a2b2b25329..e5b24276467 100644
--- a/sys/arch/sun3/conf/GENERIC_KGDB
+++ b/sys/arch/sun3/conf/GENERIC_KGDB
@@ -1,3 +1,4 @@
+#	$OpenBSD: GENERIC_KGDB,v 1.6 2000/04/30 15:27:57 miod Exp $
 #	$NetBSD: GENERIC_KGDB,v 1.1.2.1 1996/08/19 23:35:07 gwr Exp $
 
 #
@@ -8,58 +9,59 @@
 include "arch/sun3/conf/std.sun3"
 
 # Machines to be supported by this kernel
-options 	GENERIC
-options 	FPU_EMULATE
-options 	HAVECACHE		# Sun3/260 VAC
+option 		GENERIC
+option 		FPU_EMULATE
+option	 	HAVECACHE	# Sun3/260 VAC
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	4
 
 # Standard system options
-options 	KTRACE				# system call tracing support
+option	 	KTRACE		# system call tracing support
 
 # Debugging options.  Uncomment either this:
-#options 	DDB
+#option	 	DDB
 # ... or these two: (for KGDB on another machine)
-makeoptions DEBUG="-g"			# symbols for kgdb + nm
-options 	KGDB
+makeoptions DEBUG="-g"		# symbols for kgdb + nm
+option	 	KGDB
 
 # Filesystem options
-options 	NFSSERVER	# nfs server support
-options 	NFSCLIENT	# nfs client support
-options 	FFS		# ufs file system
+option	 	NFSSERVER	# nfs server support
+option	 	NFSCLIENT	# nfs client support
+option	 	FFS		# ufs file system
 #
-options 	CD9660		# ISO 9660 + Rock Ridge file system
-options 	FDESC		# /dev/fd/*
-options 	FIFO		# FIFOs; RECOMMENDED
-options 	KERNFS		# /kern
-options 	NULLFS		# loopback file system
-options 	PROCFS		# /proc
-options 	UNION		# union file system
-options 	MFS		# memory-based filesystem
+option	 	CD9660		# ISO 9660 + Rock Ridge file system
+option	 	FDESC		# /dev/fd/*
+option	 	FIFO		# FIFOs; RECOMMENDED
+option	 	KERNFS		# /kern
+option	 	NULLFS		# loopback file system
+option	 	PROCFS		# /proc
+option	 	UNION		# union file system
+option	 	MFS		# memory-based filesystem
 
 # Networking options
-options 	INET		# IP prototol stack support
-#options	GATEWAY		# IP packet forwarding
-options 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+option	 	INET		# IP prototol stack support
+option		IPFILTER	# IP packet filter for security
+option		IPFILTER_LOG	# use /dev/ipl to log IPF
+#option		GATEWAY		# IP packet forwarding
+option	 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 # XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
-options 	NFS_BOOT_RWSIZE=1024
+option	 	NFS_BOOT_RWSIZE=1024
 
 # Compatability options
-options 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
-options 	COMPAT_43	# and 4.3BSD and ...
-options 	COMPAT_10	# NetBSD 1.0
-options 	COMPAT_11	# NetBSD 1.1
-options 	COMPAT_12	# NetBSD 1.2
+option	 	COMPAT_SUNOS	# can run SunOS 4.1.1 executables
+option	 	COMPAT_43	# and 4.3BSD and ...
+option	 	COMPAT_10	# NetBSD 1.0
+option	 	COMPAT_11	# NetBSD 1.1
+option	 	COMPAT_12	# NetBSD 1.2
 
 # Sun3-specific debugging options
-options 	PMAP_DEBUG
-#options 	VMFAULT_TRACE
-#options 	SYSCALL_DEBUG
-#options 	EXEC_DEBUG
-options 	DIAGNOSTIC
-#options 	SCSIDEBUG
-options 	NCR5380_DEBUG
+option	 	PMAP_DEBUG
+#option	 	VMFAULT_TRACE
+#option	 	SYSCALL_DEBUG
+#option	 	EXEC_DEBUG
+option	 	DIAGNOSTIC
+#option	 	SCSIDEBUG
 
 config		bsd swap generic
 
@@ -77,18 +79,28 @@ ms0    at zsc0 channel 1	# mouse
 #
 
 # Intel Ethernet (onboard, or VME)
-ie0 at obio0 addr ? level ?
+ie0 at obio0 addr   0x0C0000 level 3
 ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75
 
 # Lance Ethernet (only onboard)
-le0 at obio0 addr ? level ?
+le0 at obio0 addr   0x120000 level 3
 
 #
 # Disk and tape devices
 #
 
 # Sun3 "si" SCSI controller (NCR 5380)
-si0 at obio0 addr ? level ?
+# This driver has several flags which may be enabled by OR'ing
+# the values and using the "flags" directive.  (PR#1929)
+# Valid flags are:
+#
+#  0x01        Use DMA (may be polled)
+#  0x02        Use DMA completion interrupts
+#  0x04        Allow disconnect/reselect
+#
+# E.g. "flags 0x07" would enable DMA, interrupts, and reselect.
+# Note: these values are quite a bit paranoid...
+si0 at obio0 addr   0x140000 level 2
 si0 at vmes0 addr 0xff200000 level 2 vect 0x40
 si1 at vmes0 addr 0xff204000 level 2 vect 0x41
 
@@ -153,17 +165,21 @@ st* at scsibus? target ? lun ?
 cd0 at scsibus? target 6 lun 0
 cd* at scsibus? target ? lun ?
 
-#ch* at scsibus? target ? lun ?
+ch* at scsibus? target ? lun ?
+ss* at scsibus? target ? lun ?
+uk* at scsibus? target ? lun ?
 
-# RAM-disk drivers
-pseudo-device	rd	2
+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	enc		4	# encryption device
 
-# 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
+pseudo-device	ksyms	1		# kernel symbols device
 
-pseudo-device	pty	64		# pseudo-terminals
-#pseudo-device	vnd	4		# paging to files
+# for IPv6
+pseudo-device	gif		4
+#pseudo-device	faith		1
diff --git a/sys/arch/sun3/conf/RAMDISK b/sys/arch/sun3/conf/RAMDISK
index 6d6c458ae30..7f95c86a2a5 100644
--- a/sys/arch/sun3/conf/RAMDISK
+++ b/sys/arch/sun3/conf/RAMDISK
@@ -1,3 +1,4 @@
+#	$OpenBSD: RAMDISK,v 1.13 2000/04/30 15:27:57 miod Exp $
 #	$NetBSD: RAMDISK,v 1.3.4.1 1996/08/19 23:35:10 gwr Exp $
 
 #
@@ -121,9 +122,19 @@ cd* at scsibus? target ? lun ?
 #ch* at scsibus? target ? lun ?
 
 # RAM-disk (root for install tape)
-pseudo-device	rd	2		# RAM-disk
-
-# Misc.
-pseudo-device	loop	1		# network loopback
-pseudo-device	sl	2		# CSLIP
-pseudo-device	ppp	2		# PPP
+pseudo-device	rd		2	# RAM-disk
+
+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	enc		4	# encryption device
+
+pseudo-device	pty		64	# pseudo-terminals
+#pseudo-device	vnd		4	# paging to files
+pseudo-device	ksyms		1	# kernel symbols device
+
+# for IPv6
+pseudo-device	gif		4
+#pseudo-device	faith		1
diff --git a/sys/arch/sun3/conf/SMD_TEST b/sys/arch/sun3/conf/SMD_TEST
index 8e9cf30f0b9..0ff71fa4739 100644
--- a/sys/arch/sun3/conf/SMD_TEST
+++ b/sys/arch/sun3/conf/SMD_TEST
@@ -1,3 +1,4 @@
+#	$OpenBSD: SMD_TEST,v 1.11 2000/04/30 15:27:57 miod Exp $
 #	$NetBSD: SMD_TEST,v 1.2.4.1 1996/08/19 23:35:11 gwr Exp $
 
 #
@@ -10,18 +11,18 @@ include "arch/sun3/conf/std.sun3"
 # Machines to be supported by this kernel
 option	 	GENERIC
 option	 	FPU_EMULATE
-option	 	HAVECACHE		# Sun3/260 VAC
+option	 	HAVECACHE	# Sun3/260 VAC
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	4
 
 # Standard system options
-option	 	KTRACE				# system call tracing support
+option	 	KTRACE		# system call tracing support
 
 # Debugging options.  Uncomment either this:
 option	 	DDB
 # ... or these two: (for KGDB on another machine)
-#makeoptions DEBUG="-g"			# symbols for kgdb + nm
+#makeoptions DEBUG="-g"		# symbols for kgdb + nm
 #option 	KGDB
 
 # Filesystem options
@@ -40,6 +41,8 @@ option	 	MFS		# memory-based filesystem
 
 # Networking options
 option	 	INET		# IP prototol stack support
+option		IPFILTER	# IP packet filter for security
+option		IPFILTER_LOG	# use /dev/ipl to log IPF
 #option		GATEWAY		# IP packet forwarding
 option	 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 # XXX - Work-around for root on slow SunOS/Sun3 servers (sigh...)
@@ -53,7 +56,7 @@ option	 	COMPAT_11	# NetBSD 1.1
 option	 	COMPAT_12	# NetBSD 1.2
 
 # Sun3-specific debugging options
-#option 	PMAP_DEBUG
+option	 	PMAP_DEBUG
 #option 	VMFAULT_TRACE
 #option 	SYSCALL_DEBUG
 #option 	EXEC_DEBUG
@@ -76,18 +79,28 @@ ms0    at zsc0 channel 1	# mouse
 #
 
 # Intel Ethernet (onboard, or VME)
-ie0 at obio0 addr ? level ?
+ie0 at obio0 addr   0x0C0000 level 3
 ie1 at vmes0 addr 0xffe88000 level 3 vect 0x75
 
 # Lance Ethernet (only onboard)
-le0 at obio0 addr ? level ?
+le0 at obio0 addr   0x120000 level 3
 
 #
 # Disk and tape devices
 #
 
 # Sun3 "si" SCSI controller (NCR 5380)
-si0 at obio0 addr ? level ?
+# This driver has several flags which may be enabled by OR'ing
+# the values and using the "flags" directive.  (PR#1929)
+# Valid flags are:
+#
+#  0x01        Use DMA (may be polled)
+#  0x02        Use DMA completion interrupts
+#  0x04        Allow disconnect/reselect
+#
+# E.g. "flags 0x07" would enable DMA, interrupts, and reselect.
+# Note: these values are quite a bit paranoid...
+si0 at obio0 addr   0x140000 level 2
 si0 at vmes0 addr 0xff200000 level 2 vect 0x40
 si1 at vmes0 addr 0xff204000 level 2 vect 0x41
 
@@ -152,17 +165,21 @@ st* at scsibus? target ? lun ?
 cd0 at scsibus? target 6 lun 0
 cd* at scsibus? target ? lun ?
 
-#ch* at scsibus? target ? lun ?
+ch* at scsibus? target ? lun ?
+ss* at scsibus? target ? lun ?
+uk* at scsibus? target ? lun ?
 
-# RAM-disk drivers
-pseudo-device	rd	2
+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	enc		4	# encryption device
 
-# 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
+pseudo-device	ksyms		1	# kernel symbols device
 
-pseudo-device	pty	64		# pseudo-terminals
-#pseudo-device	vnd	4		# paging to files
+# for IPv6
+pseudo-device	gif		4
+#pseudo-device	faith		1
diff --git a/sys/arch/sun3/conf/std.sun3 b/sys/arch/sun3/conf/std.sun3
index fb097e4d520..adf068ab9e9 100644
--- a/sys/arch/sun3/conf/std.sun3
+++ b/sys/arch/sun3/conf/std.sun3
@@ -1,3 +1,4 @@
+#	$OpenBSD: std.sun3,v 1.7 2000/04/30 15:27:57 miod Exp $
 #	$NetBSD: std.sun3,v 1.19 1996/11/19 21:04:50 gwr Exp $
 
 # Standard information for sun3's.