Up-to-date

1 files changed, 140 insertions, 47 deletions

diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index bb90b7bd07c..2a45e4eede9 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-#	$OpenBSD: NETTAN,v 1.31 1999/01/02 00:38:15 niklas Exp $
+#	$OpenBSD: NETTAN,v 1.32 1999/01/11 14:33:39 niklas Exp $
 #
 #	NETTAN -- Applitron Datasystem AB
 #
@@ -6,7 +6,7 @@
 machine		i386		# architecture, used by config; REQUIRED
 
 #include "../../../conf/GENERIC"
-#	OpenBSD: GENERIC,v 1.23 1997/07/01 23:13:16 provos Exp $
+#	$OpenBSD: NETTAN,v 1.32 1999/01/11 14:33:39 niklas Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -15,12 +15,13 @@ machine		i386		# architecture, used by config; REQUIRED
 
 option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight savings time used by RTC
+option		NTP		# hooks supporting the Network Time Protocol
 
 option		SWAPPAGER	# paging; REQUIRED
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
-#makeoption	DEBUG="-g"	# compile full symbol table
+#makeoptions	DEBUG="-g"	# compile full symbol table
 option		DIAGNOSTIC	# internal consistency checks
 option		KTRACE		# system call tracing, a la ktrace(1)
 
@@ -29,9 +30,8 @@ option		SYSVSEM		# System V-like semaphores
 option		SYSVSHM		# System V-like memory sharing
 #option		SHMMAXPGS=1024	# 1024 pages is the default
 
-option		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
-option		COMPAT_09	# NetBSD 0.9,
-option		COMPAT_10	# NetBSD 1.0,
+#option		COMPAT_09	# NetBSD 0.9,
+#option		COMPAT_10	# NetBSD 1.0,
 option		COMPAT_11	# NetBSD 1.1,
 option		COMPAT_43	# and 4.3BSD
 #option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
@@ -43,8 +43,11 @@ option		QUOTA		# UFS quotas
 #option		LFS		# log-structured file system
 option		EXT2FS		# Second Extended Filesystem
 option		MFS		# memory file system
+#option		XFS		# xfs filesystem
 
-
+#option		TCP_SACK	# Selective Acknowledgements for TCP
+#option		TCP_FACK	# Forward Acknowledgements for TCP
+  
 option		NFSCLIENT	# Network File System client
 option		NFSSERVER	# Network File System server
 
@@ -54,7 +57,7 @@ option		FDESC		# /dev/fd
 option		FIFO		# FIFOs; RECOMMENDED
 option		KERNFS		# /kern
 option		NULLFS		# loopback file system
-option		PORTAL		# create sockets with open(2)
+option		PORTAL		# dynamically created filesystem objects
 option		PROCFS		# /proc
 option		UMAPFS		# NULLFS + uid and gid remapping
 option		UNION		# union file system
@@ -74,31 +77,34 @@ option		IPFILTER_LOG	# use /dev/ipl to log IPF
 option		PPP_BSDCOMP	# PPP BSD compression
 option		PPP_DEFLATE
 
-pseudo-device	loop	1	# network loopback
+pseudo-device	loop	2	# network loopback
 pseudo-device	bpfilter 8	# packet filter
 pseudo-device	sl	2	# CSLIP
 #pseudo-device	ppp	2	# PPP
 pseudo-device	ppp	8	# PPP	# NETTAN customization
 pseudo-device	tun	2	# network tunneling over tty
 pseudo-device	enc	1	# encryption device
-pseudo-device	strip	1	# Starmode Radio IP interface
+#pseudo-device	strip	1	# Starmode Radio IP interface
 
 pseudo-device	pty	64	# pseudo-terminals
 pseudo-device	tb	1	# tablet line discipline
 pseudo-device	vnd	4	# paging to files
 pseudo-device	ccd	4	# concatenated disk devices
-#endinclude
+pseudo-device	ksyms	1	# kernel symbols device
 
 option		BOOT_CONFIG	# add support for boot -c
+#endinclude
 
 option		I386_CPU	# CPU classes; at least one is REQUIRED
 option		I486_CPU
 option		I586_CPU
+option		I686_CPU
 option		GPL_MATH_EMULATE	# floating point emulation
 
 option		VM86		# Virtual 8086 emulation
 option		USER_LDT	# user-settable LDT; used by WINE
 option		XSERVER		# diddle with console driver
+option		APERTURE	# in-kernel aperture driver for XFree86
 
 # Some BIOSes don't get the size of extended memory right.  If you
 # have a broken BIOS, uncomment the following and set the value
@@ -114,6 +120,12 @@ option		ELF_MAP_PAGE_ZERO
 option		COMPAT_IBCS2	# binary compatibility with SCO and ISC
 option		COMPAT_LINUX	# binary compatibility with Linux
 option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
+option		COMPAT_BSDOS	# binary compatibility with BSD/OS
+
+option		XFS		# xfs filesystem
+
+option		TCP_SACK	# Selective Acknowledgements for TCP
+option		TCP_FACK	# Forward Acknowledgements for TCP
 
 maxusers	32		# estimated number of users
 
