First round at trying to split up NOTES into MI and MD portions.

Unfortunately, this level doesn't really provide enough granularity.  We
probably need several MI NOTES type files for things that are shared by
several architectures but not by all.  For example, the PCI options could
live in a NOTES.pci.

This also updates the Makefile for i386 to generate LINT.  The only changes
in the generated LINT are the order of various options.

Suggestions for improvement welcome.

1 files changed, 9 insertions, 1206 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 8eec0ca..d61989e 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -11,15 +11,11 @@
 # Please use ``make LINT'' to create an old-style LINT file if you want to
 # do kernel test-builds.
 #
-# $FreeBSD$
-#
-
+# This file contains machine independent kernel configuration notes.  For
+# machine dependent notes, look in /sys/<arch>/conf/NOTES.
 #
-# This directive is mandatory; it defines the architecture to be
-# configured for; in this case, the 386 family based IBM-PC and
-# compatibles.
+# $FreeBSD$
 #
-machine		i386
 
 #
 # This is the ``identification'' of the kernel.  Usually this should
@@ -90,7 +86,7 @@ options 	BLKDEV_IOSIZE=8192
 
 # Options for the VM subsystem
 options 	PQ_CACHESIZE=512	# color for 512k/16k cache
-options 	KSTACK_PAGES=3		# number of 4k stack pages per process
+options 	KSTACK_PAGES=3		# number of stack pages per process
 # Deprecated options supported for backwards compatibility
 #options 	PQ_NOOPT		# No coloring
 #options 	PQ_LARGECACHE		# color for 512k/16k cache
@@ -120,31 +116,9 @@ options 	ROOTDEVNAME=\"ufs:da0s2e\"
 # SMP OPTIONS:
 #
 # SMP enables building of a Symmetric MultiProcessor Kernel.
-# APIC_IO enables the use of the IO APIC for Symmetric I/O.
-#
-# Notes:
-#
-#  An SMP kernel will ONLY run on an Intel MP spec. qualified motherboard.
-#
-#  Be sure to disable 'cpu I386_CPU' && 'cpu I486_CPU' for SMP kernels.
-#
-#  Check the 'Rogue SMP hardware' section to see if additional options
-#   are required by your hardware.
-#
 
 # Mandatory:
 options 	SMP			# Symmetric MultiProcessor Kernel
-options 	APIC_IO			# Symmetric (APIC) I/O
-
-#
-# Rogue SMP hardware:
-#
-
-# Bridged PCI cards:
-#
-# The MP tables of most of the current generation MP motherboards
-#  do NOT properly support bridged PCI cards.  To use one of these
-#  cards you should refer to ???
 
 # SMP Debugging Options:
 #
@@ -162,140 +136,6 @@ options 	WITNESS_SKIPSPIN
 
 
 #####################################################################
-# CPU OPTIONS
-
-#
-# You must specify at least one CPU (the one you intend to run on);
-# deleting the specification for CPUs you don't need to use may make
-# parts of the system run faster.
-# I386_CPU is mutually exclusive with the other CPU types.
-#
-#cpu		I386_CPU		
-cpu		I486_CPU
-cpu		I586_CPU		# aka Pentium(tm)
-cpu		I686_CPU		# aka Pentium Pro(tm)
-
-#
-# Options for CPU features.
-#
-# CPU_ATHLON_SSE_HACK tries to enable SSE instructions when the BIOS has
-# forgotten to enable them.
-#
-# CPU_BLUELIGHTNING_FPU_OP_CACHE enables FPU operand cache on IBM
-# BlueLightning CPU.  It works only with Cyrix FPU, and this option
-# should not be used with Intel FPU.
-#
-# CPU_BLUELIGHTNING_3X enables triple-clock mode on IBM Blue Lightning
-# CPU if CPU supports it. The default is double-clock mode on
-# BlueLightning CPU box.
-#
-# CPU_BTB_EN enables branch target buffer on Cyrix 5x86 (NOTE 1).
-#
-# CPU_DIRECT_MAPPED_CACHE sets L1 cache of Cyrix 486DLC CPU in direct
-# mapped mode.  Default is 2-way set associative mode.
-#
-# CPU_CYRIX_NO_LOCK enables weak locking for the entire address space
-# of Cyrix 6x86 and 6x86MX CPUs by setting the NO_LOCK bit of CCR1.
-# Otherwise, the NO_LOCK bit of CCR1 is cleared.  (NOTE 3)
-#
-# CPU_DISABLE_5X86_LSSER disables load store serialize (i.e. enables
-# reorder).  This option should not be used if you use memory mapped
-# I/O device(s).
-#
-# CPU_ENABLE_SSE enables SSE/MMX2 instructions support.
-#
-# CPU_FASTER_5X86_FPU enables faster FPU exception handler.
-#
-# CPU_I486_ON_386 enables CPU cache on i486 based CPU upgrade products
-# for i386 machines.
-#
-# CPU_IORT defines I/O clock delay time (NOTE 1).  Default values of
-# I/O clock delay time on Cyrix 5x86 and 6x86 are 0 and 7,respectively
-# (no clock delay).
-#
-# CPU_L2_LATENCY specifed the L2 cache latency value.  This option is used
-# only when CPU_PPRO2CELERON is defined and Mendocino Celeron is detected.
-# The default value is 5.
-#
-# CPU_LOOP_EN prevents flushing the prefetch buffer if the destination
-# of a jump is already present in the prefetch buffer on Cyrix 5x86(NOTE
-# 1).
-#
-# CPU_PPRO2CELERON enables L2 cache of Mendocino Celeron CPUs.  This option
-# is useful when you use Socket 8 to Socket 370 converter, because most Pentium
-# Pro BIOSs do not enable L2 cache of Mendocino Celeron CPUs.
-#
-# CPU_RSTK_EN enables return stack on Cyrix 5x86 (NOTE 1).
-#
-# CPU_SUSP_HLT enables suspend on HALT.  If this option is set, CPU
-# enters suspend mode following execution of HALT instruction.
-#
-# CPU_UPGRADE_HW_CACHE eliminates unneeded cache flush instruction(s).
-#
-# CPU_WT_ALLOC enables write allocation on Cyrix 6x86/6x86MX and AMD
-# K5/K6/K6-2 cpus.
-#
-# CYRIX_CACHE_WORKS enables CPU cache on Cyrix 486 CPUs with cache
-# flush at hold state.
-#
-# CYRIX_CACHE_REALLY_WORKS enables (1) CPU cache on Cyrix 486 CPUs
-# without cache flush at hold state, and (2) write-back CPU cache on
-# Cyrix 6x86 whose revision < 2.7 (NOTE 2).
-#
-# NO_F00F_HACK disables the hack that prevents Pentiums (and ONLY
-# Pentiums) from locking up when a LOCK CMPXCHG8B instruction is
-# executed.  This option is only needed if I586_CPU is also defined,
-# and should be included for any non-Pentium CPU that defines it.
-#
-# NO_MEMORY_HOLE is an optimisation for systems with AMD K6 processors
-# which indicates that the 15-16MB range is *definitely* not being
-# occupied by an ISA memory hole.
-#
-# NOTE 1: The options, CPU_BTB_EN, CPU_LOOP_EN, CPU_IORT,
-# CPU_LOOP_EN and CPU_RSTK_EN should not be used because of CPU bugs.
-# These options may crash your system.
-#
-# NOTE 2: If CYRIX_CACHE_REALLY_WORKS is not set, CPU cache is enabled
-# in write-through mode when revision < 2.7.  If revision of Cyrix
-# 6x86 >= 2.7, CPU cache is always enabled in write-back mode.
-#
-# NOTE 3: This option may cause failures for software that requires
-# locked cycles in order to operate correctly.
-#
-options 	CPU_ATHLON_SSE_HACK
-options 	CPU_BLUELIGHTNING_FPU_OP_CACHE
-options 	CPU_BLUELIGHTNING_3X
-options 	CPU_BTB_EN
-options 	CPU_DIRECT_MAPPED_CACHE
-options 	CPU_DISABLE_5X86_LSSER
-options 	CPU_ENABLE_SSE
-options 	CPU_FASTER_5X86_FPU
-options 	CPU_I486_ON_386
-options 	CPU_IORT
-options 	CPU_L2_LATENCY=5
-options 	CPU_LOOP_EN
-options 	CPU_PPRO2CELERON
-options 	CPU_RSTK_EN
-options 	CPU_SUSP_HLT
-options 	CPU_UPGRADE_HW_CACHE
-options 	CPU_WT_ALLOC
-options 	CYRIX_CACHE_WORKS
-options 	CYRIX_CACHE_REALLY_WORKS
-#options 	NO_F00F_HACK
-
-#
-# A math emulator is mandatory if you wish to run on hardware which
-# does not have a floating-point processor.  Pick either the original,
-# bogus (but freely-distributable) math emulator, or a much more
-# fully-featured but GPL-licensed emulator taken from Linux.
-#
-options 	MATH_EMULATE		#Support for x87 emulation
-# Don't enable both of these in a real config.
-options 	GPL_MATH_EMULATE	#Support for x87 emulation via
-					#new math emulator
-
-
-#####################################################################
 # COMPATIBILITY OPTIONS                                             
 
 #
