Module Name:    src
Committed By:   gdt
Date:           Fri Mar  5 20:30:56 UTC 2021

Modified Files:
        src/sys/arch/amd64/conf: XEN3_DOM0

Log Message:
XEN3_DOM0: Approach GENERIC

When processed to remove comments, blank lines, normalize whitespace,
and sort/uniq (one line was previously duplicated), this file is
identical to the previous version.  It has been reorganized to reduce
diffs to GENERIC, and many missing lines from GENERIC have been added
but commented out.


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/arch/amd64/conf/XEN3_DOM0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.191 src/sys/arch/amd64/conf/XEN3_DOM0:1.192
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.191	Thu Mar  4 16:02:10 2021
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Fri Mar  5 20:30:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.191 2021/03/04 16:02:10 gdt Exp $
+# $NetBSD: XEN3_DOM0,v 1.192 2021/03/05 20:30:56 gdt Exp $
 
 # XEN3_DOM0 machine description file
 #
@@ -14,7 +14,7 @@ include 	"arch/amd64/conf/std.xen"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"XEN3_DOM0-$Revision: 1.191 $"
+#ident		"XEN3_DOM0-$Revision: 1.192 $"
 
 maxusers	32		# estimated number of users
 
@@ -43,9 +43,20 @@ maxusers	32		# estimated number of users
 #options 	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
 #options 	PHYSMEM_MAX_ADDR=2048	# don't use memory above this (in MB)
 
+## Replace std.amd64 content
+
+mainbus0 at root
+cpu* at mainbus?
+ioapic* at mainbus? apid ?
+
+# Atheros HAL options
+include "external/isc/atheros_hal/conf/std.ath_hal"
+
+## end std.amd64
+
 ## Xen-specific options
 
-options		XENPV		# PV dom0 support
+options 	XENPV		# PV dom0 support
 options 	DOM0OPS
 options 	MULTIPROCESSOR
 #options 	NO_PREEMPTION	# needed if MULTIPROCESSOR is disabled
@@ -58,10 +69,6 @@ options 	MULTIPROCESSOR
 # boot messages with MPBIOS, acpi and ioapic can be quite large
 options 	MSGBUFSIZE=24576
 
-# CPU features
-est0		at cpu0		# Intel Enhanced SpeedStep (non-ACPI)
-powernow0	at cpu0		# AMD PowerNow! and Cool'n'Quiet (non-ACPI)
-
 # Standard system options
 
 options 	INSECURE	# disable kernel security levels - X needs this
@@ -79,10 +86,20 @@ options 	SYSVSEM		# System V-like semaph
 options 	SYSVSHM		# System V-like memory sharing
 
 options 	MODULAR		# new style module(7) framework
+#options 	MODULAR_DEFAULT_AUTOLOAD
 options 	USERCONF	# userconf(4) support
 #options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
+# CPU features
+#acpicpu*	at cpu?		# ACPI CPU (including frequency scaling)
+#coretemp*	at cpu?		# Intel on-die thermal sensor
+est0		at cpu0		# Intel Enhanced SpeedStep (non-ACPI)
+#hyperv0 	at cpu0		# Microsoft Hyper-V
+#odcm0		at cpu0		# On-demand clock modulation
+powernow0	at cpu0		# AMD PowerNow! and Cool'n'Quiet (non-ACPI)
+#vmt0		at cpu0		# VMware Tools
+
 # Alternate buffer queue strategies for better responsiveness under high
 # disk I/O load.
 #options 	BUFQ_READPRIO
@@ -286,10 +303,6 @@ config		netbsd	root on ? type ?
 #
 
 ## Xen-specific options
-mainbus0 at root
-
-cpu* at mainbus?
-
 hypervisor*	at mainbus?		# Xen hypervisor
 
 vcpu*		at hypervisor?		# Xen virtual CPUs
@@ -306,8 +319,8 @@ ipmi_acpi*	at acpi?
 ipmi0		at ipmi_acpi?
 
 # ACPI will be used if present. If not it will fall back to MPBIOS
-acpi0		at hypervisor?		# ACPI access in PV mode
 acpi0		at mainbus?		# ACPI access in PVH(VM) mode
+acpi0		at hypervisor?		# ACPI access in PV mode
 
 options 	ACPI_SCANPCI		# find PCI roots using ACPI
 options 	MPBIOS			# configure CPUs and APICs using MPBIOS
@@ -322,8 +335,6 @@ options 	MPBIOS_SCANPCI		# MPBIOS config
 #options 	MPDEBUG			# MPBIOS configures PCI roots
 #options 	MPVERBOSE		# verbose MPBIOS autoconfig messages
 
-ioapic* 	at mainbus? apid ?
-
 # ACPI devices
 acpiacad*	at acpi?		# ACPI AC Adapter
 acpibat*	at acpi?		# ACPI Battery
@@ -343,30 +354,44 @@ acpitz* 	at acpi?		# ACPI Thermal Zone
 
 # Mainboard devices
 aibs*		at acpi?		# ASUSTeK AI Booster hardware monitor
+#asus*		at acpi?		# ASUS hotkeys
+#attimer*	at acpi?		# AT Timer
 #com*		at acpi?		# Serial communications interface
 #fdc*		at acpi?		# Floppy disk controller
+#fujbp*		at acpi?		# Fujitsu Brightness & Pointer
+#fujhk*		at acpi?		# Fujitsu Hotkeys
 #hpacel* 	at acpi?		# HP 3D DriveGuard accelerometer
-#hpqlb*		at acpi?		# HP Quick Launch Buttons
 hpqlb*		at acpi?		# HP Quick Launch Buttons
+#hpet*		at acpihpetbus?		# High Precision Event Timer (table)
+#hpet*		at acpinodebus?		# High Precision Event Timer (device)
+#joy*		at acpi?		# Joystick/Game port
+#lpt*		at acpi?		# Parallel port
+#mpu*		at acpi?		# Roland MPU-401 MIDI UART
 #lpt*		at acpi?		# Parallel port
 pckbc*		at acpi?		# PC keyboard controller
 pcppi*		at acpi?		# AT-style speaker sound