@@ -121,12 +133,22 @@ config		bsd	swap generic
 
 mainbus0 at root
 
+bios0	at mainbus0
+apm0	at bios0
+
 isa0	at mainbus0
 eisa0	at mainbus0
-pci0	at mainbus0 bus ?
+pci*	at mainbus0 bus ?
 
+option		PCIVERBOSE
+option		EISAVERBOSE
+option		PCMCIAVERBOSE
+
+pchb*	at pci? dev ? function ?	# PCI-Host bridges
 ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 pci*	at ppb? bus ?
+pci*	at pchb? bus ?
+pcib*	at pci? dev ? function ?	# PCI-ISA bridges (do nothing)
 
 # ISA PCMCIA controllers
 pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
@@ -137,7 +159,7 @@ pcmcia*	at pcic? controller ? socket ?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
-#isapnp0	at isa?
+isapnp0	at isa?
 
 #pc0	at isa? port 0x60 irq 1		# generic PC console device
 vt0	at isa? port 0x60 irq 1
@@ -153,16 +175,19 @@ 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 ?
 #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 ?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
+#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cars
 #pccom*	at rtfps? slave ?
-pccom*    at pcmcia? function ?		# PCMCIA modem cards
+pccom*	at pcmcia? function ?		# PCMCIA modems/serial ports
+pccom*	at isapnp?
 
 # option for using CD1400 handshaking for incoming data
 # requires a special cable that exchanges the RTS and DTR lines
 # options CY_HW_RTS
-cy0	at isa? iomem 0xd4000 irq 12	# ISA cyclom card
-#cy*	at pci?				# PCI cyclom card
+cy0	at isa? iomem 0xd4000 irq 12	# ISA cyclom serial card
+#cy*	at pci?				# PCI cyclom serial card
 
 lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
 lpt1	at isa? port 0x278
@@ -172,7 +197,7 @@ 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 pckbd? irq 12		# PS/2 auxiliary port mouse
+pms0	at pckbd? irq 12		# PS/2 auxiliary port mouse
 
 bt0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
 bt1	at isa? port 0x334 irq ? drq ?	# BusLogic [57]4X SCSI controllers
@@ -180,6 +205,7 @@ bt2	at isa? port ? irq ?
 scsibus* at bt?
 aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI controllers
 aha1	at isa? port 0x334 irq ? drq ?	# Adaptec 154[02] SCSI controllers
+aha*	at isapnp?
 scsibus* at aha?
 ahb*	at eisa? slot ?			# Adaptec 174[024] SCSI controllers
 scsibus* at ahb?
@@ -188,18 +214,25 @@ ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI controllers
 ahc*	at pci? dev ? function ?	# Adaptec 2940 SCSI controllers
 scsibus0 at ahc?
 scsibus* at ahc?
+isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
+scsibus* at isp?
 aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI controllers
+aic*	at pcmcia? function ?		# PCMCIA based aic SCSI controllers
 scsibus* at aic?
 ncr*	at pci? dev ? function ?	# NCR 538XX SCSI controllers
 scsibus* at ncr?
-sea0	at isa? iomem 0xc8000 irq 5
+adv*	at pci? dev ? function ?	# AdvanSys 1200A/B and ULTRA SCSI
+scsibus* at adv?
+adw*	at pci? dev ? function ?	# AdvanSys ULTRA WIDE SCSI
+scsibus* at adw?
+sea0	at isa? iomem 0xc8000 irq 5     # Seagate ST0[12] SCSI controllers
 scsibus* at sea?
 uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI controllers
 uha1	at isa? port 0x334 irq ? drq ?	# UltraStor [13]4f SCSI controllers
 uha*	at eisa? slot ?			# UltraStor 24f SCSI controllers
 scsibus* at uha?
 wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
-wds1	at isa? port 0x358 irq 11 drq 5
+#wds1	at isa? port 0x358 irq 11 drq 5
 scsibus* at wds?
 
 sd0	at scsibus0 target 0 lun ?	# Conner 2GB
@@ -226,38 +259,98 @@ acd*	at atapibus? 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
-eg0	at isa? port 0x310 irq 5		# 3C505/Etherlink+ ethernet cards
-el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
-ep0	at isa? port ? irq ?			# 3C509 ethernet cards
-ep*	at isa? port ? irq ?			# 3C509 ethernet cards
+we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet
+we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
+we*	at isapnp?
+ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet
+ne0	at isa? port 0x240 iomem 0xd8000 irq 9	# NE[12]000 ethernet
+ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet
+ne2	at isa? port 0x280 irq 9		# NE[12]000 ethernet
+ne*	at isapnp?				# NE[12]000 PnP ethernet
+eg0	at isa? port 0x310 irq 5		# 3C505/Etherlink+ ethernet
+el0	at isa? port 0x300 irq 9		# 3C501 ethernet
+ep0	at isa? port ? irq ?			# 3C509 ethernet
+ep*	at isapnp?				# 3C509 PnP ethernet
+ep*	at isa? port ? irq ?			# 3C509 ethernet
 ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
 ie1	at isa? port 0x300 irq 10		# EtherExpress
 le0	at isa? port 0x360 irq 15 drq 6		# IsoLan, NE2100, and DEPCA
