Trim, and reflect reality

1 files changed, 30 insertions, 27 deletions

diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index a71a34e36fb..e98ef97a00e 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,18 +1,17 @@
-#	$OpenBSD: NETTAN,v 1.13 1996/09/20 06:45:08 deraadt Exp $
+#	$OpenBSD: NETTAN,v 1.14 1996/10/17 19:36:41 niklas Exp $
 #
 #	NETTAN -- Applitron Datasystem AB
 #
 
 machine		i386		# architecture, used by config; REQUIRED
 
-option		I386_CPU	# CPU classes; at least one is REQUIRED
+#option		I386_CPU	# CPU classes; at least one is REQUIRED
 option		I486_CPU
-option		I586_CPU
-option		MATH_EMULATE	# floating point emulation
+#option		I586_CPU
+#option		MATH_EMULATE	# floating point emulation
 
 #option		DUMMY_NOPS	# speed hack; recommanded
-option		XSERVER
-option		INSECURE	# insecure; allow /dev/mem writing for X
+#option		XSERVER
 
 maxusers	32		# estimated number of users
 option		TIMEZONE=0	# time zone to adjust RTC time by
@@ -50,7 +49,7 @@ option		USER_LDT	# user-settable LDT; used by WINE
 option		LKM		# loadable kernel modules
 
 option		FFS		# UFS
-option		QUOTA		# UFS quotas
+#option		QUOTA		# UFS quotas
 #option		LFS		# log-structured file system
 option		MFS		# memory file system
 
@@ -59,16 +58,16 @@ option		NFSSERVER	# Network File System server
 
 option		CD9660		# ISO 9660 + Rock Ridge file system
 option		MSDOSFS		# MS-DOS file system
-option		FDESC		# /dev/fd
+#option		FDESC		# /dev/fd
 option		FIFO		# FIFOs; RECOMMENDED
 option		KERNFS		# /kern
-option		NULLFS		# loopback file system
-option		PORTAL		# create sockets with open(2)
+#option		NULLFS		# loopback file system
+#option		PORTAL		# create sockets with open(2)
 option		PROCFS		# /proc
-option		UMAPFS		# NULLFS + uid and gid remapping
-option		UNION		# union file system
+#option		UMAPFS		# NULLFS + uid and gid remapping
+#option		UNION		# union file system
 
-#option		GATEWAY		# packet forwarding
+option		GATEWAY		# packet forwarding
 option		INET		# IP + ICMP + TCP + UDP
 #option		NS		# XNS
 #option		ISO,TPIP	# OSI
@@ -104,17 +103,17 @@ lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
 lpt1	at isa? port 0x278
 lpt2	at isa? port 0x3bc
 
-lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
-lms1	at isa? port 0x238 irq 5
-mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
-mms1	at isa? port 0x238 irq 5
+#lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
+#lms1	at isa? port 0x238 irq 5
+#mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
+#mms1	at isa? port 0x238 irq 5
 #pms0	at isa? port 0x60 irq 12	# PS/2 auxiliary port mouse
 
 aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI controllers
-aha1	at isa? port 0x334 irq ? drq ?	# Adaptec 154[02] SCSI controllers
-scsibus* at aha?
-aic0	at isa? port 0x340 irq 12	# Adaptec 152[02] SCSI controllers
-scsibus* at aic?
+#aha1	at isa? port 0x334 irq ? drq ?	# Adaptec 154[02] SCSI controllers
+scsibus0 at aha?
+#aic0	at isa? port 0x340 irq 12	# Adaptec 152[02] SCSI controllers
+#scsibus* at aic?
 #bt0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
 #bt1	at isa? port 0x334 irq ? drq ?	# BusLogic [57]4X SCSI controllers
 #bt2	at isa? port ? irq ?
@@ -126,10 +125,14 @@ scsibus* at aic?
 #uha2	at isa? port ? irq ?		# UltraStor 24f SCSI controllers
 #scsibus* at uha?
 
+sd0	at scsibus0 target 0 lun ?	# Conner 2GB
+sd1	at scsibus0 target 2 lun ?	# Quantum Atlas 4GB
+sd2	at scsibus0 target 4 lun ?	# Fujitsu 500MB
 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
-ch*	at scsibus? target ? lun ?	# SCSI autochangers
+#ch*	at scsibus? target ? lun ?	# SCSI autochangers
+ss*	at scsibus? target ? lun ?	# SCSI Scanners
 
 fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
 #fdc1	at isa? port 0x370 irq ? drq ?
@@ -137,12 +140,12 @@ fd*	at fdc? drive ?
 
 #mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
 
-wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
+#wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
 #wdc1	at isa? port 0x170 irq ?
-wd*	at wdc? drive ?
+#wd*	at wdc? drive ?
 
-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
+#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
 #eg0	at isa? ...				# 3C505 ethernet cards
 
@@ -155,5 +158,5 @@ pseudo-device	ppp	2		# PPP
 pseudo-device	tun	2		# network tunneling over tty
 
 pseudo-device	pty	64		# pseudo-terminals
-pseudo-device	tb	1		# tablet line discipline
+#pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# paging to files