+#qemufwcfg*	at acpi?		# QEMU Firmware Configuration device
+#sdhc*		at acpi?		# SD Host Controller
+#sony*		at acpi?		# Sony Notebook Controller
+#spic*		at acpi?		# Sony Programmable I/O Controller
+#wsmouse*	at spic?		# mouse
+#thinkpad*	at acpi?		# IBM/Lenovo Thinkpad hotkeys
+#tpm*		at acpi?		# ACPI TPM (Experimental)
+#ug*		at acpi?		# Abit uGuru Hardware monitor
+#valz*		at acpi?		# Toshiba Dynabook hotkeys
+#wb*		at acpi?		# Winbond W83L518D SD/MMC reader
+#sdmmc*		at wb?			# SD/MMC bus
+#wmidell*	at acpiwmibus?		# Dell WMI mappings
+#wmieeepc*	at acpiwmibus?		# Asus Eee PC WMI mappings
+#wmihp*		at acpiwmibus?		# HP WMI mappings
+#wmimsi* 	at acpiwmibus?		# MSI WMI mappings
 
 # Basic Bus Support
 
 # PCI bus support
-pci*		at hypervisor? bus ?
-pci*		at pchb? bus ?
-ppb*		at pci? dev ? function ?	# PCI-PCI bridges
-pci*		at ppb? bus ?
-
-# pci backend devices, used for PCI pass-through. To export a PCI device
-# to a domU, the device has to be attached to the pciback driver in the dom0.
-# you can force a device to attach to the pciback driver in dom0 passing
-# pciback.hide=(bus:dev.fun)(bus:dev.func) to the dom0 kernel boot parameters.
-# bus and dev are 2-digits hex number, func is a single-digit number:
-# pciback.hide=(00:1a.0)(00:1a.1)(00:1a.7)
-pciback* at pci?			# pci backend device
+pci*	at hypervisor? bus ?
+pci*	at pchb? bus ?
+pci*	at ppb? bus ?
 
 # PCI bridges
 pchb*	at pci? dev ? function ?	# PCI-Host bridges
@@ -376,15 +401,107 @@ ppb*	at pci? dev ? function ?	# PCI-PCI 
 # XXX 'puc's aren't really bridges, but there's no better place for them here
 puc*	at pci? dev ? function ?	# PCI "universal" comm. cards
 
-ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
-					# watchdog and SpeedStep support
+#amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
+#hpet*	at amdpcib?
+
+#pwdog*	at pci? dev ? function ?	# QUANCOM PWDOG1
+
+ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-LPC w/ timecounter,
+					# watchdog, gpio, Speedstep and HPET
+#fwhrng* at ichlpcib?		# Intel 82802 FWH Random Number Generator
+#hpet*	at ichlpcib?
+#tco*	at ichlpcib?		# TCO watch dog timer
+
+#aapic*	at pci? dev ? function ?	# AMD 8131 IO apic
 
 #agp*	at pchb?			# INTENTIONAL OMISSION - crashes reported with agp
 
+# pci backend devices, used for PCI pass-through. To export a PCI device
+# to a domU, the device has to be attached to the pciback driver in the dom0.
+# you can force a device to attach to the pciback driver in dom0 passing
+# pciback.hide=(bus:dev.fun)(bus:dev.func) to the dom0 kernel boot parameters.
+# bus and dev are 2-digits hex number, func is a single-digit number:
+# pciback.hide=(00:1a.0)(00:1a.1)(00:1a.7)
+pciback* at pci?			# pci backend device
+
 # ISA bus support
-isa0	at ichlpcib?
-isa0	at pcib?
 isa0	at hypervisor?
+isa0	at pcib?
+#isa0	at amdpcib?
+isa0	at ichlpcib?
+
+# CardBus bridge support
+#cbb*		at pci? dev ? function ?
+#cardslot*	at cbb?
+
+# CardBus bus support
+#cardbus*	at cardslot?
+#pcmcia* 	at cardslot?
+
+# Console Devices
+
+# wscons
+pckbc0		at isa?			# pc keyboard controller
+pckbd*		at pckbc?		# PC keyboard
+pms*		at pckbc?		# PS/2 mouse for wsmouse
+#options 	PMS_DISABLE_POWERHOOK	# Disable PS/2 reset on resume
+options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
+#options 	PMS_ELANTECH_TOUCHPAD	# Enable support for Elantech Touchpads
+#options 	PMS_ALPS_TOUCHPAD	# Enable support for Alps Touchpads
+vga*		at pci? dev ? function ?
+#vga0		at isa?
+#genfb*		at pci? dev ? function ?
+#options 	VCONS_DRAW_INTR
+wsdisplay*	at vga? console ?
+#wsdisplay*	at wsemuldisplaydev?
+#wsdisplay*	at pcdisplay? console ?
+#wsdisplay*	at machfb? console ?
+#pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
+#machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
+wskbd*		at pckbd? console ?
+wsmouse*	at pms? mux 0
+#wsmouse*	at wsmousedev?
+
+#attimer0	at isa?
+#pcppi0		at isa?
+#sysbeep0	at pcppi?
+
+# DRI legacy drivers
+#i915drm*	at drm?		# Intel i915, i945 DRM driver
+#mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
+#mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
+#r128drm*	at drm?		# ATI Rage 128 DRM driver
+#radeondrm*	at drm?		# ATI Radeon DRM driver
+#savagedrm*	at drm?		# S3 Savage DRM driver
+#sisdrm* 	at drm?		# SiS DRM driver
+#tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
+
+# DRMKMS drivers
+#i915drmkms*	at pci? dev ? function ?
+#intelfb*	at intelfbbus?
+
+#radeon* 	at pci? dev ? function ?
+#radeondrmkmsfb* at radeonfbbus?
+
+#amdgpu*	at pci? dev ? function ?
+#amdgpufb*	at amdgpufbbus?
+
+#nouveau*	at pci? dev ? function ?
+#nouveaufb*	at nouveaufbbus?
+
+# DRMUMS drivers
+#viadrmums*	at drm?
+
+# Cryptographic Devices
+
+# PCI cryptographic devices
+#amdccp*	at pci? dev ? function ?	# AMD Cryptographic Coprocessor
+hifn*	at pci? dev ? function ?	# Hifn 7755/7811/795x
+#qat*	at pci? dev ? function ?	# Intel QuickAssist
+ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x
+
+# Trusted Platform Module
+#tpm*	at isa? iomem 0xfed40000 irq 7
 
 # Serial Devices
 