@@ -412,13 +252,6 @@ options 	REGRESSION
 #options 	RESTARTABLE_PANICS
 
 #
-# PERFMON causes the driver for Pentium/Pentium Pro performance counters
-# to be compiled.  See perfmon(4) for more information.
-#
-options 	PERFMON
-
-
-#
 # This option let some drivers co-exist that can't co-exist in a running
 # system.  This is used to be able to compile all kernel code in one go for
 # quality assurance purposes (like this file, which the option takes it name
@@ -693,25 +526,6 @@ options 	ATM_UNI			#UNI signalling manager
 device		hea			#Efficient ENI-155p ATM PCI
 device		hfa			#FORE PCA-200E ATM PCI
 
-#
-# DEVICE_POLLING adds support for mixed interrupt-polling handling
-# of network device drivers, which has significant benefits in terms
-# of robustness to overloads and responsivity, as well as permitting
-# accurate scheduling of the CPU time between kernel network processing
-# and other activities. The drawback is a moderate (up to 1/HZ seconds)
-# potential increase in response times.
-# It is strongly recommended to use HZ=1000 or 2000 with DEVICE_POLLING
-# to achieve smoother behaviour.
-# Additionally, you can enable/disable polling at runtime with the
-# sysctl variable kern.polling.enable (defaults off), and select
-# the CPU fraction reserved to userland with the sysctl variable
-# kern.polling.user_frac (default 50, range 0..100).
-#
-# Only the "dc" "fxp" and "sis" devices support this mode of operation at
-# the time of this writing.
-
-options		DEVICE_POLLING
-
 
 #####################################################################
 # FILESYSTEM OPTIONS
@@ -879,20 +693,6 @@ options 	_KPOSIX_VERSION=199309L
 
 options 	HZ=100
 
-# The following options are used for debugging clock behavior only, and
-# should not be used for production systems.
-#
-# CLK_CALIBRATION_LOOP will run the clock calibration loop at startup
-# until the user presses a key.
-
-options 	CLK_CALIBRATION_LOOP
-
-# The following two options measure the frequency of the corresponding
-# clock relative to the RTC (onboard mc146818a).
-
-options 	CLK_USE_I8254_CALIBRATION
-options 	CLK_USE_TSC_CALIBRATION
-
 
 #####################################################################
 # SCSI DEVICES
@@ -1060,8 +860,6 @@ options 	SES_ENABLE_PASSTHROUGH
 
 device		pty		#Pseudo ttys
 device		nmdm		#back-to-back tty devices
-device		speaker		#Play IBM BASIC-style noises out your speaker
-device		gzip		#Exec gzipped a.out's
 device		md		#Memory/malloc disk
 device		snp		#Snoop device - to look at pty/vty/etc..
 device		ccd		#Concatenated disk driver
@@ -1090,46 +888,11 @@ options 	MSGBUF_SIZE=40960
 #####################################################################
 # HARDWARE BUS CONFIGURATION
 
-# ISA, EISA, MCA and PCI bus:
-
 #
-# Mandatory ISA devices: isa, npx
+# ISA bus
 #
 device		isa
 
-#
-# Options for `isa':
-#
-# AUTO_EOI_1 enables the `automatic EOI' feature for the master 8259A
-# interrupt controller.  This saves about 0.7-1.25 usec for each interrupt.
-# This option breaks suspend/resume on some portables.
-#
-# AUTO_EOI_2 enables the `automatic EOI' feature for the slave 8259A
-# interrupt controller.  This saves about 0.7-1.25 usec for each interrupt.
-# Automatic EOI is documented not to work for for the slave with the
-# original i8259A, but it works for some clones and some integrated
-# versions.
-#
-# MAXMEM specifies the amount of RAM on the machine; if this is not
-# specified, FreeBSD will first read the amount of memory from the CMOS
-# RAM, so the amount of memory will initially be limited to 64MB or 16MB
-# depending on the BIOS.  If the BIOS reports 64MB, a memory probe will
-# then attempt to detect the installed amount of RAM.  If this probe
-# fails to detect >64MB RAM you will have to use the MAXMEM option.
-# The amount is in kilobytes, so for a machine with 128MB of RAM, it would
-# be 131072 (128 * 1024).
-#
-# BROKEN_KEYBOARD_RESET disables the use of the keyboard controller to
-# reset the CPU for reboot.  This is needed on some systems with broken
-# keyboard controllers.
-
-options 	COMPAT_OLDISA	#Use ISA shims and glue for old drivers
-options 	AUTO_EOI_1
-#options 	AUTO_EOI_2
-
-options 	MAXMEM="(128*1024)"
-#options 	BROKEN_KEYBOARD_RESET
-
 # Enable support for the kernel PLL to use an external PPS signal,
 # under supervision of [x]ntpd(8)
 # More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
@@ -1141,35 +904,9 @@ options 	PPS_SYNC
 # for too long.  You can make the system more resistant to this by
 # choosing a high value for NTIMECOUNTER.  The default is 5, there
 # is no upper limit but more than a couple of hundred are not productive.
-# A better strategy may be to sysctl -w kern.timecounter.method=1
 
 options 	NTIMECOUNTER=20
 
-# 
-# EISA bus
-#
-# The EISA bus device is `eisa'.  It provides auto-detection and
-# configuration support for all devices on the EISA bus.
-
-device		eisa
-
-# By default, only 10 EISA slots are probed, since the slot numbers
-# above clash with the configuration address space of the PCI subsystem,
-# and the EISA probe is not very smart about this.  This is sufficient
-# for most machines, but in particular the HP NetServer LC series comes
-# with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11,
-# thus you need to bump this figure to 12 for them.
-options 	EISA_SLOTS=12
-
-#
-# MCA bus:
-#
-# The MCA bus device is `mca'.  It provides auto-detection and
-# configuration support for all devices on the MCA bus.
-# No hints are required for MCA.
-
-device		mca
-
 #
 # PCI bus & PCI options:
 #
@@ -1179,21 +916,10 @@ device		mca
 
 device		pci
 
