1 files changed, 45 insertions, 32 deletions

diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD
index 5a71ae5dc29a..38a8ec86d47e 100644
--- a/sys/i386/conf/NEWCARD
+++ b/sys/i386/conf/NEWCARD
@@ -34,7 +34,8 @@ cpu		I686_CPU
 ident		NEWCARD
 maxusers	32
 
-hints		"NEWCARD.hints"		#Default places to look for devices.
+#To statically compile in device wiring instead of /boot/device.hints
+#hints		"NEWCARD.hints"		#Default places to look for devices.
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
@@ -51,6 +52,7 @@ options 	NFS_ROOT		#NFS usable as root device, NFS required
 options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem
 options 	CD9660_ROOT		#CD-ROM usable as root, CD9660 required
+#options 	DEVFS			#Device Filesystem
 options 	PROCFS			#Process filesystem
 options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
@@ -68,19 +70,14 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #options 	APIC_IO			# Symmetric (APIC) I/O
-# Optionally these may need tweaked, (defaults shown):
-#options 	NCPU=2			# number of CPUs
-#options 	NBUS=8			# number of busses
-#options 	NAPIC=1			# number of IO APICs
-#options 	NINTR=24		# number of INTs
 
 device		isa
 device		eisa
 device		pci
 device		pccard
-#device		cardbus
-options 	COMPAT_OLDISA		# compatability shims for lnc, fe, le
-options 	COMPAT_OLDPCI		# compatability shims for lnc, vx
+device		cardbus
+options 	COMPAT_OLDISA		# compatability shims for lnc, le
+options 	COMPAT_OLDPCI		# compatability shims for lnc
 
 # Floppy drives
 device		fdc
@@ -98,16 +95,24 @@ options 	ATA_STATIC_ID		#Static device numbering
 device		ahb		# EISA AHA1742 family
 device		ahc		# AHA2940 and onboard AIC7xxx devices
 device		amd		# AMD 53C974 (Teckram DC-390(T))
-device		dpt		# DPT Smartcache - See NOTES for options!
 device		isp		# Qlogic family
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 
 device		adv
 device		adw
-device		bt
 device		aha	1
 device		aic
+device		bt
+
+device		ncv		# NCR 53C500
+device		nsp		# Workbit Ninja SCSI-3
+device		stg		# TMC 18C30/18C50
+
+# RAID controllers interfaced to the SCSI subsystem
+device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
+device		dpt		# DPT Smartcache III, IV - See NOTES for options!
+device		mly		# Mylex AcceleRAID/eXtremeRAID
 
 # SCSI peripherals
 device		scbus		# SCSI bus (required)
@@ -117,9 +122,11 @@ device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
 
 # RAID controllers
-device		ida		# Compaq Smart RAID
+device		aac		# Adaptec FSA RAID
 device		amr		# AMI MegaRAID
+device		ida		# Compaq Smart RAID
 device		mlx		# Mylex DAC960 family
+device		twe		# 3ware ATA RAID
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device		atkbdc	1
@@ -149,7 +156,7 @@ device		apm
 
 # PCCARD (PCMCIA) support
 device		pcic
-#device		pccbb
+device		pccbb
 
 # Serial (COM) ports
 device		sio
@@ -170,10 +177,11 @@ device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 device		wx		# Intel Gigabit Ethernet Card (``Wiseman'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
+# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
 device		dc		# DEC/Intel 21143 and various workalikes
-device		rl		# RealTek 8129/8139
 device		pcn		# AMD Am79C79x PCI 10/100 NICs
+device		rl		# RealTek 8129/8139
 device		sf		# Adaptec AIC-6915 (``Starfire'')
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
@@ -184,10 +192,11 @@ device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # ISA Ethernet NICs.
+device		cs
 device		ed
 device		ex
 device		ep
-device		cs
+device		fe
 device		sn
 # WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
 # exists only as a PCMCIA device, so there is no ISA attatement needed
@@ -203,14 +212,15 @@ device		an
 device		awi
 # Xircom pccard ethernet
 device		xe
+
 # The probe order of these is presently determined by i386/isa/isa_compat.c.
-#device		ie
-#device		fe
-#device		le
-#device		lnc
+device		ie
+device		le
+device		lnc
 
 # Pseudo devices - the number indicates how many units to allocated.
 device		random		# Entropy device
+options 	NOBLOCKRANDOM	# avoid any blocking on device random
 device		loop		# Network loopback
 device		ether		# Ethernet support
 device		sl		# Kernel SLIP
@@ -226,19 +236,22 @@ device		faith	1	# IPv6-to-IPv4 relaying (translation)
 device		bpf		# Berkeley packet filter
 
 # USB support
-#device		uhci		# UHCI PCI->USB interface
-#device		ohci		# OHCI PCI->USB interface
-#device		usb		# USB Bus (required)
-#device		ugen		# Generic
-#device		uhid		# "Human Interface Devices"
-#device		ukbd		# Keyboard
-#device		ulpt		# Printer
-#device		umass		# Disks/Mass storage - Requires scbus and da
-#device		ums		# Mouse
-#device		urio		# Diamond Rio 500 MP3 player
+device		uhci		# UHCI PCI->USB interface
+device		ohci		# OHCI PCI->USB interface
+device		usb		# USB Bus (required)
+#device		udbp		# USB Double Bulk Pipe devices
+device		ugen		# Generic
+device		uhid		# "Human Interface Devices"
+device		ukbd		# Keyboard
+device		ulpt		# Printer
+device		umass		# Disks/Mass storage - Requires scbus and da
+device		ums		# Mouse
+device		urio		# Diamond Rio 500 MP3 player
+device		uscanner	# Scanners
 # USB Ethernet, requires mii
-#device		aue		# ADMtek USB ethernet
-#device		cue		# CATC USB ethernet
-#device		kue		# Kawasaki LSI USB ethernet
+device		aue		# ADMtek USB ethernet
+device		cue		# CATC USB ethernet
+device		kue		# Kawasaki LSI USB ethernet
 
+# This is an experimental kernel, so include DDB
 options DDB