@@ -393,6 +510,15 @@ com*	at puc? port ?			# 16x50s on "unive
 cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
 cz*	at pci? dev ? function ?	# Cyclades-Z multi-port serial boards
 
+# PCMCIA serial interfaces
+#com*	at pcmcia? function ?		# Modems and serial cards
+
+#pcmcom* at pcmcia? function ?		# PCMCIA multi-port serial cards
+#com*	at pcmcom? slave ?		# ...and the slave devices
+
+# CardBus serial interfaces
+#com*	at cardbus? function ?	# Modems and serial cards
+
 # ISA serial interfaces
 #options 	COM_HAYESP		# adds Hayes ESP serial board support
 # If a com port is used as Xen console it can't be used by the domain0 kernel
@@ -410,25 +536,59 @@ lpt*	at puc? port ?			# || ports on "uni
 
 # ISA parallel printer interfaces
 lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
+#lpt1	at isa? port 0x278
 
 # Hardware monitors
 
 amdnb_misc* at pci?			# AMD NB Misc Configuration
-amdtemp* at amdnb_misc? 		# AMD CPU Temperature sensors
+amdtemp* at amdnb_misc?  		# AMD CPU Temperature sensors
 
 amdsmn* at pci?				# AMD SMN Configuration
 amdzentemp* at amdsmnbus?		# AMD Ryzen Family 17h CPU temp sensors
 
+# Winbond LPC Super I/O
+#wbsio*	at isa? port 0x2e
+#wbsio*	at isa? port 0x4e
+
+# IBM Hawk Integrated Systems Management Processor
+#ibmhawk0	at iic? addr 0x37
+
+# LM7[89] and compatible hardware monitors
+# Use flags to select temp sensor type (see lm(4) man page for details)
+#lm0	at isa?	port 0x290 flags 0x0	# other common ports: 0x280, 0x310
+#lm*	at wbsio?
+
+# SMSC LPC47B397 hardware monitor functions
+#smsc0	at isa? port 0x02e
+
+# SMSC LPC47M192 hardware monitor
+#smscmon*	at iic? addr 0x2c
+#smscmon*	at iic? addr 0x2d	# (alternate address)
+
 # AMD 768 and 8111 power/ACPI controllers
 amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
 #iic*	at amdpm?			# sensors below are on this bus
 
+# NVIDIA nForce2/3/4 SMBus controller
+#nfsmbc* at pci? dev ? function ?
+#nfsmb*	at nfsmbc?
+#iic*	at nfsmb?
+
+# Intel PIIX4 power management controllers
+#piixpm* at pci? dev ? function ?	# PIIX4 compatible PM controller
+#iic*	at piixpm?			# SMBus on PIIX4
+
 # Intel ICH SMBus controller
 ichsmb* at pci? dev ? function ?
 iic*	at ichsmb?
 
-# I2C controller as found in some Intel PCH devices.
-dwiic*		at pci?			# I2C controller
+# Intel S1200,C2000 (non-pch) SMBus controller
+#ismt* at pci? dev ? function ?
+#iic*	at ismt?
+
+# DesignWare I2C controller as found in some Intel PCH and AMD FCH devices.
+#dwiic*		at acpi?		# DesignWare I2C controller
+dwiic*		at pci?			# DesignWare I2C controller
 iic*		at dwiic?
 
 # Thermal monitor and fan controller
@@ -436,6 +596,23 @@ iic*		at dwiic?
 #dbcool* at iic? addr 0x2D		# Tyan S2881
 #dbcool* at iic? addr 0x2E		# Tyan S2882-D
 
+# IBM Thinkpad Active Protection System
+#aps0	at isa? port 0x1600
+
+# Fintek Super I/O with hardware monitor
+#finsio0 	at isa? port 0x4e
+
+# iTE IT87xxF Super I/O with watchdog and sensors support
+#itesio0 	at isa? port 0x2e
+
+# Abit uGuru Hardware system monitor
+#ug0	at isa? port 0xe0
+
+# Thermal monitor and fan controller
+#dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
+#dbcool* at iic? addr 0x2D		# Tyan S2881
+#dbcool* at iic? addr 0x2E		# Tyan S2882-D
+
 # Serial Presence Detect capable memory modules
 #spdmem* at iic? addr 0x50
 #spdmem* at iic? addr 0x51
@@ -454,17 +631,194 @@ iic*		at dwiic?
 #sdtemp* at iic? addr 0x1e
 #sdtemp* at iic? addr 0x1f
 
-# Winbond LPC Super I/O
-#wbsio*	at isa? port 0x2e
-#wbsio*	at isa? port 0x4e
-
-# LM7[89] and compatible hardware monitors
-#lm0	at isa?	port 0x290		# other common: 0x280, 0x310, 0xc00
-#lm*	at wbsio?
-
 # VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer
 #viaenv* 	at pci? dev ? function ?
 