-#
-# AGP GART support
-device		agp
-
-# PCI options
-#
-#Enable pci resources left off by a "lazy" BIOS:
-options 	PCI_ENABLE_IO_MODES
-
 
 #####################################################################
 # HARDWARE DEVICE CONFIGURATION
 
-# EISA support is available for some device, so they can be auto-probed.
-# MicroChannel (MCA) support is available for some devices.
 # For ISA the required hints are listed.
 # EISA, MCA, PCI and pccard are self identifying buses, so no hints
 # are needed.
@@ -1202,101 +928,6 @@ options 	PCI_ENABLE_IO_MODES
 # Mandatory devices:
 #
 
-# The keyboard controller; it controls the keyboard and the PS/2 mouse.
-device		atkbdc	1
-hint.atkbdc.0.at="isa"
-hint.atkbdc.0.port="0x060"
-
-# The AT keyboard
-device		atkbd
-hint.atkbd.0.at="atkbdc"
-hint.atkbd.0.irq="1"
-
-# Options for atkbd:
-options 	ATKBD_DFLT_KEYMAP	# specify the built-in keymap
-makeoptions	ATKBD_DFLT_KEYMAP="jp.106"
-
-# These options are valid for other keyboard drivers as well.
-options 	KBD_DISABLE_KEYMAP_LOAD	# refuse to load a keymap
-options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-
-# `flags' for atkbd:
-#       0x01    Force detection of keyboard, else we always assume a keyboard
-#       0x02    Don't reset keyboard, useful for some newer ThinkPads
-#	0x03	Force detection and avoid reset, might help with certain
-#		dockingstations
-#       0x04    Old-style (XT) keyboard support, useful for older ThinkPads
-
-# PS/2 mouse
-device		psm
-hint.psm.0.at="atkbdc"
-hint.psm.0.irq="12"
-
-# Options for psm:
-options 	PSM_HOOKRESUME		#hook the system resume event, useful
-					#for some laptops
-options 	PSM_RESETAFTERSUSPEND	#reset the device at the resume event
-
-# The video card driver.
-device		vga
-hint.vga.0.at="isa"
-
-# Options for vga:
-# Try the following option if the mouse pointer is not drawn correctly
-# or font does not seem to be loaded properly.  May cause flicker on
-# some systems.
-options 	VGA_ALT_SEQACCESS
-
-# If you can dispense with some vga driver features, you may want to
-# use the following options to save some memory.
-#options 	VGA_NO_FONT_LOADING	# don't save/load font
-#options 	VGA_NO_MODE_CHANGE	# don't change video modes
-
-# Older video cards may require this option for proper operation.
-options 	VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
-
-# The following option probably won't work with the LCD displays.
-options 	VGA_WIDTH90		# support 90 column modes
-
-# To include support for VESA video modes
-options 	VESA
-
-options 	FB_DEBUG		# Frame buffer debugging
-options 	FB_INSTALL_CDEV		# install a CDEV entry in /dev
-
-# Splash screen at start up!  Screen savers require this too.
-device		splash
-
-# Various screen savers.
-device		apm_saver		# Requires APM
-device		blank_saver
-device		daemon_saver
-device		fade_saver
-device		fire_saver
-device		green_saver
-device		logo_saver
-device		rain_saver
-device		star_saver
-device		warp_saver
-
-# The pcvt console driver (vt220 compatible).
-device		vt
-hint.vt.0.at="isa"
-options 	XSERVER			# support for running an X server on vt
-options 	FAT_CURSOR		# start with block cursor
-# This PCVT option is for keyboards such as those used on really old ThinkPads
-options 	PCVT_SCANSET=2
-# Other PCVT options are documented in pcvt(4).
-options 	PCVT_24LINESDEF
-options 	PCVT_CTRL_ALT_DEL
-options 	PCVT_META_ESC
-options 	PCVT_NSCREENS=9
-options 	PCVT_PRETTYSCRNS
-options 	PCVT_SCREENSAVER
-options 	PCVT_USEKBDSEC
-options 	PCVT_VT220KEYB
-options 	PCVT_GREENSAVER
-
 # The syscons console driver (sco color console compatible).
 device		sc	1
 hint.sc.0.at="isa"
@@ -1336,65 +967,6 @@ options 	SC_NO_SYSMOUSE
 #	0x80	Put the video card in the VESA 800x600 dots, 16 color mode
 #	0x100	Probe for a keyboard device periodically if one is not present
 
-# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create
-# the /dev/3dfx0 device to work with glide implementations. This should get
-# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as
-# the tdfx DRI module from XFree86 and is completely unrelated.
-#
-# To enable Linuxulator support, one must also include COMPAT_LINUX in the
-# config as well, or you will not have the dependencies. The other option
-# is to load both as modules.
-
-device 		tdfx			# Enable 3Dfx Voodoo support
-options 	TDFX_LINUX		# Enable Linuxulator support
-
-#
-# The Numeric Processing eXtension driver.  In addition to this, you
-# may configure a math emulator (see above).  If your machine has a
-# hardware FPU and the kernel configuration includes the npx device
-# *and* a math emulator compiled into the kernel, the hardware FPU
-# will be used, unless it is found to be broken or unless "flags" to
-# npx0 includes "0x08", which requests preference for the emulator.
-device		npx
-hint.npx.0.at="nexus"
-hint.npx.0.port="0x0F0"
-hint.npx.0.flags="0x0"
-hint.npx.0.irq="13"
-
-#
-# `flags' for npx0:
-#	0x01	don't use the npx registers to optimize bcopy.
-#	0x02	don't use the npx registers to optimize bzero.
-#	0x04	don't use the npx registers to optimize copyin or copyout.
-#	0x08	use emulator even if hardware FPU is available.
-# The npx registers are normally used to optimize copying and zeroing when
-# all of the following conditions are satisfied:
-#	I586_CPU is an option
-#	the cpu is an i586 (perhaps not a Pentium)
-#	the probe for npx0 succeeds
-#	INT 16 exception handling works.
-# Then copying and zeroing using the npx registers is normally 30-100% faster.
-# The flags can be used to control cases where it doesn't work or is slower.
-# Setting them at boot time using userconfig works right (the optimizations
-# are not used until later in the bootstrap when npx0 is attached).
-# Flag 0x08 automatically disables the i586 optimized routines.
-#
-
-#
-# ACPI support using the Intel ACPI Component Architecture reference
-# implementation.
-#
-# ACPI_DEBUG enables the use of the debug.acpi.level and debug.acpi.layer
-# kernel environment variables to select initial debugging levels for the
-# Intel ACPICA code.  (Note that the Intel code must also have USE_DEBUGGER
-# defined when it is built).
-#
-# Note that building ACPI into the kernel is deprecated; the module is
-# normally loaded automatically by the loader.
-#
-device		acpica
-options 	ACPI_DEBUG
-
 #
 # Optional devices:
 #
@@ -1402,17 +974,11 @@ options 	ACPI_DEBUG
 #
 # SCSI host adapters:
 #
-# adv: All Narrow SCSI bus AdvanSys controllers.
 # adw: Second Generation AdvanSys controllers including the ADV940UW.
-# aha: Adaptec 154x/1535/1640
-# ahb: Adaptec 174x EISA controllers
 # ahc: Adaptec 274x/284x/2910/293x/294x/394x/3950x/3960x/398X/4944/
 #      19160x/29160x, aic7770/aic78xx
-# aic: Adaptec 6260/6360, APA-1460 (PC Card), NEC PC9801-100 (C-BUS)
 # amd: Support for the AMD 53C974 SCSI host adapter chip as found on devices
 #      such as the Tekram DC-390(T).
