Up-to-date

1 files changed, 266 insertions, 46 deletions

diff --git a/sys/arch/i386/conf/PETRA b/sys/arch/i386/conf/PETRA
index ec9d9b96a2d..52d1fe34223 100644
--- a/sys/arch/i386/conf/PETRA
+++ b/sys/arch/i386/conf/PETRA
@@ -1,4 +1,4 @@
-#	$OpenBSD: PETRA,v 1.16 1999/01/02 00:38:16 niklas Exp $
+#	$OpenBSD: PETRA,v 1.17 1999/11/26 20:24:32 niklas Exp $
 #
 #	PETRA -- everything that's currently supported with certain
 #		 changes for Applitron's fileserver petra, a 128 MB
@@ -9,7 +9,94 @@ machine		i386		# architecture, used by config; REQUIRED
 
 makeoptions	DEBUG="-g"	# make a bsd.gdb too
 
-include "../../../conf/GENERIC"
+#include "../../../conf/GENERIC"
+#	$OpenBSD: PETRA,v 1.17 1999/11/26 20:24:32 niklas Exp $
+#
+#	Machine-independent option; used by all architectures for their
+#	GENERIC kernel
+
+#option		INSECURE	# default to secure
+
+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
+#makeoptions	DEBUG="-g"	# compile full symbol table
+option		DIAGNOSTIC	# internal consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
+
+option		SYSVMSG		# System V-like message queues
+option		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like memory sharing
+#option		SHMMAXPGS=1024	# 1024 pages is the default
+
+#option		COMPAT_09	# Kernel compatibility with 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
+
+option		LKM		# loadable kernel modules
+
+option		FFS		# UFS
+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
+
+option		CD9660		# ISO 9660 + Rock Ridge file system
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+option		NULLFS		# loopback file system
+option		PORTAL		# dynamically created filesystem objects
+option		PROCFS		# /proc
+option		UMAPFS		# NULLFS + uid and gid remapping
+option		UNION		# union file system
+
+#option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+option		IPSEC		# IPsec
+#option		NS		# XNS
+#option		NSIP		# XNS tunneling over IP
+#option		IPX		# IPX+SPX
+#option		IPXIP		# IPX tunneling over IP
+#option		ISO,TPIP	# OSI
+#option		EON		# OSI tunneling over IP
+#option		CCITT,LLC,HDLC	# X.25
+option		IPFILTER	# IP packet filter for security
+option		IPFILTER_LOG	# use /dev/ipl to log IPF
+option		PPP_BSDCOMP	# PPP BSD compression
+option		PPP_DEFLATE
+
+pseudo-device	loop	2	# 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	1	# encryption device
+#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
+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
@@ -20,6 +107,7 @@ 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
@@ -50,16 +138,20 @@ bios0	at mainbus0
 apm0	at bios0
 
 isa0	at mainbus0
+isa0	at pcib?
 eisa0	at mainbus0
 pci*	at mainbus0 bus ?
 
 option		PCIVERBOSE
 option		EISAVERBOSE
+#option		PCMCIAVERBOSE
+#option		USBVERBOSE
 
 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
@@ -68,6 +160,29 @@ pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
 # PCMCIA bus support
 pcmcia*	at pcic? controller ? socket ?
 
+# PCI USB Controllers
+#uhci*	at pci?				# Universal Host Controller (Intel)
+#ohci*	at pci?				# Open Host Controller
+
+# USB bus support
+#usb*	at uhci?
+#usb*	at ohci?
+
+# USB Hubs
+#uhub*	at usb?
+#uhub*	at uhub? port ? configuration ? interface ?
+
+# USB Generic HID devices
+#uhid*	at uhub? port ? configuration ? interface ?
+
+# USB audio
+#uaudio* at uhub? port ? configuration ?
+
+# USB Generic driver
+#ugen*	at uhub? port ? configuration ? interface ?
+
+puc*	at pci?				# PCI "universal" communication device
+
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
 isadma0	at isa?
 isapnp0	at isa?
@@ -78,25 +193,26 @@ vt0	at isa? port 0x60 irq 1
 pcppi0	at isa?
 sysbeep0	at pcppi?
 
-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)
+com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
+com1	at isa? port 0x2f8 irq 3
+com2	at isa? port 0x3e8 irq 5
+#com3	at isa? port 0x2e8 irq 9	# (conflicts with some video cards)
 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 ?
+com*	at ast? slave ?
 #boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#pccom*	at boca? slave ?
+#com*	at boca? slave ?
 #rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#pccom*	at rtfps? slave ?