+# I2C HID devices
+ihidev* at iic?
+
+# I2C Mice
+ims*	at ihidev? reportid ?
+wsmouse* at ims? mux 0
+
+# I2O devices
+iop*	at pci? dev ? function ?	# I/O processor
+iopsp*	at iop? tid ?			# SCSI/FC-AL ports
+ld*	at iop? tid ?			# block devices
+# XXX dpti.c wants a processor type that is not assigned for x86-64
+#dpti*	at iop? tid 0			# DPT/Adaptec control interface
+
+# GPIO devices
+#gpio*		at gpiobus?
+
+# 1- Wire support
+#gpioow* 	at gpio? offset ? mask ?	# 1-wire bitbanging via gpio
+#gpioow* 	at gpio?
+#onewire*	at gpioow?
+
+# 1-Wire devices
+#owtemp* 	at onewire?			# Temperature sensors
+
+# I2C support
+#gpioiic*	at gpio?
+#iic*		at gpioiic?
+
+# Keylock support
+#gpiolock*	at gpio?
+
+# Pulsing GPIO pins in software
+#gpiopwm*	at gpio?
+
+# Soekris 6501 GPIO/LED driver (provides gpiobus, needs gpio)
+#soekrisgpio0	at isa? port 0x680
+
+# Nuvoton NCT5104D SuperIO providing GPIO
+#nct0		at isa? port ?
+
+# SCSI Controllers and Devices
+
+# PCI SCSI controllers
+adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
+adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
+ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
+ahd*	at pci? dev ? function ?	# Adaptec 29320, 39320 (aic790x) SCSI
+bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
+dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID
+iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
+isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
+mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
+mfii*	at pci? dev ? function ?	# LSI MegaRAID SAS (Fusion and newer)
+mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
+mpt*	at pci? dev ? function ?	# LSILogic 9x9 and 53c1030 (Fusion-MPT)
+mpii*	at pci? dev ? function ?	# LSI Logic Fusion-MPT II
+njs*	at pci? dev ? function ?	# Workbit NinjaSCSI-32
+pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
+siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
+esiop*	at pci? dev ? function ?	# Symbios 53c875 SCSI and newer
+#options 	SIOP_SYMLED		# drive the act. LED in software
+trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
+
+# PCMCIA SCSI controllers
+#aic*	at pcmcia? function ?		# Adaptec APA-1460 SCSI
+#esp*	at pcmcia? function ?		# Qlogic ESP406/FAS408 SCSI
+#spc*	at pcmcia? function ?		# Fujitsu MB87030/MB89352 SCSI
+
+# CardBus SCSI cards
+#adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
+#ahc*	at cardbus? function ?	# Adaptec ADP-1480
+#njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
+
+# SCSI bus support
+scsibus* at scsi?
+
+# SCSI devices
+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
+ses*	at scsibus? target ? lun ?	# SCSI Enclosure Services devices
+ss*	at scsibus? target ? lun ?	# SCSI scanners
+uk*	at scsibus? target ? lun ?	# SCSI unknown
+
+# RAID controllers and devices
+aac*	at pci? dev ? function ?	# Adaptec AAC family
+amr*	at pci? dev ? function ?	# AMI/LSI Logic MegaRAID
+arcmsr* at pci? dev ? function ?	# Areca SATA RAID controllers
+cac*	at pci? dev ? function ?	# Compaq PCI array controllers
+ciss*	at pci? dev ? function ?	# HP Smart Array controllers
+icp*	at pci? dev ? function ?	# ICP-Vortex GDT & Intel RAID
+mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
+twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers
+twa*	at pci? dev ? function ?	# 3ware Escalade 95xx RAID controllers
+
+ld*	at aac? unit ?			# logical disk devices
+ld*	at amr? unit ?
+ld*	at cac? unit ?
+ld*	at icp? unit ?
+ld*	at twe? unit ?
+ld*	at twa? unit ?
+ld*	at mlx? unit ?
+
+icpsp*	at icp? unit ?			# SCSI pass-through
+
+# IDE and related devices
+# PCI IDE controllers - see pciide(4) for supported hardware.
+# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
+# how to set up DMA modes for this chip. This may work, or may cause
+# a machine hang with some controllers.
+pciide* 	at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver
+acardide*	at pci? dev ? function ?	# Acard IDE controllers
+aceride*	at pci? dev ? function ?	# Acer Lab IDE controllers
+ahcisata*	at pci? dev ? function ?	# AHCI SATA controllers
+artsata*	at pci? dev ? function ?	# Intel i31244 SATA controller
+cmdide* 	at pci? dev ? function ?	# CMD tech IDE controllers
+cypide* 	at pci? dev ? function ?	# Cypress IDE controllers
+geodeide*	at pci? dev ? function ?	# AMD Geode IDE controllers
+hptide* 	at pci? dev ? function ?	# Triones/HighPoint IDE controllers
+iteide* 	at pci? dev ? function ?	# IT Express IDE controllers
+ixpide* 	at pci? dev ? function ?	# ATI IXP IDE controllers
+jmide*		at pci? dev ? function ?	# JMicron PCI-e PATA/SATA controllers
+ahcisata*	at jmide?
+optiide*	at pci? dev ? function ?	# Opti IDE controllers
+piixide*	at pci? dev ? function ?	# Intel IDE controllers
+pdcide* 	at pci? dev ? function ?	# Promise IDE controllers
+pdcsata*	at pci? dev ? function ?	# Promise SATA150 controllers
+rccide* 	at pci? dev ? function ?	# ServerWorks IDE controllers
+satalink*	at pci? dev ? function ?	# SiI SATALink controllers
+siisata*	at pci? dev ? function ?	# SiI SteelVine controllers
+siside* 	at pci? dev ? function ?	# SiS IDE controllers
+slide*		at pci? dev ? function ?	# Symphony Labs IDE controllers
+svwsata*	at pci? dev ? function ?	# ServerWorks SATA controllers
+stpcide*	at pci? dev ? function ?	# STMicro STPC IDE controllers
+viaide* 	at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers
+
+# ATA (IDE) bus support
+atabus* at ata?
+
+# IDE drives
+# Flags are used only with controllers that support DMA operations
+# and mode settings (e.g. some pciide controllers)
+# The lowest order four bits (rightmost digit) of the flags define the PIO
+# mode to use, the next set of four bits the DMA mode and the third set the
+# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
+# to use, and the last bit must be 1 for this setting to be used.
+# For DMA and UDMA, 0xf (1111) means 'disable'.
+# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
+# (0xc=1100, 0xa=1010, 0xf=1111)
+# 0x0000 means "use whatever the drive claims to support".
+wd*	at atabus? drive ? flags 0x0000
+
+# ATAPI bus support
+atapibus* at atapi?
+
+
+# ATA RAID configuration support, as found on some Promise controllers.
+pseudo-device ataraid
+ld*	at ataraid? vendtype ? unit ?
+
+# ATAPI devices
+# flags have the same meaning as for IDE drives.
+cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
+sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
+st*	at atapibus? drive ? flags 0x0000	# ATAPI tape drives
+uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown
+
+
+# NVM Express controllers and devices
+nvme*	at pci? dev ? function ?
+ld*	at nvme? nsid ?
+
+
+# Miscellaneous mass storage devices
+
+# ISA floppy
+#fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
+#fdc1	at isa? port 0x370 irq ? drq ?
+#fd*	at fdc? drive ?			# the drives themselves
+# some machines need you to do this instead of fd*
+#fd0	at fdc0 drive 0
+
+# Network Interfaces
 
 # PCI network interfaces
 age*	at pci? dev ? function ?	# Attansic/Atheros L1 Gigabit Ethernet