-# bt:  Most Buslogic controllers: including BT-445, BT-54x, BT-64x, BT-74x,
-#      BT-75x, BT-946, BT-948, BT-956, BT-958, SDC3211B, SDC3211F, SDC3222F
 # isp: Qlogic ISP 1020, 1040 and 1040B PCI SCSI host adapters,
 #      ISP 1240 Dual Ultra SCSI, ISP 1080 and 1280 (Dual) Ultra2,
 #      ISP 12160 Ultra3 SCSI,
@@ -1426,24 +992,8 @@ options 	ACPI_DEBUG
 #      53C810, 53C810A, 53C815, 53C825,  53C825A, 53C860, 53C875, 
 #      53C876, 53C885,  53C895, 53C895A, 53C896,  53C897, 53C1510D, 
 #      53C1010-33, 53C1010-66.
-# stg: TMC 18C30, 18C50 based SCSI host adapters.
-# wds: WD7000
 
-#
-# Note that the order is important in order for Buslogic ISA/EISA cards to be
-# probed correctly.
-#
-device		bt
-hint.bt.0.at="isa"
-hint.bt.0.port="0x330"
-device		adv
-hint.adv.0.at="isa"
 device		adw
-device		aha
-hint.aha.0.at="isa"
-device		aic
-hint.aic.0.at="isa"
-device		ahb
 device		ahc
 device		amd
 device		isp
@@ -1467,15 +1017,6 @@ device		ncr
 device		ncv
 device		nsp
 device		sym
-device		stg
-hint.stg.0.at="isa"
-hint.stg.0.port="0x140"
-hint.stg.0.port="11"
-device		wds
-hint.wds.0.at="isa"
-hint.wds.0.port="0x350"
-hint.wds.0.irq="11"
-hint.wds.0.drq="6"
 
 # The aic7xxx driver will attempt to use memory mapped I/O for all PCI
 # controllers that have it configured only if this option is set. Unfortunately,
@@ -1656,22 +1197,10 @@ hint.fd.0.drive="0"
 hint.fd.1.at="fdc0"
 hint.fd.1.drive="1"
 
-# M-systems DiskOnchip products see src/sys/contrib/dev/fla/README
-device		fla
-hint.fla.0.at="isa"
-
-#
-# Other standard PC hardware:
 #
-# mse: Logitech and ATI InPort bus mouse ports
 # sio: serial ports (see sio(4)), including support for various
 #      PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf)
 
-device		mse
-hint.mse.0.at="isa"
-hint.mse.0.port="0x23c"
-hint.mse.0.irq="5"
-
 device		sio
 hint.sio.0.at="isa"
 hint.sio.0.port="0x3F8"
@@ -1740,21 +1269,10 @@ options 	PUC_FASTINTR
 # individual driver.
 device		miibus
 
-# an:   Aironet 4500/4800 802.11 wireless adapters. Supports the PCMCIA,
-#       PCI and ISA varieties.
-# ar:   Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver
-#       (requires sppp)
-# awi:  Support for IEEE 802.11 PC Card devices using the AMD Am79C930 and
-#       Harris (Intersil) Chipset with PCnetMobile firmware by AMD.
 # bge:	Support for gigabit ethernet adapters based on the Broadcom
 #	BCM570x family of controllers, including the 3Com 3c996-T,
 #	the Netgear GA302T, the SysKonnect SK-9D21 and SK-9D41, and
 #	the embedded gigE NICs on Dell PowerEdge 2550 servers.
-# cnw:  Xircom CNW/Netware Airsurfer PC Card adapter
-# cm:	Arcnet SMC COM90c26 / SMC COM90c56
-#	(and SMC COM90c66 in '56 compatibility mode) adapters.
-# cs:   IBM Etherjet and other Crystal Semi CS89x0-based adapters
-# cx:   Cronyx/Sigma multiport sync/async (with Cisco or PPP framing)
 # dc:   Support for PCI fast ethernet adapters based on the DEC/Intel 21143
 #       and various workalikes including:
 #       the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics
@@ -1767,27 +1285,11 @@ device		miibus
 #       LinkSys LNE100TX, LNE100TX V2.0, Jaton XpressNet, Alfa Inc GFC2204,
 #       KNE110TX.
 # de:   Digital Equipment DC21040
-# ed:   Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
-#       HP PC Lan+, various PC Card devices (refer to etc/defauls/pccard.conf)
-#       (requires miibus)
-# el:   3Com 3C501 (slow!)
 # em:   Intel Pro/1000 Gigabit Ethernet 82542, 82543, 82544 based adapters.
-# ep:   3Com 3C509, 3C529, 3C556, 3C562D, 3C563D, 3C572, 3C574X, 3C579, 3C589
-#       and PC Card devices using these chipsets.
-# ex:   Intel EtherExpress Pro/10 and other i82595-based adapters,
-#       Olicom Ethernet PC Card devices.
-# fe:   Fujitsu MB86960A/MB86965A Ethernet
-# fea:  DEC DEFEA EISA FDDI adapter
 # fpa:  Support for the Digital DEFPA PCI FDDI. `device fddi' is also needed.
 # fxp:  Intel EtherExpress Pro/100B
 #	(hint of prefer_iomap can be done to prefer I/O instead of Mem mapping)
 # gx:   Intel Pro/1000 Gigabit Ethernet (82542, 82543-F, 82543-T)
-# ie:   AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210;
-#       Intel EtherExpress
-# le:   Digital Equipment EtherWorks 2 and EtherWorks 3 (DEPCA, DE100,
-#       DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422)
-# lnc:  Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and
-#       Am79C960)
 # lge:	Support for PCI gigabit ethernet adapters based on the Level 1
 #	LXT1001 NetCellerator chipset. This includes the D-Link DGE-500SX,
 #	SMC TigerCard 1000 (SMC9462SX), and some Addtron cards.
@@ -1796,12 +1298,6 @@ device		miibus
 #	SMC EZ Card 1000 (SMC9462TX), D-Link DGE-500T, Asante FriendlyNet
 #	GigaNIX 1000TA and 1000TPC, the Addtron AEG320T, the LinkSys
 #	EG1032 and EG1064, the Surecom EP-320G-TX and the Netgear GA622T.
-# oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133
-#       (no hints needed).
-#       Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140,
-#       OC-3141, OC-3540, OC-3250
-# rdp:  RealTek RTL 8002-based pocket ethernet adapters
-# sbni:	Granch SBNI12-xx ISA and PCI adapters
 # pcn:	Support for PCI fast ethernet adapters based on the AMD Am79c97x
 #	chipsets, including the PCnet/FAST, PCnet/FAST+, PCnet/PRO and
 #	PCnet/Home. These were previously handled by the lnc driver (and
@@ -1827,9 +1323,6 @@ device		miibus
 #       (also single mode and multimode).
 #       The driver will autodetect the number of ports on the card and
 #       attach each one as a separate network interface.
-# sn:   Support for ISA and PC Card Ethernet devices using the
-#       SMC91C90/92/94/95 chips.
-# sr:   RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp)
 # ste:  Sundance Technologies ST201 PCI fast ethernet controller, includes
 #       the D-Link DFE-550TX.
 # ti:   Support for PCI gigabit ethernet NICs based on the Alteon Networks
@@ -1851,13 +1344,6 @@ device		miibus
 # wb:   Support for fast ethernet adapters based on the Winbond W89C840F chip.
 #       Note: this is not the same as the Winbond W89C940F, which is a
 #       NE2000 clone.
-# wl:   Lucent Wavelan (ISA card only).
-# wi:   Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both
-#       the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA
-#       bridge with a PCMCIA adapter plugged into it.
-# xe:   Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller,
-#       Accton Fast EtherCard-16, Compaq Netelligent 10/100 PC Card,
-#       Toshiba 10/100 Ethernet PC Card, Xircom 16-bit Ethernet + Modem 56
 # xl:   Support for the 3Com 3c900, 3c905, 3c905B and 3c905C (Fast)
 #       Etherlink XL cards and integrated controllers.  This includes the
 #       integrated 3c905B-TX chips in certain Dell Optiplex and Dell