-pccom*	at pcmcia? function ?		# PCMCIA modem cards
-pccom*	at isapnp?
+#com*	at rtfps? slave ?
+com*	at pcmcia? function ?		# PCMCIA modems/serial ports
+com*	at isapnp?
+com*	at puc? port ?
 
 # 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
@@ -114,6 +230,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?
@@ -121,18 +238,25 @@ 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
 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	# Seagate ST0[12] SCSI controllers
+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?
 
 sd*	at scsibus? target ? lun ?	# SCSI disk drives
@@ -148,52 +272,148 @@ 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
-wdc1	at isa? port 0x170 irq 15
-wd*	at wdc? drive ?
-
-atapibus* at wdc?
-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
-ed3	at isa? port 0x240 iomem 0xd8000 irq 9
-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
+# IDE controllers
+pciide* at pci ? dev ? function ? flags 0x0000
+
+wdc0	at isa? port 0x1f0 irq 14 flags 0x00
+wdc1	at isa? port 0x170 irq 15 flags 0x00
+wdc*	at pcmcia? function ?
+wdc*	at isapnp?
+
+# IDE hard drives
+wd*	at wdc? channel ? drive ? flags 0x0000
+wd*	at pciide? channel ? drive ? flags 0x0000
+
+# ATAPI<->SCSI
+atapiscsi* at wdc? channel ?
+atapiscsi* at pciide? channel ?
+scsibus* at atapiscsi?
+
+#wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives
+
+# Networking devices
+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 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
+ef*	at isapnp?				# 3C515 PnP 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
+ep*	at eisa? slot ?				# 3C579 ethernet
+fea*	at eisa? slot ?				# DEC DEFEA FDDI
+lmc*	at pci? dev ? function ?		# Lan Media Corp SSI/T3/HSSI
+le*	at pci? dev ? function ?		# PCnet-PCI based ethernet
 le*	at isapnp?
-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
+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
+xe*	at pcmcia? function ?			# Xircom ethernet
+wi*	at pcmcia? function ?			# WaveLAN IEEE 802.11
+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
+wb*	at pci? dev ? function ?		# Winbond W89C840F ethernet
+ti*	at pci? dev ? function ?		# Alteon Tigon 1Gb ethernet
+ax*	at pci? dev ? function ?		# ASIX AX88140A ethernet
+al*	at pci?	dev ? function ?		# ADMtek AL981/AN985 ethernet
+sf*	at pci? dev ? function ?		# Adaptec AIC-6915 ethernet
+skc*	at pci? dev ? function ?		# SysKonnect GEnesis 984x
+sk*	at skc?					#  each port of above
+
+# Media Independent Interface (mii) drivers
+exphy*	at mii? phy ?				# 3Com internal PHYs
+inphy*	at mii? phy ?				# Intel 82555 PHYs
+iophy*	at mii? phy ?				# Intel 82553 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
+sp0	at pss0 port 0x530 irq 10 drq 0		# sound port driver
 
-sb0	at isa? port 0x220 irq 7 drq 1		# SoundBlaster
+eap*	at pci? dev ? function ?		# Ensoniq AudioPCI S5016
+eso*	at pci? dev ? function ?		# ESS Solo-1 PCI AudioDrive
+sv*	at pci? dev ? function ?		# S3 SonicVibes (S3 617)
+sb0	at isa? port 0x220 irq 5 drq 1		# SoundBlaster
 sb*	at isapnp?
+ess*	at isapnp?				# ESS Tech ES188[78], ES888
 wss0	at isa? port 0x530 irq 10 drq 0		# Windows Sound System
+wss*	at isapnp?
 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?
+mpu*	at isapnp?
+
+# OPL[23] FM syntheziers
+#opl0	at isa? port 0x388	# use only if not attached to sound card
+opl*	at eso?
+opl*	at sb?
+opl*	at ess?
+
+# MIDI support
+midi*	at pcppi?		# MIDI interface to the PC speaker
+midi*	at sb?			# SB MPU401 port
+midi*	at opl?			# OPL FM synth
+midi*	at ym?
+midi*	at mpu?
+
+# 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 ess?
+audio*  at wss?
+audio*  at ym?
+audio*  at eap?
+audio*	at eso?
+audio*  at sv?
+#audio*	at uaudio?
+
+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?
+
+#wdt0	at pci? dev ? function ?	# Ind Computer Source PCI-WDT50x driver
+
+# crypto support
+#aeon*	at pci? dev ? function ?		# Aeon crypto card
+
+pseudo-device	pctr		1
+pseudo-device	mtrr		1	# Memory range attributes control
+pseudo-device	sequencer	1
+pseudo-device	raid		4
 
-pseudo-device	pctr	1
 #option DEBUG_ISAPNP