@@ -473,25 +827,37 @@ ale*	at pci? dev ? function ?	# Attansic
 an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
 aq*	at pci? dev ? function ?	# Aquantia AQC 10 gigabit
 ath*	at pci? dev ? function ?	# Atheros 5210/5211/5212 802.11
+#athn*	at pci? dev ? function ?	# Atheros AR9k (802.11a/g/n)
 atw*	at pci? dev ? function ?	# ADMtek ADM8211 (802.11)
 bce*	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
 bge*	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
 bnx*	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
+#bwi*	at pci? dev ? function ?	# Broadcom BCM43xx wireless
+#bwfm*	at pci? dev ? function ?	# Broadcom FullMAC
+#cas*	at pci? dev ? function ?	# Sun Cassini/Cassini+ Ethernet
 dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
+#ena*	at pci? dev ? function ?	# Amazon.com Elastic Network Adapter
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 et*	at pci? dev ? function ?	# Agere/LSI ET1310/ET1301 Gigabit
 ex*	at pci? dev ? function ?	# 3Com 90x[BC]
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
+#gem*	at pci? dev ? function ?	# Apple GMAC and Sun ERI gigabit enet
 gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
 hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
+#iavf*	at pci? dev ? function ?	# Intel Adaptive Virtual Function
 ipw*	at pci? dev ? function ?	# Intel PRO/Wireless 2100
 iwi*	at pci? dev ? function ?	# Intel PRO/Wireless 2200BG
 iwn*	at pci? dev ? function ?	# Intel PRO/Wireless 4965AGN
 iwm*	at pci? dev ? function ?	# Intel Wireless WiFi Link 7xxx
 ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
+#ixl*	at pci? dev ? function ?	# Intel Ethernet 700 Series
+#ixv*	at pci? dev ? function ?	# Intel 8259x 10G virtual function
 jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
+#kse*	at pci? dev ? function ?	# Micrel KSZ8841/8842 ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
+#malo*	at pci? dev ? function ?	# Marvell Libertas Wireless
+#mcx*	at pci? dev ? function ?	# Mellanox 5th generation Ethernet
 mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
 msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet
 mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
@@ -501,7 +867,10 @@ ntwoc*	at pci? dev ? function ?	# Riscom
 pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
 ral*	at pci? dev ? function ?	# Ralink Technology RT25x0 802.11a/b/g
 re*	at pci? dev ? function ?	# Realtek 8139C+/8169/8169S/8110S
+#rge*	at pci? dev ? function ?	# Realtek 8125
 rtk*	at pci? dev ? function ?	# Realtek 8129/8139
+#rtw*	at pci? dev ? function ?	# Realtek 8180L (802.11)
+#rtwn*	at pci? dev ? function ?	# Realtek 8188CE/8192CE 802.11b/g/n
 sf*	at pci? dev ? function ?	# Adaptec AIC-6915 Ethernet
 sip*	at pci? dev ? function ?	# SiS 900/DP83815 Ethernet
 skc*	at pci? dev ? function ?	# SysKonnect SK9821 Gigabit Ethernet
@@ -513,16 +882,50 @@ tl*	at pci? dev ? function ?	# ThunderLA
 tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
 txp*	at pci? dev ? function ?	# 3com 3cr990
 vge*	at pci? dev ? function ?	# VIATech VT612X Gigabit Ethernet
+#vmx*	at pci? dev ? function ?	# VMware VMXNET3
 vr*	at pci? dev ? function ?	# VIA Rhine Fast Ethernet
 wi*	at pci? dev ? function ?	# Intersil Prism Mini-PCI (802.11b)
 wm*	at pci? dev ? function ?	# Intel 8254x gigabit
 wpi*	at pci? dev ? function ?	# Intel PRO/Wireless 3945ABG
 xge*	at pci? dev ? function ?	# Neterion (S2io) Xframe-I 10GbE
 
+# PCMCIA network interfaces
+#an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
+#awi*	at pcmcia? function ?		# BayStack 650/660 (802.11FH/DS)
+#cnw*	at pcmcia? function ?		# Xircom/Netwave AirSurfer
+#cs*	at pcmcia? function ?		# CS89xx Ethernet
+#ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
+#malo*	at pcmcia? function ?		# Marvell Libertas
+#mbe*	at pcmcia? function ?		# MB8696x based Ethernet
+#ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
+#ray*	at pcmcia? function ?		# Raytheon Raylink (802.11)
+#sm*	at pcmcia? function ?		# Megahertz Ethernet
+#wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
+#xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet
+#com*	at xirc?
+#xi*	at xirc?
+
+#mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
+#com*	at mhzc?
+#sm*	at mhzc?
+
+# CardBus network cards
+#ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
+#athn*	at cardbus? function ?	# Atheros AR9k (802.11a/g/n) - UNTESTED
+#atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
+#ex*	at cardbus? function ?	# 3Com 3C575TX
+#fxp*	at cardbus? function ?	# Intel i8255x
+#malo*	at cardbus? function ?	# Marvell Libertas Wireless
+#ral*	at cardbus? function ?	# Ralink Technology RT25x0 802.11a/b/g
+#re*	at cardbus? function ?	# Realtek 8139C+/8169/8169S/8110S
+#rtk*	at cardbus? function ?	# Realtek 8129/8139
+#rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
+#tlp*	at cardbus? function ?	# DECchip 21143
+
 # MII/PHY support