@@ -1865,94 +1351,6 @@ device		miibus
 #       in Dell Latitude laptop docking stations.
 #       Also supported: 3Com 3c980(C)-TX, 3Com 3cSOHO100-TX, 3Com 3c450-TX
 
-# Order for ISA/EISA devices is important here
-
-device		ar	1
-hint.ar.0.at="isa"
-hint.ar.0.port="0x300"
-hint.ar.0.irq="10"
-hint.ar.0.maddr="0xd0000"
-device		cm
-hint.cm.0.at="isa"
-hint.cm.0.port="0x2e0"
-hint.cm.0.irq="9"
-hint.cm.0.maddr="0xdc000"
-device		cs
-hint.cs.0.at="isa"
-hint.cs.0.port="0x300"
-device		cx	1
-hint.cx.0.at="isa"
-hint.cx.0.port="0x240"
-hint.cx.0.irq="15"
-hint.cx.0.drq="7"
-device		ed
-#options 	ED_NO_MIIBUS		# Disable ed miibus support
-hint.ed.0.at="isa"
-hint.ed.0.port="0x280"
-hint.ed.0.irq="5"
-hint.ed.0.maddr="0xd8000"
-device		el	1
-hint.el.0.at="isa"
-hint.el.0.port="0x300"
-hint.el.0.irq="9"
-device		ep
-device		ex
-device		fe	1
-hint.fe.0.at="isa"
-hint.fe.0.port="0x300"
-device		fea
-device		ie	2
-hint.ie.0.at="isa"
-hint.ie.0.port="0x300"
-hint.ie.0.irq="5"
-hint.ie.0.maddr="0xd0000"
-hint.ie.1.at="isa"
-hint.ie.1.port="0x360"
-hint.ie.1.irq="7"
-hint.ie.1.maddr="0xd0000"
-device		le	1
-hint.le.0.at="isa"
-hint.le.0.port="0x300"
-hint.le.0.irq="5"
-hint.le.0.maddr="0xd0000"
-device		lnc	1
-hint.lnc.0.at="isa"
-hint.lnc.0.port="0x280"
-hint.lnc.0.irq="10"
-hint.lnc.0.drq="0"
-device		rdp	1
-hint.rdp.0.at="isa"
-hint.rdp.0.port="0x378"
-hint.rdp.0.irq="7"
-hint.rdp.0.flags="2"
-device		sbni	1
-hint.sbni.0.at="isa"
-hint.sbni.0.port="0x210"
-hint.sbni.0.irq="0xefdead"
-hint.sbni.0.flags="0"
-device		sr	1
-hint.sr.0.at="isa"
-hint.sr.0.port="0x300"
-hint.sr.0.irq="5"
-hint.sr.0.maddr="0xd0000"
-device		sn
-hint.sn.0.at="isa"
-hint.sn.0.port="0x300"
-hint.sn.0.irq="10"
-device		an
-device		awi
-device		cnw
-device		wi
-options 	WLCACHE		# enables the signal-strength cache
-options 	WLDEBUG		# enables verbose debugging output
-device		wl	1
-hint.wl.0.at="isa"
-hint.wl.0.port="0x300"
-device		xe
-
-device		oltr
-hint.oltr.0.at="isa"
-
 # PCI Ethernet NICs that use the common MII bus controller code.
 device		dc		# DEC/Intel 21143 and various workalikes
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
@@ -2003,7 +1401,7 @@ device		en
 options 	NATM			#native ATM
 
 #
-# Audio drivers: `pcm', `sbc', `gusc', `pca'
+# Audio drivers: `pcm'
 #
 # pcm: PCM audio through various sound cards.
 #
@@ -2012,133 +1410,33 @@ options 	NATM			#native ATM
 # For more information about this driver and supported cards,
 # see the pcm.4 man page.
 #
-# The flags of the device tells the device a bit more info about the
-# device that normally is obtained through the PnP interface.
-#	bit  2..0   secondary DMA channel;
-#	bit  4      set if the board uses two dma channels;
-#	bit 15..8   board type, overrides autodetection; leave it
-#		    zero if don't know what to put in (and you don't,
-#		    since this is unsupported at the moment...).
-#
-# This driver will use the new PnP code if it's available.
-#
-# pca: PCM audio through your PC speaker
-#
 # Supported cards include:
-# Creative SoundBlaster ISA PnP/non-PnP
-# Supports ESS and Avance ISA chips as well.
-# Gravis UltraSound ISA PnP/non-PnP
 # Crystal Semiconductor CS461x/428x PCI
 # Neomagic 256AV (ac97)
-# Most of the more common ISA/PnP sb/mss/ess compatable cards.
 
 device		pcm
 
-# For non-pnp sound cards with no bridge drivers only:
-hint.pcm.0.at="isa"
-hint.pcm.0.irq="10"
-hint.pcm.0.drq="1"
-hint.pcm.0.flags="0x0"
-
-# For PnP/PCI sound cards, no hints are required.
-
 #
 # midi: MIDI interfaces and synthesizers
 #
 
 device		midi
 
-# For non-pnp sound cards with no bridge drivers:
-hint.midi.0.at="isa"
-hint.midi.0.irq="5"
-hint.midi.0.flags="0x0"
-
-# For serial ports (this example configures port 2):
-# TODO: implement generic tty-midi interface so that we can use
-#	other uarts.
-hint.midi.0.at="isa"
-hint.midi.0.port="0x2F8"
-hint.midi.0.irq="3"
-
 #
 # seq: MIDI sequencer
 #
 
 device		seq
 
-# The bridge drivers for sound cards.  These can be separately configured
-# for providing services to the likes of new-midi.
-# When used with 'device pcm' they also provide pcm sound services.
-#
-# sbc:  Creative SoundBlaster ISA PnP/non-PnP
-#	Supports ESS and Avance ISA chips as well.
-# gusc: Gravis UltraSound ISA PnP/non-PnP
-# csa:  Crystal Semiconductor CS461x/428x PCI
-
-# For non-PnP cards:
-device		sbc
-hint.sbc.0.at="isa"
-hint.sbc.0.port="0x220"
-hint.sbc.0.irq="5"
-hint.sbc.0.drq="1"
-hint.sbc.0.flags="0x15"
-device		gusc
-hint.gusc.0.at="isa"
-hint.gusc.0.port="0x220"
-hint.gusc.0.irq="5"
-hint.gusc.0.drq="1"
-hint.gusc.0.flags="0x13"
-
-device		pca
-hint.pca.0.at="isa"
-hint.pca.0.port="0x040"
-
 #
 # Miscellaneous hardware:
 #
-# mcd: Mitsumi CD-ROM using proprietary (non-ATAPI) interface
-# scd: Sony CD-ROM using proprietary (non-ATAPI) interface
-# matcd: Matsushita/Panasonic CD-ROM using proprietary (non-ATAPI) interface
-# wt: Wangtek and Archive QIC-02/QIC-36 tape drives
-# ctx: Cortex-I frame grabber
-# apm: Laptop Advanced Power Management (experimental)
-# pmtimer: Timer device driver for power management events (APM or ACPI)
-# spigot: The Creative Labs Video Spigot video-acquisition board
 # meteor: Matrox Meteor video capture board
 # bktr: Brooktree bt848/848a/849a/878/879 video capture and TV Tuner board
 # cy: Cyclades serial driver
-# dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!)
-# digi: Digiboard driver
-# gp:  National Instruments AT-GPIB and AT-GPIB/TNT board, PCMCIA-GPIB
-# asc: GI1904-based hand scanners, e.g. the Trust Amiscan Grey
-# gsc: Genius GS-4500 hand scanner.
-# joy: joystick (including IO DATA PCJOY PC Card joystick)
-# rc: RISCom/8 multiport card
-# rp: Comtrol Rocketport(ISA) - single card
-# tw: TW-523 power line interface for use with X-10 home control products
-# si: Specialix SI/XIO 4-32 port terminal multiplexor
-# spic: Sony Programmable I/O controller (VAIO notebooks)
-# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based)
-# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent)
+# rp: Comtrol Rocketport(ISA/PCI) - single card
 # nmdm: nullmodem terminal driver (see nmdm(4))
 
-# Notes on APM
-#  The flags takes the following meaning for apm0:
-#    0x0020  Statclock is broken.
-#  If apm is omitted, some systems require sysctl -w kern.timecounter.method=1
-#  for correct timekeeping.
-
-# Notes on the spigot:
-#  The video spigot is at 0xad6.  This port address can not be changed.
-#  The irq values may only be 10, 11, or 15
-#  I/O memory is an 8kb region.  Possible values are:
-#    0a0000, 0a2000, ..., 0fffff, f00000, f02000, ..., ffffff
-#    The start address must be on an even boundary.
-#  Add the following option if you want to allow non-root users to be able
-#  to access the spigot.  This option is not secure because it allows users
-#  direct access to the I/O page.
-#  	options SPIGOT_UNSECURE
-
 # Notes on the Comtrol Rocketport driver:
 #
 # The exact values used for rp0 depend on how many boards you have
@@ -2168,151 +1466,15 @@ hint.pca.0.port="0x040"
 #		hints.rp.3.at="isa"
 #		hints.rp.3.port="0x240"
 #
-#   And for PCI cards, you need no hints.
-
-# Notes on the Digiboard driver:
-#
-# The following flag values have special meanings in dgb:
-#	0x01 - alternate layout of pins
-#	0x02 - use the windowed PC/Xe in 64K mode
-
-# Notes on the Specialix SI/XIO driver:
-#  The host card is memory, not IO mapped.
-#  The Rev 1 host cards use a 64K chunk, on a 32K boundary.
-#  The Rev 2 host cards use a 32K chunk, on a 32K boundary.
-#  The cards can use an IRQ of 11, 12 or 15.
-
-# Notes on the Sony Programmable I/O controller
-#  This is a temporary driver that should someday be replaced by something
-#  that hooks into the ACPI layer. The device is hooked to the PIIX4's
-#  General Device 10 decoder, which means you have to fiddle with PCI
-#  registers to map it in, even though it is otherwise treated here as
-#  an ISA device. At the moment, the driver polls, although the device
-#  is capable of generating interrupts. It largely undocumented.
-#  The port location in the hint is where you WANT the device to be
-#  mapped. 0x10a0 seems to be traditional. At the moment the jogdial
-#  is the only thing truly supported, but aparently a fair percentage
-#  of the Vaio extra features are controlled by this device.
-
-# Notes on the Stallion stl and stli drivers:
-#  See src/i386/isa/README.stl for complete instructions.
-#  This is version 0.0.5alpha, unsupported by Stallion.
-#  The stl driver has a secondary IO port hard coded at 0x280.  You need
-#     to change src/i386/isa/stallion.c if you reconfigure this on the boards.
-#  The "flags" and "msize" settings on the stli driver depend on the board:
-#	EasyConnection 8/64 ISA:     flags 23         msize 0x1000
-#	EasyConnection 8/64 EISA:    flags 24         msize 0x10000
-#	EasyConnection 8/64 MCA:     flags 25         msize 0x1000
-#	ONboard ISA:                 flags 4          msize 0x10000
-#	ONboard EISA:                flags 7          msize 0x10000
-#	ONboard MCA:                 flags 3          msize 0x10000
-#	Brumby:                      flags 2          msize 0x4000
-#	Stallion:                    flags 1          msize 0x10000
-
-device		mcd	1
-hint.mcd.0.at="isa"
-hint.mcd.0.port="0x300"
-hint.mcd.0.irq="10"
-# for the Sony CDU31/33A CDROM
-device		scd	1
-hint.scd.0.at="isa"
-hint.scd.0.port="0x230"
-# for the SoundBlaster 16 multicd - up to 4 devices
-device		matcd	1
-hint.matcd.0.at="isa"
-hint.matcd.0.port="0x230"
-device		wt	1
-hint.wt.0.at="isa"
-hint.wt.0.port="0x300"
-hint.wt.0.irq="5"
-hint.wt.0.drq="1"
-device		ctx	1
-hint.ctx.0.at="isa"
-hint.ctx.0.port="0x230"
-hint.ctx.0.maddr="0xd0000"
-device		spigot	1
-hint.spigot.0.at="isa"
-hint.spigot.0.port="0xad6"
-hint.spigot.0.irq="15"
-hint.spigot.0.maddr="0xee000"
-device		apm
-hint.apm.0.flags="0x20"
-device		pmtimer			# Adjust system timer at wakeup time
-hint.pmtimer.0.at="isa"
-device		gp
-hint.gp.0.at="isa"
-hint.gp.0.port="0x2c0"
-device		gsc	1
-hint.gsc.0.at="isa"
-hint.gsc.0.port="0x270"
-hint.gsc.0.drq="3"
-device		joy			# PnP aware, hints for nonpnp only
-hint.joy.0.at="isa"
-hint.joy.0.port="0x201"
+#   For PCI cards, you need no hints.
+
 device		cy	1
 options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
 hint.cy.0.at="isa"
 hint.cy.0.irq="10"
 hint.cy.0.maddr="0xd4000"
 hint.cy.0.msize="0x2000"
-device		dgb	1
-options 	NDGBPORTS=16		# Defaults to 16*NDGB
-hint.dgb.0.at="isa"
-hint.dgb.0.port="0x220"
-hint.dgb.0.maddr="0xfc000"
-device		digi
-hint.digi.0.at="isa"
-hint.digi.0.port="0x104"
-hint.digi.0.maddr="0xd0000"
-# BIOS & FEP/OS components of device digi.  Normally left as modules
-device		digi_CX
-device		digi_CX_PCI
-device		digi_EPCX
-device		digi_EPCX_PCI
-device		digi_Xe
-device		digi_Xem
-device		digi_Xr
-device		rc	1
-hint.rc.0.at="isa"
-hint.rc.0.port="0x220"
-hint.rc.0.irq="12"
 device		rp
-hint.rp.0.at="isa"
-hint.rp.0.port="0x280"
-# the port and irq for tw0 are fictitious
-device		tw	1
-hint.tw.0.at="isa"
-hint.tw.0.port="0x380"
-hint.tw.0.irq="11"
-device		si
-options 	SI_DEBUG
-hint.si.0.at="isa"
-hint.si.0.maddr="0xd0000"
-hint.si.0.irq="12"
-device		asc	1
-hint.asc.0.at="isa"
-hint.asc.0.port="0x3EB"
-hint.asc.0.drq="3"
-hint.asc.0.irq="10"
-device		spic
-hint.spic.0.at="isa"
-hint.spic.0.port="0x10a0"
-device		stl
-hint.stl.0.at="isa"
-hint.stl.0.port="0x2a0"
-hint.stl.0.irq="10"
-device		stli
-hint.stli.0.at="isa"
-hint.stli.0.port="0x2a0"
-hint.stli.0.maddr="0xcc000"
-hint.stli.0.flags="23"
-hint.stli.0.msize="0x1000"
-# You are unlikely to have the hardware for loran <phk@FreeBSD.org>
-device		loran
-hint.loran.0.at="isa"
-hint.loran.0.irq="5"
-# HOT1 Xilinx 6200 card (http://www.vcc.com/)
-device		xrpu
 # nullmodem terminal driver
 device		nmdm
 