+ex0	at isa? port 0x320 irq 5		# Intel EtherExpress PRO/10
 ep0	at eisa? slot ?
-ep*	at eisa? slot ?				# 3C579 ethernet cards
-fea*	at eisa? slot ?				# DEC DEFEA FDDI cards
-le*	at pci? dev ? function ?		# PCnet-PCI based ethernet cards
-de*	at pci? dev ? function ?		# DC21X4X-based ethernet cards
-fxp*	at pci? dev ? function ?		# EtherExpress 10/100B ethernet cards
-ed*	at pci? dev ? function ?		# NE2000-compat ethernet cards
-ep0	at pci? dev ? function ?		# 3C590 ethernet cards
-ep*	at pci? dev ? function ?		# 3C590 ethernet cards
-#ed*     at pcmcia? function ?			# PCMCIA based ed cards
-ep*     at pcmcia? function ?			# PCMCIA based ep cards
-fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI 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
-
-sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
-wss0	at isa? port 0x530 irq 10 drq 0	# Windows Sound System
-pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
-gus0	at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis UltraSound (drq2 is record drq)
+ep*	at eisa? slot ?				# 3C579 ethernet
+fea*	at eisa? slot ?				# DEC DEFEA FDDI
+le*	at pci? dev ? function ?		# PCnet-PCI based ethernet
+le*	at isapnp?
+de*	at pci? dev ? function ?		# DC21X4X-based ethernet
+fxp*	at pci? dev ? function ?		# EtherExpress 10/100B ethernet
+ne*	at pci? dev ? function ?		# NE2000-compat ethernet
+ep0	at pci? dev ? function ?		# 3C59x ethernet
+ep*	at pci? dev ? function ?		# 3C59x ethernet
+ne*	at pcmcia? function ?			# PCMCIA based NE2000 ethernet
+ep*	at pcmcia? function ?			# PCMCIA based 3C5xx ethernet
+sm*	at pcmcia? function ?			# PCMCIA based sm ethernet
+fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI
+xl*	at pci? dev ? function ?		# 3c9xx ethernet
+rl*	at pci? dev ? function ?		# RealTek 81[23]9 ethernet
+tx*	at pci? dev ? function ?		# SMC 83C170 EPIC ethernet
+tl*	at pci? dev ? function ?		# Compaq Thunderlan ethernet
+mx*	at pci? dev ? function ?		# Macronix PMAC ethernet
+vr*	at pci? dev ? function ?		# VIA Rhine ethernet
+pn*	at pci? dev ? function ?		# Lite-On PNIC ethernet
+
+# Media Independent Interface (mii) drivers
+#exphy*	at mii? phy ?				# 3Com internal PHYs
+inphy*	at mii? phy ?				# Intel 82555 PHYs
+#icsphy*	at mii? phy ?				# ICS 1890 PHYs
+#lxtphy*	at mii? phy ?				# Level1 LXT970 PHYs
+#nsphy*	at mii? phy ?				# NS and compatible PHYs
+#qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
+#sqphy*	at mii? phy ?				# Seeq 8x220 PHYs
+rlphy* at mii? phy ?				# RealTek 8139 internal PHYs
+#mtdphy*	at mii? phy ?				# Myson MTD972 PHYs
+#ukphy*	at mii? phy ?				# "unknown" PHYs
+
+pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
+sp0	at pss0 port 0x530 irq 10 drq 0		# sound port driver
+
+eap*	at pci? dev ? function ?		# Ensoniq AudioPCI S5016
+sv*	at pci? dev ? function ?		# S3 SonicVibes (S3 617)
+sb0	at isa? port 0x220 irq 7 drq 1		# SoundBlaster
+sb*	at isapnp?
+wss0	at isa? port 0x530 irq 10 drq 0		# Windows Sound System
+pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
+gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis UltraSound (drq2 is record drq)
+ym*	at isapnp?
+
+# OPL[23] FM syntheziers
+#opl0	at isa? port 0x388	# use only if not attached to sound card
+opl*	at sb?
+
+# MIDI support
+midi*	at pcppi?		# MIDI interface to the PC speaker
+midi*	at sb?			# SB MPU401 port
+midi*	at opl?			# OPL FM synth
+
+# The spkr driver provides a simple tone interface to the built in speaker.
+#spkr0	at pcppi?		# PC speaker
+
+#Audio Support
+audio*  at sb?
+audio*  at gus?
+audio*  at pas?
+audio*  at sp?
+audio*  at wss?
+audio*  at ym?
+audio*  at eap?
+audio*  at sv?
+
+bktr0   at pci? dev ? function ?
 
 # Joystick driver. Probe is a little strange; add only if you have one.
 #joy0	at isa? port 0x201
+joy*	at isapnp?
+
+pseudo-device	pctr		1
+pseudo-device	sequencer	1
 
-pseudo-device pctr	1
+#option DEBUG_ISAPNP