-acphy*	at mii? phy ?			# Altima AC101 and AMD Am79c874 PHYs
+acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
 amhphy* at mii? phy ?			# AMD 79c901 Ethernet PHYs
-atphy*	at mii? phy ?			# Attansic/Atheros PHYs
+atphy*	at mii?	phy ?			# Attansic/Atheros PHYs
 bmtphy* at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
 brgphy* at mii? phy ?			# Broadcom BCM5400-family PHYs
 ciphy*	at mii? phy ?			# Cicada CS8201 Gig-E PHYs
@@ -538,184 +941,55 @@ ihphy*	at mii? phy ?			# Intel 82577 PHY
 ikphy*	at mii? phy ?			# Intel 82563 PHYs
 inphy*	at mii? phy ?			# Intel 82555 PHYs
 iophy*	at mii? phy ?			# Intel 82553 PHYs
+#ipgphy* at mii? phy ?			# IC PLUS IP1000A/IP1001 PHYs
+#jmphy*	at mii? phy ?			# Jmicron JMP202/211 PHYs
 lxtphy* at mii? phy ?			# Level One LXT-970 PHYs
 makphy* at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
 nsphy*	at mii? phy ?			# NS83840 PHYs
 nsphyter* at mii? phy ? 		# NS83843 PHYs
 pnaphy* at mii? phy ?			# generic HomePNA PHYs
 qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
-rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
+rgephy* at mii? phy ?			# Realtek 8169S/8110 internal PHYs
 rlphy*	at mii? phy ?			# Realtek 8139/8201L PHYs
+#smscphy* at mii? phy ?			# SMSC LAN87xx PHYs
 sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
 tlphy*	at mii? phy ?			# ThunderLAN PHYs
 tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
 ukphy*	at mii? phy ?			# generic unknown PHYs
 urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs
 
-# I2C HID devices
-ihidev* at iic?
-
-# I2C Mice
-ims*	at ihidev? reportid ?
-wsmouse* at ims? mux 0
-
-# I2O devices
-iop*	at pci? dev ? function ?	# I/O processor
-iopsp*	at iop? tid ?			# SCSI/FC-AL ports
-ld*	at iop? tid ?			# block devices
-# XXX dpti.c wants a processor type that is not assigned for x86-64
-#dpti*	at iop? tid 0			# DPT/Adaptec control interface
-
-# IDE and related devices
-# PCI IDE controllers - see pciide(4) for supported hardware.
-# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
-# how to set up DMA modes for this chip. This may work, or may cause
-# a machine hang with some controllers.
-pciide* 	at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver
-acardide*	at pci? dev ? function ?	# Acard IDE controllers
-aceride*	at pci? dev ? function ?	# Acer Lab IDE controllers
-ahcisata*	at pci? dev ? function ?	# AHCI SATA controllers
-artsata*	at pci? dev ? function ?	# Intel i31244 SATA controller
-cmdide* 	at pci? dev ? function ?	# CMD tech IDE controllers
-cypide* 	at pci? dev ? function ?	# Cypress IDE controllers
-geodeide*	at pci? dev ? function ?	# AMD Geode IDE controllers
-hptide* 	at pci? dev ? function ?	# Triones/HighPoint IDE controllers
-iteide* 	at pci? dev ? function ?	# IT Express IDE controllers
-ixpide* 	at pci? dev ? function ?	# ATI IXP IDE controllers
-jmide*		at pci? dev ? function ?	# JMicron PCI-e PATA/SATA controllers
-ahcisata*	at jmide?
-optiide*	at pci? dev ? function ?	# Opti IDE controllers
-piixide*	at pci? dev ? function ?	# Intel IDE controllers
-pdcide* 	at pci? dev ? function ?	# Promise IDE controllers
-pdcsata*	at pci? dev ? function ?	# Promise SATA150 controllers
-rccide* 	at pci? dev ? function ?	# ServerWorks IDE controllers
-satalink*	at pci? dev ? function ?	# SiI SATALink controllers
-siisata*	at pci? dev ? function ?	# SiI SteelVine controllers
-siside* 	at pci? dev ? function ?	# SiS IDE controllers
-slide*		at pci? dev ? function ?	# Symphony Labs IDE controllers
-svwsata*	at pci? dev ? function ?	# ServerWorks SATA controllers
-stpcide*	at pci? dev ? function ?	# STMicro STPC IDE controllers
-viaide* 	at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers
-
-# ATA (IDE) bus support
-atabus* at ata?
-
-# IDE drives
-# Flags are used only with controllers that support DMA operations
-# and mode settings (e.g. some pciide controllers)
-# The lowest order four bits (rightmost digit) of the flags define the PIO
-# mode to use, the next set of four bits the DMA mode and the third set the
-# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
-# to use, and the last bit must be 1 for this setting to be used.
-# For DMA and UDMA, 0xf (1111) means 'disable'.
-# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
-# (0xc=1100, 0xa=1010, 0xf=1111)
-# 0x0000 means "use whatever the drive claims to support".
-wd*	at atabus? drive ? flags 0x0000
-
-# ATA RAID configuration support, as found on some Promise controllers.
-pseudo-device	ataraid
-ld*	at ataraid? vendtype ? unit ?
-
-# ATAPI bus support
-atapibus* at atapi?
-
-# ATAPI devices
-# flags have the same meaning as for IDE drives.
-cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
-sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
-st*	at atapibus? drive ? flags 0x0000	# ATAPI tape drives
-uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown
-
-# SCSI Controllers and Devices
-
-# PCI SCSI controllers
-adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
-adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
-ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
-ahd*	at pci? dev ? function ?	# Adaptec 29320, 39320 (aic790x) SCSI
-bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
-dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID
-iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
-isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
-mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
-mfii*	at pci? dev ? function ?	# LSI MegaRAID SAS (Fusion and newer)
-mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
-mpt*	at pci? dev ? function ?	# LSILogic 9x9 and 53c1030 (Fusion-MPT)
-mpii*	at pci? dev ? function ?	# LSI Logic Fusion-MPT II
-njs*	at pci? dev ? function ?	# Workbit NinjaSCSI-32
-pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
-siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
-esiop*	at pci? dev ? function ?	# Symbios 53c875 SCSI and newer
-#options 	SIOP_SYMLED		# drive the act. LED in software
-trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
-# SCSI bus support
-scsibus* at scsi?
-
-# SCSI devices
-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
-ses*	at scsibus? target ? lun ?	# SCSI Enclosure Services devices
-ss*	at scsibus? target ? lun ?	# SCSI scanners
-uk*	at scsibus? target ? lun ?	# SCSI unknown
-
-# RAID controllers and devices
-aac*	at pci? dev ? function ?	# Adaptec AAC family
-amr*	at pci? dev ? function ?	# AMI/LSI Logic MegaRAID
-arcmsr* at pci? dev ? function ?	# Areca SATA RAID controllers
-cac*	at pci? dev ? function ?	# Compaq PCI array controllers
-ciss*	at pci? dev ? function ?	# HP Smart Array controllers
-icp*	at pci? dev ? function ?	# ICP-Vortex GDT & Intel RAID
-mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
-twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers
-twa*	at pci? dev ? function ?	# 3ware Escalade 95xx RAID controllers
 