@@ -2387,43 +1549,6 @@ device		meteor	1
 device		bktr	1
 
 #
-# PC Card/PCMCIA
-# (OLDCARD)
-#
-# card: pccard slots
-# pcic: isa/pccard bridge
-device		pcic
-hint.pcic.0.at="isa"
-hint.pcic.1.at="isa"
-device		card
-
-#
-# PC Card/PCMCIA and Cardbus
-# (NEWCARD)
-#
-# Note that NEWCARD and OLDCARD are incompatible.  Do not use both at the same
-# time.
-#
-# pccbb: isa/pccard and pci/cardbus bridge
-# pccard: pccard slots
-# cardbus: cardbus slots
-#device		pccbb
-#device		pccard
-#device		cardbus
-
-#
-# Laptop/Notebook options:
-#
-# See also:
-#  apm under `Miscellaneous hardware'
-# above.
-
-# For older notebooks that signal a powerfail condition (external
-# power supply dropped, or battery state low) by issuing an NMI:
-
-options 	POWERFAIL_NMI	# make it beep instead of panicing
-
-#
 # SMB bus
 #
 # System Management Bus support is provided by the 'smbus' device.
@@ -2436,18 +1561,9 @@ options 	POWERFAIL_NMI	# make it beep instead of panicing
 # Supported SMB interfaces:
 # iicsmb	I2C to SMB bridge with any iicbus interface
 # bktr		brooktree848 I2C hardware interface
-# intpm		Intel PIIX4 (82371AB, 82443MX) Power Management Unit
-# alpm		Acer Aladdin-IV/V/Pro2 Power Management Unit
-# ichsmb	Intel ICH SMBus controller chips (82801AA, 82801AB, 82801BA)
-# viapm		VIA VT82C586B/596B/686A and VT8233 Power Management Unit 
 #
 device		smbus		# Bus support, required for smb below.
 
-device		intpm
-device		alpm
-device		ichsmb
-device		viapm
-
 device		smb
 
 #
@@ -2461,7 +1577,6 @@ device		smb
 # iicsmb i2c to smb bridge. Allow i2c i/o with smb commands.
 #
 # Supported interfaces:
-# pcf	Philips PCF8584 ISA-bus controller
 # bktr	brooktree848 I2C software interface
 #
 # Other:
@@ -2474,234 +1589,6 @@ device		ic
 device		iic
 device		iicsmb		# smb over i2c bridge
 
-device		pcf
-hint.pcf.0.at="isa"
-hint.pcf.0.port="0x320"
-hint.pcf.0.irq="5"
-
-#---------------------------------------------------------------------------
-# ISDN4BSD
-#
-# See /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
-#
-# i4b passive ISDN cards support contains the following hardware drivers:
-#
-#	isic  - Siemens/Infineon ISDN ISAC/HSCX/IPAC chipset driver
-#	iwic  - Winbond W6692 PCI bus ISDN S/T interface controller
-#	ifpi  - AVM Fritz!Card PCI driver
-#	ifpi2  - AVM Fritz!Card PCI version 2 driver
-#	ihfc  - Cologne Chip HFC ISA/ISA-PnP chipset driver
-#	ifpnp - AVM Fritz!Card PnP driver 
-#	itjc  - Siemens ISAC / TJNet Tiger300/320 chipset
-#
-# i4b active ISDN cards support contains the following hardware drivers:
-#
-#	iavc  - AVM B1 PCI, AVM B1 ISA, AVM T1
-#
-# Note that the ``options'' (if given) and ``device'' lines must BOTH
-# be uncommented to enable support for a given card !
-#
-# In addition to a hardware driver (and probably an option) the mandatory
-# ISDN protocol stack devices and the mandatory support device must be 
-# enabled as well as one or more devices from the optional devices section.
-#
-#---------------------------------------------------------------------------
-#	isic driver (Siemens/Infineon chipsets)
-#
-device	isic
-#
-# ISA bus non-PnP Cards:
-# ----------------------
-#
-# Teles S0/8 or Niccy 1008
-options 	TEL_S0_8
-hint.isic.0.at="isa"
-hint.isic.0.maddr="0xd0000"
-hint.isic.0.irq="5"
-hint.isic.0.flags="1"
-#
-# Teles S0/16 or Creatix ISDN-S0 or Niccy 1016
-options 	TEL_S0_16
-hint.isic.0.at="isa"
-hint.isic.0.port="0xd80"
-hint.isic.0.maddr="0xd0000"
-hint.isic.0.irq="5"
-hint.isic.0.flags="2"
-#
-# Teles S0/16.3
-options 	TEL_S0_16_3
-hint.isic.0.at="isa"
-hint.isic.0.port="0xd80"
-hint.isic.0.irq="5"
-hint.isic.0.flags="3"
-#
-# AVM A1 or AVM Fritz!Card
-options 	AVM_A1
-hint.isic.0.at="isa"
-hint.isic.0.port="0x340"
-hint.isic.0.irq="5"
-hint.isic.0.flags="4"
-#
-# USRobotics Sportster ISDN TA intern
-options 	USR_STI
-hint.isic.0.at="isa"
-hint.isic.0.port="0x268"
-hint.isic.0.irq="5"
-hint.isic.0.flags="7"
-#
-# ITK ix1 Micro ( < V.3, non-PnP version )
-options 	ITKIX1
-hint.isic.0.at="isa"
-hint.isic.0.port="0x398"
-hint.isic.0.irq="10"
-hint.isic.0.flags="18"
-#
-# ELSA PCC-16
-options 	ELSA_PCC16
-hint.isic.0.at="isa"
-hint.isic.0.port="0x360"
-hint.isic.0.irq="10"
-hint.isic.0.flags="20"
-#
-# ISA bus PnP Cards:
-# ------------------
-#
-# Teles S0/16.3 PnP
-options 	TEL_S0_16_3_P
-#
-# Creatix ISDN-S0 P&P
-options 	CRTX_S0_P
-#
-# Dr. Neuhaus Niccy Go@
-options 	DRN_NGO
-#
-# Sedlbauer Win Speed
-options 	SEDLBAUER
-#
-# Dynalink IS64PH
-options 	DYNALINK 
-#
-# ELSA QuickStep 1000pro ISA
-options 	ELSA_QS1ISA
-#
-# Siemens I-Surf 2.0
-options 	SIEMENS_ISURF2
-#
-# Asuscom ISDNlink 128K ISA
-options 	ASUSCOM_IPAC
-#
-# Eicon Diehl DIVA 2.0 and 2.02
-options 	EICON_DIVA
-#
-# Compaq Microcom 610 ISDN card (Compaq series PSB2222I)
-options 	COMPAQ_M610
-#
-# PCI bus Cards:
-# --------------
-#
-# ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI)
-options 	ELSA_QS1PCI
-#
-#
-#---------------------------------------------------------------------------
-#	ifpnp driver for AVM Fritz!Card PnP
-#
-# AVM Fritz!Card PnP
-device ifpnp
-#
-#---------------------------------------------------------------------------
-#	ihfc driver for Cologne Chip ISA chipsets (experimental!)
-#
-# Teles 16.3c ISA PnP
-# AcerISDN P10 ISA PnP
-# TELEINT ISDN SPEED No.1
-device ihfc
-#
-#---------------------------------------------------------------------------
-#	ifpi driver for AVM Fritz!Card PCI
-#
-# AVM Fritz!Card PCI
-device  ifpi
-#
-#---------------------------------------------------------------------------
-#	ifpi2 driver for AVM Fritz!Card PCI version 2
-#
-# AVM Fritz!Card PCI version 2
-device  "ifpi2"
-#
-#---------------------------------------------------------------------------
-#	iwic driver for Winbond W6692 chipset
-#
-# ASUSCOM P-IN100-ST-D (and other Winbond W6692 based cards)
-device  iwic
-#
-#---------------------------------------------------------------------------
-#	itjc driver for Simens ISAC / TJNet Tiger300/320 chipset
-#
-# Traverse Technologies NETjet-S
-# Teles PCI-TJ
-device  itjc
-#
-#---------------------------------------------------------------------------
-#	iavc driver (AVM active cards, needs i4bcapi driver!)
-#
-device	iavc
-#
-# AVM B1 ISA bus (PnP mode not supported!)
-# ----------------------------------------
-hint.iavc.0.at="isa"
-hint.iavc.0.port="0x150"
-hint.iavc.0.irq="5"
-#
-#---------------------------------------------------------------------------
-#	ISDN Protocol Stack - mandatory for all hardware drivers
-#
-# Q.921 / layer 2 - i4b passive cards D channel handling
-device		"i4bq921"
-#
-# Q.931 / layer 3 - i4b passive cards D channel handling
-device		"i4bq931"
-#
-# layer 4 - i4b common passive and active card handling
-device		"i4b"
-#
-#---------------------------------------------------------------------------
-#	ISDN devices - mandatory for all hardware drivers
-#
-# userland driver to do ISDN tracing (for passive cards only)
-device		"i4btrc"	4
-#
-# userland driver to control the whole thing
-device		"i4bctl"
-#
-#---------------------------------------------------------------------------
-#	ISDN devices - optional
-#
-# userland driver for access to raw B channel
-device		"i4brbch"	4
-#
-# userland driver for telephony
-device		"i4btel"	2
-#
-# network driver for IP over raw HDLC ISDN
-device		"i4bipr"	4
-# enable VJ header compression detection for ipr i/f
-options 	IPR_VJ
-# enable logging of the first n IP packets to isdnd (n=32 here)
-options 	IPR_LOG=32
-#
-# network driver for sync PPP over ISDN; requires an equivalent
-# number of sppp device to be configured
-device		"i4bisppp"	4
-#
-# B-channel interface to the netgraph subsystem
-device		"i4bing"	2
-#
-# CAPI driver needed for active ISDN cards (see iavc driver above)
-device		"i4bcapi"
-#
-#---------------------------------------------------------------------------
-
 # Parallel-Port Bus
 #
 # Parallel port bus support is provided by the `ppbus' device.
