Reflect reality

3 files changed, 25 insertions, 14 deletions

diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index 2a45e4eede9..1c5069ab277 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-#	$OpenBSD: NETTAN,v 1.32 1999/01/11 14:33:39 niklas Exp $
+#	$OpenBSD: NETTAN,v 1.33 1999/02/04 23:16:06 niklas Exp $
 #
 #	NETTAN -- Applitron Datasystem AB
 #
@@ -6,7 +6,7 @@
 machine		i386		# architecture, used by config; REQUIRED
 
 #include "../../../conf/GENERIC"
-#	$OpenBSD: NETTAN,v 1.32 1999/01/11 14:33:39 niklas Exp $
+#	$OpenBSD: NETTAN,v 1.33 1999/02/04 23:16:06 niklas Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -171,13 +171,13 @@ pccom0	at isa? port 0x3f8 irq 4	# standard PC serial ports
 pccom1	at isa? port 0x2f8 irq 3
 pccom2	at isa? port 0x3e8 irq 5
 #pccom3	at isa? port 0x2e8 irq 9	# (conflicts with some video cards)
-ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial card
+#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial card
 #ast1	at isa? port 0x2a0 irq 6	# 2nd AST 4-port serial card
-pccom*	at ast? slave ?
+#pccom*	at ast? slave ?
 #boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
 boca0	at isa? port 0x180 irq 12	# BOCA 8-port serial cards
 boca1	at isa? port 0x1c0 irq 12	# BOCA 8-port serial cards
-#pccom*	at boca? slave ?
+pccom*	at boca? slave ?
 #rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cars
 #pccom*	at rtfps? slave ?
 pccom*	at pcmcia? function ?		# PCMCIA modems/serial ports
@@ -212,7 +212,7 @@ scsibus* at ahb?
 ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI controllers
 ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI controllers
 ahc*	at pci? dev ? function ?	# Adaptec 2940 SCSI controllers
-scsibus0 at ahc?
+#scsibus0 at ahc?
 scsibus* at ahc?
 isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
 scsibus* at isp?
@@ -235,8 +235,8 @@ wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
 #wds1	at isa? port 0x358 irq 11 drq 5
 scsibus* at wds?
 
-sd0	at scsibus0 target 0 lun ?	# Conner 2GB
-sd1	at scsibus0 target 2 lun ?	# Quantum Atlas 4GB
+#sd0	at scsibus0 target 0 lun ?	# Conner 2GB
+#sd1	at scsibus0 target 2 lun ?	# Quantum Atlas 4GB
 sd*	at scsibus? target ? lun ?	# SCSI disk drives
 st*	at scsibus? target ? lun ?	# SCSI tape drives
 cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
@@ -352,5 +352,6 @@ joy*	at isapnp?
 
 pseudo-device	pctr		1
 pseudo-device	sequencer	1
+pseudo-device	raid		4	# RAIDframe disk driver
 
 #option DEBUG_ISAPNP
diff --git a/sys/arch/i386/conf/OPRAH b/sys/arch/i386/conf/OPRAH
index 39ba32deb22..36ed4ee1f14 100644
--- a/sys/arch/i386/conf/OPRAH
+++ b/sys/arch/i386/conf/OPRAH
@@ -1,4 +1,4 @@
-#	$OpenBSD: OPRAH,v 1.23 1999/01/02 00:38:15 niklas Exp $
+#	$OpenBSD: OPRAH,v 1.24 1999/02/04 23:16:06 niklas Exp $
 #
 #	OPRAH -- Niklas Hallqvist's test machine
 #
@@ -132,5 +132,6 @@ pseudo-device	tun	2		# network tunneling over tty
 
 pseudo-device	pty	64		# pseudo-terminals
 #pseudo-device	tb	1		# tablet line discipline
-pseudo-device	vnd	4		# paging to files
+pseudo-device	vnd	4		# vnode disk
+pseudo-device	ccd	4		# concatenated disk
 pseudo-device	enc
diff --git a/sys/arch/i386/conf/WALDORF b/sys/arch/i386/conf/WALDORF
index 9def5d8b79b..d5ee21067ac 100644
--- a/sys/arch/i386/conf/WALDORF
+++ b/sys/arch/i386/conf/WALDORF
@@ -1,4 +1,4 @@
-#	$OpenBSD: WALDORF,v 1.19 1999/01/02 00:38:15 niklas Exp $
+#	$OpenBSD: WALDORF,v 1.20 1999/02/04 23:16:06 niklas Exp $
 #
 #	WALDORF -- a 486 kernel config Applitron use for some gateway
 #		   machines (waldorf and neuro).
@@ -70,6 +70,7 @@ option		FIFO		# FIFOs; RECOMMENDED
 
 option		GATEWAY		# packet forwarding
 option		INET		# IP + ICMP + TCP + UDP
+option		IPSEC		# IPsec
 option		IPFILTER	# IP firewall
 option		IPFILTER_LOG	# use /dev/ipl to log IPF
 #option		NS		# XNS
@@ -88,6 +89,7 @@ pci0	at mainbus?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
+isapnp0	at isa?
 
 #pc0	at isa? port 0x60 irq 1		# generic PC console device
 vt0	at isa? port 0x60 irq 1
@@ -162,9 +164,12 @@ fd*	at fdc? drive ?
 
 #wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives
 
-ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC, 3C503, and NE[12]000
-ed1	at isa? port 0x250 iomem 0xd8000 irq 9	#   ethernet cards
-ed2	at isa? port 0x300 iomem 0xcc000 irq 10
+we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet series
+we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
+ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet cards
+ne0	at isa? port 0x280 iomem 0xd8000 irq 9	# NE[12]000 ethernet cards
+ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet cards
+ne*	at isapnp?				# NE[12]000 PnP ethernet cards
 #eg0	at isa? ...				# 3C505 ethernet cards
 #el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
 #ep0	at isa? port ? irq ?			# 3C509 ethernet cards
@@ -172,6 +177,9 @@ ed2	at isa? port 0x300 iomem 0xcc000 irq 10
 #le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
 #le*	at pci? bus ? dev ?
 #de*	at pci? bus ? dev ?
+#ep0	at pci? dev ? function ?		# 3C590 ethernet cards
+ep*	at pci? dev ? function ?		# 3C590 ethernet cards
+fxp*	at pci? dev ? function ?		# EtherExpress 10/100B ethernet cards
 
 #pss0	at isa? port 0x220 irq 7 drq 6  # Personal Sound System
 #sp0	at pss0 port 0x530 irq 10 drq 0	# 	sound port driver
@@ -186,6 +194,7 @@ 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	1		# encryption device
 
 pseudo-device	pty	64		# pseudo-terminals
 #pseudo-device	tb	1		# tablet line discipline