-ld*	at aac? unit ?			# logical disk devices
-ld*	at amr? unit ?
-ld*	at cac? unit ?
-ld*	at icp? unit ?
-ld*	at twe? unit ?
-ld*	at twa? unit ?
-ld*	at mlx? unit ?
+# USB Controller and Devices
 
-icpsp*	at icp? unit ?			# SCSI pass-through
+# Virtual USB controller
+#pseudo-device	vhci
 
-# NVM Express controllers and devices
-nvme*	at pci? dev ? function ?
-ld*	at nvme? nsid ?
+# PCI USB controllers
+xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
+ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
+ohci*	at pci?	dev ? function ?	# Open Host Controller
+uhci*	at pci?	dev ? function ?	# Universal Host Controller (Intel)
+
+# CardBus USB controllers
+#ehci*	at cardbus? function ?	# Enhanced Host Controller
+#ohci*	at cardbus? function ?	# Open Host Controller
+#uhci*	at cardbus? function ?		# Universal Host Controller (Intel)
 
-# wscons
-pckbc0		at isa?			# pc keyboard controller
-pckbd*		at pckbc?		# PC keyboard
-pms*		at pckbc?		# PS/2 mouse for wsmouse
-#options 	PMS_DISABLE_POWERHOOK	# Disable PS/2 reset on resume
-options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
-#vga0		at isa?
-vga*		at pci? dev ? function ?
-#pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
-#machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
-wsdisplay*	at vga? console ?
-#wsdisplay*	at pcdisplay? console ?
-#wsdisplay*	at machfb? console ?
-wskbd*		at pckbd? console ?
-wsmouse*	at pms? mux 0
+# ISA USB controllers
+#slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS
 
-# USB Controller and Devices
-
-# PCI USB controllers
-xhci*	at pci? dev ? function ?	# eXtensible Host Controller
-ehci*	at pci? dev ? function ?	# Enhanced Host Controller
-ohci*	at pci? dev ? function ?	# Open Host Controller
-uhci*	at pci? dev ? function ?	# Universal Host Controller (Intel)
+# PCMCIA USB controllers
+#slhci*	at pcmcia? function ?		# ScanLogic SL811HS
 
 # USB bus support
+#usb*	at vhci?
 usb*	at xhci?
 usb*	at ehci?
 usb*	at ohci?
 usb*	at uhci?
+#usb*	at slhci?
 
+#include "dev/usb/usbdevices.config"
 # USB Hubs
 uhub*	at usb?
 uhub*	at uhub? port ?
@@ -820,13 +1094,10 @@ ucom*	at ukyopon? portno ?
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
 
-# D-Link DSB-R100 USB radio
-udsbr*	at uhub? port ?
-radio*	at udsbr?
-
 # USB Generic driver
 ugen*	at uhub? port ?
 
+
 # PCI IEEE1394 controllers
 fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller
 
@@ -835,14 +1106,16 @@ fwohci* at pci? dev ? function ?	# IEEE1
 
 ieee1394if* at fwohci?
 fwip*	at ieee1394if?			# IP over IEEE1394
-sbp*	at ieee1394if? euihi ? euilo ?	# SCSI over IEEE1394
+sbp*	at ieee1394if? euihi ? euilo ?
+
+# Audio Devices
 
 # PCI audio devices
 auacer* at pci? dev ? function ?	# ALi M5455 integrated AC'97 Audio
-auich*	at pci? dev ? function ?	# Intel ICH integrated AC'97 Audio
+auich*	at pci? dev ? function ?	# Intel/AMD/nVidia AC'97 Audio
 auixp*	at pci? dev ? function ?	# ATI IXP AC'97 Audio
 autri*	at pci? dev ? function ?	# Trident 4DWAVE based AC'97 Audio
-auvia*	at pci? dev ? function ?	# VIA VT82C686A integrated AC'97 Audio
+auvia*	at pci? dev ? function ?	# VIA AC'97 audio
 clcs*	at pci? dev ? function ?	# Cirrus Logic CS4280
 clct*	at pci? dev ? function ?	# Cirrus Logic CS4281
 cmpci*	at pci? dev ? function ?	# C-Media CMI8338/8738
@@ -871,7 +1144,10 @@ hdafg*		at hdaudiobus?
 # Audio support
 audio*	at audiobus?
 
+# The spkr driver provides a simple tone interface to the built in speaker.
+#spkr*	at pcppi?		# PC speaker
 spkr*	at audio?		# PC speaker (synthesized)
+#wsbell* at spkr?		# Bell for wscons display (module by default)
 
 # MPU 401 UARTs
 #mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
@@ -882,6 +1158,34 @@ mpu*	at yds?
 
 # MIDI support
 midi*	at midibus?