@@ -2762,28 +1649,6 @@ options 	BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
 options 	HW_WDOG
 
 #
-# Set the number of PV entries per process.  Increasing this can
-# stop panics related to heavy use of shared memory. However, that can
-# (combined with large amounts of physical memory) cause panics at
-# boot time due the kernel running out of VM space.
-#
-# If you're tweaking this, you might also want to increase the sysctls
-# "vm.v_free_min", "vm.v_free_reserved", and "vm.v_free_target".
-#
-# The value below is the one more than the default.
-#
-options 	PMAP_SHPGPERPROC=201
-
-#
-# Change the size of the kernel virtual address space.  Due to
-# constraints in loader(8) on i386, this must be a multiple of 4.
-# 256 = 1 GB of kernel address space.  Increasing this also causes
-# a reduction of the address space in user processes.  512 splits
-# the 4GB cpu address space in half (2GB user, 2GB kernel).
-#
-options 	KVA_PAGES=260
-
-#
 # Disable swapping. This option removes all code which actually performs
 # swapping, so it's not possible to turn it back on at run-time.
 #
@@ -2812,43 +1677,6 @@ options 	DEBUG_LOCKS
 
 
 #####################################################################
-# ABI Emulation
-
-# Enable iBCS2 runtime support for SCO and ISC binaries
-options 	IBCS2
-
-# Emulate spx device for client side of SVR3 local X interface
-options 	SPX_HACK
-
-# Enable Linux ABI emulation
-options 	COMPAT_LINUX
-
-# Enable the linux-like proc filesystem support (requires COMPAT_LINUX
-# and PSEUDOFS)
-options 	LINPROCFS
-
-#
-# SysVR4 ABI emulation
-#
-# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
-# a KLD module.  
-# The STREAMS network emulation code can also be compiled statically or as a 
-# module.  If loaded as a module, it must be loaded before the svr4 module
-# (the /usr/sbin/svr4 script does this for you).  If compiling statically,
-# the `streams' device must be configured into any kernel which also
-# specifies COMPAT_SVR4.  It is possible to have a statically-configured 
-# STREAMS device and a dynamically loadable svr4 emulator;  the /usr/sbin/svr4
-# script understands that it doesn't need to load the `streams' module under
-# those circumstances.
-# Caveat:  At this time, `options KTRACE' is required for the svr4 emulator
-# (whether static or dynamic).  
-# 
-options 	COMPAT_SVR4	# build emulator statically
-options 	DEBUG_SVR4	# enable verbose debugging
-device		streams		# STREAMS network driver (required for svr4).
-
-
-#####################################################################
 # USB support
 # UHCI controller
 device		uhci
@@ -2996,21 +1824,6 @@ options 	CLUSTERDEBUG
 
 options 	DEBUG
 
-# PECOFF module (Win32 Execution Format)
-options 	PECOFF_SUPPORT
-options 	PECOFF_DEBUG
-
-# Disable the 4 MByte PSE CPU feature.
-#options 	DISABLE_PSE
-
-options 	ENABLE_ALART
-options 	I4B_SMP_WORKAROUND
-options 	I586_PMC_GUPROF=0x70000
-options 	KBDIO_DEBUG=2
-options 	KBD_MAXRETRY=4
-options 	KBD_MAXWAIT=6
-options 	KBD_RESETDELAY=201
-
 # Kernel filelock debugging.
 options 	LOCKF_DEBUG
 
@@ -3028,8 +1841,6 @@ options 	NBUF=512	# Number of buffer headers
 
 options 	NMBCLUSTERS=1024	# Number of mbuf clusters
 
-options 	PSM_DEBUG=1
-
 options 	SCSI_NCR_DEBUG
 options 	SCSI_NCR_MAX_SYNC=10000
 options 	SCSI_NCR_MAX_WIDE=1
@@ -3040,13 +1851,8 @@ options 	SC_RENDER_DEBUG	# syscons rendering debugging
 
 options 	SHOW_BUSYBUFS	# List buffers that prevent root unmount
 options 	SLIP_IFF_OPTS
-options 	TIMER_FREQ="((14318182+6)/12)"
 options 	VFS_BIO_DEBUG	# VFS buffer I/O debugging
 
-options 	VM_KMEM_SIZE
-options 	VM_KMEM_SIZE_MAX
-options 	VM_KMEM_SIZE_SCALE
-
 # Yet more undocumented options for linting.
 options 	AAC_DEBUG
 options 	ACD_DEBUG
@@ -3064,7 +1870,6 @@ options 	ATA_DEBUG
 options 	BROOKTREE_ALLOC_PAGES="(217*4+1)"
 # Broken:
 ##options 	CAPABILITIES
-options 	COMPAT_SUNOS
 options 	MAXFILES=999
 # METEOR_TEST_VIDEO has no effect since meteor is broken.
 options 	METEOR_TEST_VIDEO
@@ -3073,5 +1878,3 @@ options 	NDEVFSOVERFLOW=32769
 options 	NETGRAPH_BRIDGE
 # SIMOS is broken since it is alpha-only but not ifdefed.
 ##options 	SIMOS
-options 	VESA_DEBUG
-options 	VGA_DEBUG