+#midi*	at pcppi?		# MIDI interface to the PC speaker
+
+# FM-Radio devices
+# PCI radio devices
+#gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
+
+# Radio support
+#radio*	at gtp?
+
+# D-Link DSB-R100 USB radio
+udsbr*	at uhub? port ?
+radio*	at udsbr?
+
+# Video capture devices
+
+#coram*	at pci? dev ? function ?	# Conexant CX23885 PCI-E TV
+#cxdtv*	at pci? dev ? function ?	# Conexant CX2388[0-3] PCI TV
+
+#video*	at videobus?			# Analog capture interface
+#dtv*	at dtvbus?			# Digital capture interface
+
+
+# TV cards
+
+# Brooktree 848/849/878/879 based TV cards
+#bktr* at pci? dev ? function ?
+#radio* at bktr?
+
 
 # Bluetooth Controller and Device support
 
@@ -889,13 +1193,19 @@ midi*	at midibus?
 #bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A
 #btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139
 
+# Bluetooth SDIO Controllers
+#sbt* at sdmmc?
+
 # Bluetooth USB Controllers
 ubt* at uhub? port ?
 aubtfwl* at uhub? port ?
 
 # Bluetooth Device Hub
+#bthub* at bcsp?
 #bthub* at bt3c?
-#bthub* at btbh?
+#bthub* at btbc?
+#bthub* at btuart?
+#bthub* at sbt?
 bthub* at ubt?
 
 # Bluetooth HID support
@@ -929,24 +1239,19 @@ sdmmc*	at rtsx?	# SD/MMC bus
 ld*	at sdmmc?
 
 
-# Cryptographic Devices
-
-# PCI cryptographic devices
-hifn*	at pci? dev ? function ?	# Hifn 7755/7811/795x
-ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x
+# Middle Digital, Inc. PCI-Weasel serial console board control
+# devices (watchdog timer, etc.)
+#weasel* at pci?
 
+# Pull in optional local configuration
 cinclude "arch/amd64/conf/GENERIC.local"
 cinclude "arch/amd64/conf/XEN3_DOM0.local"
 
-# Pseudo-Devices
 
-#
-# accept filters
-pseudo-device	accf_data	# "dataready" accept filter
-pseudo-device	accf_http	# "httpready" accept filter
+# Pseudo-Devices
 
-pseudo-device	crypto		# /dev/crypto device
-pseudo-device	swcrypto	# software crypto implementation
+pseudo-device	crypto			# /dev/crypto device
+pseudo-device	swcrypto		# software crypto implementation
 
 # disk/mass storage pseudo-devices
 pseudo-device	bio			# RAID control device driver
@@ -965,49 +1270,82 @@ options 	RAID_AUTOCONFIG		# auto-configu
 pseudo-device	fss			# file system snapshot device
 
 pseudo-device	md			# memory disk device (ramdisk)
+#options		MEMORY_DISK_HOOKS	# enable md specific hooks
+#options 	MEMORY_DISK_DYNAMIC	# enable dynamic resizing
+
 pseudo-device	vnd			# disk-like interface to files
+#options 	VND_COMPRESSION		# compressed vnd(4)
+
 pseudo-device	dm			# device-mapper driver for LVM
 
+
 # network pseudo-devices
 pseudo-device	bpfilter		# Berkeley packet filter
+#pseudo-device	carp			# Common Address Redundancy Protocol
 pseudo-device	loop			# network loopback
+#pseudo-device	mpls			# MPLS pseudo-interface
 pseudo-device	ppp			# Point-to-Point Protocol
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
 pseudo-device	sl			# Serial Line IP
-pseudo-device	tap			# virtual Ethernet
+#pseudo-device	irframetty		# IrDA frame line discipline
 pseudo-device	tun			# network tunneling over tty
+pseudo-device	tap			# virtual Ethernet
 pseudo-device	gre			# generic L3 over IP tunnel
 pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	ipsecif			# tunnel interface for routing based ipsec
 #pseudo-device	faith			# IPv[46] tcp relay translation i/f
 pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	vether			# Virtual Ethernet for bridge
+#pseudo-device	agr			# IEEE 802.3ad link aggregation
 pseudo-device	l2tp			# L2TPv3 interface
 pseudo-device	npf			# NPF packet filter
 
+#pseudo-device	canloop			# CAN loopback interface
+
+#
+# accept filters
+pseudo-device	accf_data		# "dataready" accept filter
+pseudo-device	accf_http		# "httpready" accept filter
+
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
+#pseudo-device	sequencer		# MIDI sequencer
+# rnd works; RND_COM does not on port i386 yet.
+#options 	RND_COM			# use "com" randomness as well (BROKEN)
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	ksyms			# /dev/ksyms
-
-# iSCSI initiator
-#pseudo-device	iscsi
+#pseudo-device	lockstat		# lock profiling
+#pseudo-device	bcsp			# BlueCore Serial Protocol
+#pseudo-device	btuart			# Bluetooth HCI UART (H4)
 
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont
+# Give us a choice of fonts based on monitor size
+#options 	FONT_BOLD8x16
+#options 	FONT_BOLD16x32
+
+# pseudo audio device driver
+#pseudo-device	pad
 
 # userland interface to drivers, including autoconf and properties retrieval
 pseudo-device	drvctl
 
-# xen pseudo-devices
-pseudo-device	xenevt
-pseudo-device	xvif
-pseudo-device	xbdback
+#include "dev/veriexec.config"
 
+#options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard
 options 	PAX_MPROTECT=1		# PaX mprotect(2) restrictions
+#options 	PAX_MPROTECT_DEBUG=1	# PaX mprotect debug
 options 	PAX_ASLR=1		# PaX Address Space Layout Randomization
+#options 	PAX_ASLR_DEBUG=1	# PaX ASLR debug
 
-# Atheros HAL options
-include "external/isc/atheros_hal/conf/std.ath_hal"
+
+# iSCSI initiator
+#pseudo-device	iscsi
+
+# xen pseudo-devices
+pseudo-device	xenevt
+pseudo-device	xvif
+pseudo-device	xbdback

Reply via email to