 @@ -1,798 +1,805 @@
-# $NetBSD: XEN3_DOM0,v 1.42 2009/04/20 20:50:37 cegger Exp $
+# $NetBSD: XEN3_DOM0,v 1.43 2009/08/05 20:15:36 jym Exp $
 include 	"arch/amd64/conf/std.xen"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 #options 	UVMHIST
 #options 	UVMHIST_PRINT
 #options 	SYSCALL_DEBUG
 maxusers	32		# estimated number of users
+#
 options 	DOM0OPS
 # boot messages with MPBIOS, acpi and ioapic can be quite large
 options 	MSGBUFSIZE=24576
 #options 	VM86		# virtual 8086 emulation
 #options 	USER_LDT	# user-settable LDT; used by WINE
 # Enhanced SpeedStep Technology in the Pentium M
 options		ENHANCED_SPEEDSTEP
 #options	EST_FREQ_USERWRITE	# any user can set frequency
 # AMD PowerNow! and Cool`n'Quiet technology
 options		POWERNOW_K8
 #options 	MTRR		# memory-type range register syscall support
 #options 	CONSDEVNAME="\"xencons\""
 #options 	CONS_OVERRIDE
 options 	INSECURE	# disable kernel security levels - X needs this
 options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 options 	NTP		# NTP phase/frequency locked loop
 options 	KTRACE		# system call tracing via ktrace(1)
 options 	SYSVMSG		# System V-like message queues
 options 	SYSVSEM		# System V-like semaphores
 options 	SYSVSHM		# System V-like memory sharing
 options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
 options 	USERCONF	# userconf(4) support
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 # Diagnostic/debugging support options
 options 	DIAGNOSTIC	# expensive kernel consistency checks
 options 	DEBUG		# expensive debugging checks/support
 options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600
 makeoptions 	DEBUG="-g"	# compile full symbol table
 makeoptions 	COPTS="-O2 -fno-omit-frame-pointer"
 options DDB_COMMANDONENTER="trace;show registers"
 # Compatibility options
 options 	COMPAT_15	# compatibility with NetBSD 1.5,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
 options 	COMPAT_30	# NetBSD 3.0,
 options 	COMPAT_40	# NetBSD 4.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 options		COMPAT_50	# NetBSD 5.0
 options 	COMPAT_OSSAUDIO
 options 	COMPAT_NETBSD32
 options 	COMPAT_LINUX
 options 	COMPAT_LINUX32	# req. COMPAT_LINUX and COMPAT_NETBSD32
 options 	EXEC_ELF32
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 # File systems
 file-system 	FFS		# UFS
 file-system 	EXT2FS		# second extended file system (linux)
 file-system 	LFS		# log-structured file system
 file-system 	MFS		# memory file system
 file-system 	NFS		# Network File System client
 file-system 	NTFS		# Windows/NT file system (experimental)
 file-system 	CD9660		# ISO 9660 + Rock Ridge file system
 file-system 	MSDOSFS		# MS-DOS file system
 file-system 	FDESC		# /dev/fd
 file-system 	KERNFS		# /kern
 file-system 	NULLFS		# loopback file system
 file-system 	OVERLAY		# overlay file system
 file-system 	PORTAL		# portal filesystem (still experimental)
 file-system 	PROCFS		# /proc
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 file-system 	CODA		# Coda File System; also needs vcoda (below)
 file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system 	PTYFS		# /dev/pts/N support
 file-system 	TMPFS		# Efficient memory file-system
 # File system options
 options 	QUOTA		# UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
 options		WAPBL		# File system journaling support - Experimental
 #options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
 options 	NFSSERVER	# Network File System server
 #options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 #options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
 				# immutable) behave as system flags.
 # Networking options
 #options 	GATEWAY		# packet forwarding
 options 	INET		# IP + ICMP + TCP + UDP
 options 	INET6		# IPV6
 #options 	IPSEC		# IP security
 #options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
 #options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
 #options 	IPSEC_DEBUG	# debug for IP security
 #options 	MROUTING	# IP multicast routing
 #options 	PIM		# Protocol Independent Multicast
 #options 	ISO,TPIP	# OSI
 #options 	EON		# OSI tunneling over IP
 options 	NETATALK	# AppleTalk networking protocols
 options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
 options 	PPP_DEFLATE	# Deflate compression support for PPP
 options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
 options 	PFIL_HOOKS	# pfil(9) packet filter hooks
 options 	IPFILTER_LOG	# ipmon(8) log support
 options 	IPFILTER_LOOKUP	# ippool(8) support
 #options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
 #options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
 #options 	ALTQ		# Manipulate network interfaces' output queues
 #options 	ALTQ_BLUE	# Stochastic Fair Blue
 #options 	ALTQ_CBQ	# Class-Based Queueing
 #options 	ALTQ_CDNR	# Diffserv Traffic Conditioner
 #options 	ALTQ_FIFOQ	# First-In First-Out Queue
 #options 	ALTQ_FLOWVALVE	# RED/flow-valve (red-penalty-box)
 #options 	ALTQ_HFSC	# Hierarchical Fair Service Curve
 #options 	ALTQ_LOCALQ	# Local queueing discipline
 #options 	ALTQ_PRIQ	# Priority Queueing
 #options 	ALTQ_RED	# Random Early Detection
 #options 	ALTQ_RIO	# RED with IN/OUT
 #options 	ALTQ_WFQ	# Weighted Fair Queueing
 options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
 #options 	NFS_BOOT_BOOTSTATIC
 #options 	NFS_BOOTSTATIC_MYIP="\"169.254.1.2\""
 #options 	NFS_BOOTSTATIC_GWIP="\"169.254.1.1\""
 #options 	NFS_BOOTSTATIC_MASK="\"255.255.255.0\""
 #options 	NFS_BOOTSTATIC_SERVADDR="\"169.254.1.1\""
 #options 	NFS_BOOTSTATIC_SERVER="\"server:/path/to/root\""
+#
 # wscons options
+#
 # builtin terminal emulations
 #options 	WSEMUL_SUN		# sun terminal emulation
 options 	WSEMUL_VT100		# VT100 / VT220 emulation
 # different kernel output - see dev/wscons/wsdisplayvar.h
 options 	WS_KERNEL_FG=WSCOL_GREEN
 #options 	WS_KERNEL_BG=WSCOL_BLACK
 # compatibility to other console drivers
 options 	WSDISPLAY_COMPAT_PCVT		# emulate some ioctls
 options 	WSDISPLAY_COMPAT_SYSCONS	# emulate some ioctls
 options 	WSDISPLAY_COMPAT_USL		# VT handling
 options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
 # see dev/pckbport/wskbdmap_mfii.c for implemented layouts
 #options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
 # allocate a number of virtual screens at autoconfiguration time
 #options 	WSDISPLAY_DEFAULTSCREENS=4
 # use a large software cursor that doesn't blink
 options 	PCDISPLAY_SOFTCURSOR
 # modify the screen type of the console; defaults to "80x25"
 #options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""
 # work around a hardware bug that loaded fonts don't work; found on ATI cards
 #options 	VGA_CONSOLE_ATI_BROKEN_FONTSEL
 # console scrolling support.
 options 	WSDISPLAY_SCROLLSUPPORT
 # enable VGA raster mode capable of displaying multilingual text on console
 #options 	VGA_RASTERCONSOLE
 config		netbsd	root on ? type ?
 #config		netbsd	root on wd0a type ffs
 #config		netbsd	root on xennet0 type nfs
 mainbus0 at root
 cpu* at mainbus?
 # IPMI support
 ipmi0		at mainbus?
 hypervisor*	at mainbus?		# Xen hypervisor
 vcpu*		at hypervisor?		# Xen virtual CPUs
 xenbus*		at hypervisor?		# Xen virtual bus
 xencons*	at hypervisor?		# Xen virtual console
 acpi0 		at hypervisor?
 #options 	ACPI_ACTIVATE_DEV	# If set, activate inactive devices
 options 	ACPI_SCANPCI		# find PCI roots using ACPI
 #options 	ACPICA_PEDANTIC		# force strict conformance to the Spec.
 options 	ACPIVERBOSE		# verbose ACPI configuration messages
 #options	MIIVERBOSE		# verbose PHY autoconfig messages
 options 	MPBIOS			# configure CPUs and APICs using MPBIOS
 options 	MPDEBUG			# MPBIOS configures PCI roots
 options 	MPVERBOSE		# verbose MPBIOS autoconfig messages
 options 	MPBIOS_SCANPCI		# MPBIOS configures PCI roots
 #options 	PCI_ADDR_FIXUP		# fixup PCI I/O addresses
 #options 	PCI_BUS_FIXUP		# fixup PCI bus numbering
 #options 	PCI_INTR_FIXUP		# fixup PCI interrupt routing
 #options	PCIVERBOSE		# verbose PCI device autoconfig messages
 #options	USBVERBOSE		# verbose USB device autoconfig messages
 ioapic*		at mainbus? apid ?
 # ACPI devices
 acpiacad* 	at acpi?		# ACPI AC Adapter
 acpibat* 	at acpi?		# ACPI Battery
 acpibut* 	at acpi?		# ACPI Button
 acpidalb*	at acpi?		# ACPI Direct Application Launch Button
 acpiec* 	at acpi?		# ACPI Embedded Controller
 acpilid* 	at acpi?		# ACPI Lid Switch
 acpitz*		at acpi?		# ACPI Thermal Zone
 aiboost*	at acpi?		# ASUS AI Booster Hardware monitor
 hpqlb*		at acpi?		# HP Quick Launch Buttons
 pckbc*		at acpi?		# PC keyboard controller
 pcppi*		at acpi?		# AT-style speaker sound
 # 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 bridges
 ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
 					# watchdog and SpeedStep support
 pcib*	at pci? dev ? function ?	# PCI-ISA bridges
 pchb*	at pci? dev ? function ?	# PCI-Host bridges
 ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 # 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
 agp* 	at pchb?
 # ISA bus support
 isa0	at ichlpcib?
 isa0	at pcib?
 isa0	at hypervisor?
 # Serial Devices
 # PCI serial interfaces
 com*	at puc? port ?			# 16x50s on "universal" comm boards
 cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
 cz*	at pci? dev ? function ?	# Cyclades-Z multi-port serial boards
 # 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
 # and there's no easy way to detect this yet. Leave com0 out as it's the
 # port usually used for serial console
 #com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
 com1	at isa? port 0x2f8 irq 3
 #com2	at isa? port 0x3e8 irq 5
 #com3	at isa? port 0x2e8 irq 9
 # Parallel Printer Interfaces
 # PCI parallel printer interfaces
 lpt*	at puc? port ?			# || ports on "universal" comm boards
 # ISA parallel printer interfaces
 lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
 # Hardware monitors
 amdtemp* at pci? dev ? function ?	# AMD CPU Temperature sensors
 # 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
 # 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
 # LM7[89] and compatible hardware monitors
 #lm0	at isa?	port 0x290		# other common: 0x280, 0x310, 0xc00
 # VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer
 #viaenv*	at pci? dev ? function ?
 # PCI network interfaces
 age*	at pci? dev ? function ?	# Attansic/Atheros L1 Gigabit Ethernet
 an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
 ale*	at pci? dev ? function ?	# Attansic/Atheros L1E Ethernet
 ath*	at pci? dev ? function ?	# Atheros 5210/5211/5212 802.11
 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
 dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
 en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card
 ex*	at pci? dev ? function ?	# 3Com 90x[BC]
 fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
 gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
 hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
 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
 jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
 le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
 lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
 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
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
 ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
 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
 rtk*	at pci? dev ? function ?	# Realtek 8129/8139
 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
 sk*	at skc?				# SysKonnect SK9821 Gigabit Ethernet
 ste*	at pci? dev ? function ?	# Sundance ST-201 Ethernet
 stge*	at pci? dev ? function ?	# Sundance/Tamarack TC9021 Gigabit
 ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
 tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
 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
 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
 xge*	at pci? dev ? function ?	# Neterion (S2io) Xframe-I 10GbE
 # MII/PHY support
 acphy*	at mii? phy ?			# Altima AC101 and AMD Am79c874 PHYs
 amhphy* at mii? phy ?			# AMD 79c901 Ethernet 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
 dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
 exphy*	at mii? phy ?			# 3Com internal PHYs
 gentbi* at mii? phy ?			# Generic Ten-Bit 1000BASE-[CLS]X PHYs
 glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
 gphyter* at mii? phy ?			# NS83861 Gig-E PHY
 icsphy* at mii? phy ?			# Integrated Circuit Systems ICS189x
 igphy*	at mii? phy ?			# Intel IGP01E1000
 ikphy*	at mii? phy ?			# Intel 82563 PHYs
 inphy*	at mii? phy ?			# Intel 82555 PHYs
 iophy*	at mii? phy ?			# Intel 82553 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
 rlphy*	at mii? phy ?			# Realtek 8139/8201L 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
 # 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
 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
 mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
 mpt*	at pci? dev ? function ?	# LSI Fusion SCSI/FC
 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 ?
 icpsp*	at icp? unit ?			# SCSI pass-through
 # 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
 #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
 # USB Controller and Devices
 # PCI USB controllers
 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)
 # USB bus support
 usb*    at ehci?
 usb*    at ohci?
 usb*    at uhci?
 # USB Hubs
 uhub*   at usb?
 uhub*   at uhub? port ?
 # USB HID device
 uhidev* at uhub? port ? configuration ? interface ?
 # USB Mice
 ums*    at uhidev? reportid ?
 wsmouse* at ums? mux 0
 # USB eGalax touch-panel
 uep*    at uhub? port ?
 wsmouse* at uep? mux 0
 # USB Keyboards
 ukbd*   at uhidev? reportid ?
 wskbd*  at ukbd? console ? mux 1
 # USB serial adapter
 ucycom*	at uhidev? reportid ?
 # USB Generic HID devices
 uhid*   at uhidev? reportid ?
 # USB Printer
 ulpt*   at uhub? port ? configuration ? interface ?
 # USB Modem
 umodem* at uhub? port ? configuration ?
 ucom*   at umodem?
 # USB Mass Storage
 umass*  at uhub? port ? configuration ? interface ?
 wd*     at umass?
 # USB audio
 uaudio* at uhub? port ? configuration ?
 # USB MIDI
 umidi* at uhub? port ? configuration ?
 # USB IrDA
 # USB-IrDA bridge spec
 uirda* at uhub? port ? configuration ? interface ?
 irframe* at uirda?
 # SigmaTel STIr4200 USB/IrDA Bridge
 ustir* at uhub? port ?
 irframe* at ustir?
 # USB Ethernet adapters
 aue*    at uhub? port ?         # ADMtek AN986 Pegasus based adapters
 axe*    at uhub? port ?         # ASIX AX88172 based adapters
 cdce*   at uhub? port ?         # CDC, Ethernet Networking Control Model
 cue*    at uhub? port ?         # CATC USB-EL1201A based adapters
 kue*    at uhub? port ?         # Kawasaki LSI KL5KUSB101B based adapters
 udav*   at uhub? port ?         # Davicom DM9601 based adapters
 url*    at uhub? port ?         # Realtek RTL8150L based adapters
 # USB 802.11 adapters
 atu*    at uhub? port ?         # Atmel AT76C50XX based adapters
 ral*	at uhub? port ?		# Ralink Technology RT25x0 802.11a/b/g
 rum*	at uhub? port ?		# Ralink Technology RT2501/RT2601 802.11a/b/g
 # Prolific PL2301/PL2302 host-to-host adapter
 upl*    at uhub? port ?
 # Serial adapters
 ubsa*   at uhub? port ?         # Belkin serial adapter
 ucom*   at ubsa? portno ?
 uftdi*  at uhub? port ?         # FTDI FT8U100AX serial adapter
 ucom*   at uftdi? portno ?
 umct*   at uhub? port ?         # MCT USB-RS232 serial adapter
 ucom*   at umct? portno ?
 uplcom* at uhub? port ?         # I/O DATA USB-RSAQ2 serial adapter
 ucom*   at uplcom? portno ?
 uvscom* at uhub? port ?         # SUNTAC Slipper U VS-10U serial adapter
 ucom*   at uvscom? portno ?
 # Diamond Multimedia Rio 500
 urio*   at uhub? port ?
 # USB Handspring Visor
 uvisor* at uhub? port ?
 ucom*   at uvisor?
 # Kyocera AIR-EDGE PHONE
 ukyopon* at uhub? port ?
 ucom*	at ukyopon? portno ?
 # USB scanners
 uscanner* at uhub? port ?
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
 # Y@P firmware loader
 uyap* 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
 # CardBus IEEE1394 controllers
 #fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
 ieee1394if* at fwohci?
 fwip*	at ieee1394if?			# IP over IEEE1394
 sbp*	at ieee1394if? euihi ? euilo ?	# SCSI over IEEE1394
 # 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
 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
 azalia* at pci? dev ? function ?	# High Definition 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
 eap*	at pci? dev ? function ?	# Ensoniq AudioPCI
 emuxki* at pci? dev ? function ?	# Creative SBLive! and PCI512
 esa*	at pci? dev ? function ?	# ESS Allegro-1 / Maestro-3 PCI Audio
 esm*	at pci? dev ? function ?	# ESS Maestro-1/2/2e PCI Audio Accelerator
 eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
 fms*	at pci? dev ? function ?	# Forte Media FM801
 neo*	at pci? dev ? function ?	# NeoMagic 256 AC'97 Audio
 sv*	at pci? dev ? function ?	# S3 SonicVibes
 yds*	at pci? dev ? function ?	# Yamaha DS-1 PCI Audio
 # OPL[23] FM synthesizers
 #opl0	at isa? port 0x388	# use only if not attached to sound card
 opl*	at cmpci? flags 1
 opl*	at eso?
 opl*	at fms?
 opl*	at sv?
 opl*	at yds?
 # Audio support
 audio*	at audiobus?
 # MPU 401 UARTs
 #mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
 mpu*	at cmpci?
 mpu*	at eso?
 mpu*	at fms?
 mpu*	at yds?
 # MIDI support
 midi*	at midibus?
 # Bluetooth Controller and Device support
 # Bluetooth PCMCIA Controllers
 #bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A
 #btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139
 # Bluetooth USB Controllers
 ubt* at uhub? port ?
 # Bluetooth Device Hub
 #bthub* at bt3c?
 #bthub* at btbh?
 bthub* at ubt?
 # Bluetooth HID support
 bthidev* at bthub?
 # Bluetooth Mouse
 btms* at bthidev? reportid ?
 wsmouse* at btms? mux 0
 # Bluetooth Keyboard
 btkbd* at bthidev? reportid ?
 wskbd* at btkbd? console ? mux 1
 # Bluetooth Audio support
 btsco* at bthub?
 # Cryptographic Devices
 # PCI cryptographic devices
 hifn*	at pci? dev ? function ?	# Hifn 7755/7811/795x
 ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x
 cinclude "arch/amd64/conf/GENERIC.local"
 # Pseudo-Devices
+#
 # accept filters
 pseudo-device	accf_data	# "dataready" accept filter
 pseudo-device	accf_http	# "httpready" accept filter
 pseudo-device 	crypto		# /dev/crypto device
 pseudo-device	swcrypto	# software crypto implementation
 # disk/mass storage pseudo-devices
 pseudo-device	bio			# RAID control device driver
 pseudo-device	ccd		4	# concatenated/striped disk devices
 pseudo-device	cgd		4	# cryptographic disk devices
 pseudo-device	raid		8	# RAIDframe disk driver
 options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
 # Options to enable various other RAIDframe RAID types.
 #options 	RF_INCLUDE_EVENODD=1
 #options 	RF_INCLUDE_RAID5_RS=1
 #options 	RF_INCLUDE_PARITYLOGGING=1
 #options 	RF_INCLUDE_CHAINDECLUSTER=1
 #options 	RF_INCLUDE_INTERDECLUSTER=1
 #options 	RF_INCLUDE_PARITY_DECLUSTERING=1
 #options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
 pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
 pseudo-device	vnd			# disk-like interface to files
 # network pseudo-devices
 pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
 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	tun			# network tunneling over tty
 pseudo-device	gre			# generic L3 over IP tunnel
 pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
 #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
 #options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
 #pseudo-device	pf			# PF packet filter
 #pseudo-device	pflog			# PF log if
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
 pseudo-device	rnd			# /dev/random and in-kernel generator
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda		4	# coda minicache <-> venus comm.
 # a pseudo device needed for SMBFS
 pseudo-device	nsmb			# experimental - SMB requester
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont
 # userland interface to drivers, including autoconf and properties retrieval
 pseudo-device   drvctl
 # xen pseudo-devices
 pseudo-device	xenevt
 pseudo-device	xvif
 pseudo-device	xbdback

 @@ -1,821 +1,831 @@
-#	$NetBSD: XEN3_DOM0,v 1.18 2009/07/29 13:37:57 cegger Exp $
+#	$NetBSD: XEN3_DOM0,v 1.19 2009/08/05 20:15:36 jym Exp $
+#
 #	XEN3_0: Xen 3.0 domain0 kernel
 include 	"arch/xen/conf/std.xen"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 #options 	UVMHIST
 #options 	UVMHIST_PRINT
 #options 	SYSCALL_DEBUG
 maxusers	32		# estimated number of users
+#
 options 	XEN
 #options         __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface
 # boot messages with MPBIOS, acpi and ioapic can be quite large
 options 	MSGBUFSIZE=24576
 options 	DOM0OPS
 # making MCLBYTES = PAGE_SIZE avoids a copy when a mbuf cluster is sent
 # to a domU, at the expense of a higher memory usage by the network stack.
 #options 	MCLSHIFT=12
 makeoptions 	CPUFLAGS="-march=i686"
 #options 	VM86		# virtual 8086 emulation
 #options 	USER_LDT	# user-settable LDT; used by WINE
 # Enhanced SpeedStep Technology in the Pentium M
 options		ENHANCED_SPEEDSTEP
 #options	EST_FREQ_USERWRITE	# any user can set frequency
 # AMD PowerNow! K7
 options		POWERNOW_K7
 # AMD PowerNow! and Cool`n'Quiet technology
 options		POWERNOW_K8
 #options 	MTRR		# memory-type range register syscall support
 #options 	CONSDEVNAME="\"xencons\""
 #options 	CONS_OVERRIDE
 options 	INSECURE	# disable kernel security levels - X needs this
 options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 options 	NTP		# NTP phase/frequency locked loop
 options 	KTRACE		# system call tracing via ktrace(1)
 options 	SYSVMSG		# System V-like message queues
 options 	SYSVSEM		# System V-like semaphores
 #options 	SEMMNI=10	# number of semaphore identifiers
 #options 	SEMMNS=60	# number of semaphores in system
 #options 	SEMUME=10	# max number of undo entries per process
 #options 	SEMMNU=30	# number of undo structures in system
 options 	SYSVSHM		# System V-like memory sharing
 #options 	SHMMAXPGS=2048	# 2048 pages is the default
 options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
 options 	USERCONF	# userconf(4) support
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 # Diagnostic/debugging support options
 options 	DIAGNOSTIC	# expensive kernel consistency checks
 options 	DEBUG		# expensive debugging checks/support
 options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600
 #makeoptions 	DEBUG="-g"	# compile full symbol table
 # Compatibility options
 options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
 options 	COMPAT_09	# NetBSD 0.9
 options 	COMPAT_10	# NetBSD 1.0
 options 	COMPAT_11	# NetBSD 1.1
 options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
 options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
 options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_40	# NetBSD 4.0
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options		COMPAT_50	# NetBSD 5.0
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
 options 	COMPAT_SVR4	# binary compatibility with SVR4
 options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 options 	COMPAT_LINUX	# binary compatibility with Linux
 options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
 #options 	COMPAT_MACH	# binary compatibility with Mach binaries
 #options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
 #options 	EXEC_MACHO	# exec MACH-O binaries
 #options 	COMPAT_PECOFF	# kernel support to run Win32 apps
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 # File systems
 file-system 	FFS		# UFS
 file-system 	EXT2FS		# second extended file system (linux)
 file-system 	LFS		# log-structured file system
 file-system 	MFS		# memory file system
 file-system 	NFS		# Network File System client
 file-system 	NTFS		# Windows/NT file system (experimental)
 file-system 	CD9660		# ISO 9660 + Rock Ridge file system
 file-system 	MSDOSFS		# MS-DOS file system
 file-system 	FDESC		# /dev/fd
 file-system 	KERNFS		# /kern
 file-system 	NULLFS		# loopback file system
 file-system 	OVERLAY		# overlay file system
 file-system 	PORTAL		# portal filesystem (still experimental)
 file-system 	PROCFS		# /proc
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 file-system 	CODA		# Coda File System; also needs vcoda (below)
 file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system 	PTYFS		# /dev/pts/N support
 file-system 	TMPFS		# Efficient memory file-system
 # File system options
 options 	QUOTA		# UFS quotas
 #options 	FFS_EI		# FFS Endian Independent support
 options		WAPBL		# File system journaling support - Experimental
 #options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
 options 	NFSSERVER	# Network File System server
 #options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 #options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
 				# immutable) behave as system flags.
 # Networking options
 #options 	GATEWAY		# packet forwarding
 options 	INET		# IP + ICMP + TCP + UDP
 options 	INET6		# IPV6
 #options 	IPSEC		# IP security
 #options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
 #options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
 #options 	IPSEC_DEBUG	# debug for IP security
 #options 	MROUTING	# IP multicast routing
 #options 	PIM		# Protocol Independent Multicast
 #options 	ISO,TPIP	# OSI
 #options 	EON		# OSI tunneling over IP
 options 	NETATALK	# AppleTalk networking protocols
 options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
 options 	PPP_DEFLATE	# Deflate compression support for PPP
 options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
 options 	PFIL_HOOKS	# pfil(9) packet filter hooks
 options 	IPFILTER_LOG	# ipmon(8) log support
 options 	IPFILTER_LOOKUP	# ippool(8) support
 #options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
 #options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
 #options 	ALTQ		# Manipulate network interfaces' output queues
 #options 	ALTQ_BLUE	# Stochastic Fair Blue
 #options 	ALTQ_CBQ	# Class-Based Queueing
 #options 	ALTQ_CDNR	# Diffserv Traffic Conditioner
 #options 	ALTQ_FIFOQ	# First-In First-Out Queue
 #options 	ALTQ_FLOWVALVE	# RED/flow-valve (red-penalty-box)
 #options 	ALTQ_HFSC	# Hierarchical Fair Service Curve
 #options 	ALTQ_LOCALQ	# Local queueing discipline
 #options 	ALTQ_PRIQ	# Priority Queueing
 #options 	ALTQ_RED	# Random Early Detection
 #options 	ALTQ_RIO	# RED with IN/OUT
 #options 	ALTQ_WFQ	# Weighted Fair Queueing
 # These options enable verbose messages for several subsystems.
 # Warning, these may compile large string tables into the kernel!
 options 	MIIVERBOSE	# verbose PHY autoconfig messages
 options 	PCIVERBOSE	# verbose PCI device autoconfig messages
 #options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
 options 	SCSIVERBOSE	# human readable SCSI error messages
 options 	USBVERBOSE	# verbose USB device autoconfig messages
 options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
 #options 	NFS_BOOT_BOOTSTATIC
 #options 	NFS_BOOTSTATIC_MYIP="\"169.254.1.2\""
 #options 	NFS_BOOTSTATIC_GWIP="\"169.254.1.1\""
 #options 	NFS_BOOTSTATIC_MASK="\"255.255.255.0\""
 #options 	NFS_BOOTSTATIC_SERVADDR="\"169.254.1.1\""
 #options 	NFS_BOOTSTATIC_SERVER="\"server:/path/to/root\""
 options 	WSEMUL_VT100		# VT100 / VT220 emulation
 options 	WS_KERNEL_FG=WSCOL_GREEN
 options 	WSDISPLAY_COMPAT_PCVT		# emulate some ioctls
 options 	WSDISPLAY_COMPAT_SYSCONS	# emulate some ioctls
 options 	WSDISPLAY_COMPAT_USL		# VT handling
 options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
 options 	WSDISPLAY_DEFAULTSCREENS=4
 options 	WSDISPLAY_SCROLLSUPPORT
 options 	PCDISPLAY_SOFTCURSOR
 config		netbsd	root on ? type ?
 #config		netbsd	root on wd0a type ffs
 #config		netbsd	root on xennet0 type nfs
 mainbus0 at root
 cpu* at mainbus?
 # IPMI support
 ipmi0		at mainbus?
 hypervisor*	at mainbus?		# Xen hypervisor
 vcpu*		at hypervisor?		# Xen virtual CPUs
 xenbus*		at hypervisor?		# Xen virtual bus
 npx0		at hypervisor?		# x86 math coprocessor
 xencons*	at hypervisor?		# Xen virtual console
 #xennet* 	at hypervisor?		# Xen virtual network interface
 #xbd*		at hypervisor?		# Xen virtual block device
 #wd*		at hypervisor?		# Xen vbd (wd identity)
 #sd*		at hypervisor?		# Xen vbd (sd identity)
 #cd*		at hypervisor?		# Xen vbd (cd identity)
 # PCI bus support
 pci*		at hypervisor? bus ?
 pci*		at pchb? bus ?
 # PCI bridges
 ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
 					# watchdog and SpeedStep support
 pcib*	at pci? dev ? function ?	# PCI-ISA bridges
 pchb*	at pci? dev ? function ?	# PCI-Host bridges
 ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 # 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
 agp* 	at pchb?
 # ISA bus support
 isa0	at ichlpcib?
 isa0	at pcib?
 isa0	at hypervisor?
 # Serial Devices
 # PCI serial interfaces
 com*	at puc? port ?			# 16x50s on "universal" comm boards
 cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
 cz*	at pci? dev ? function ?	# Cyclades-Z multi-port serial boards
 # 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
 # and there's no easy way to detect this yet. Leave com0 out as it's the
 # port usually used for serial console
 #com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
 com1	at isa? port 0x2f8 irq 3
 #com2	at isa? port 0x3e8 irq 5
 #com3	at isa? port 0x2e8 irq 9
 # Parallel Printer Interfaces
 # PCI parallel printer interfaces
 lpt*	at puc? port ?			# || ports on "universal" comm boards
 # ISA parallel printer interfaces
 lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
 # Hardware monitors
 amdtemp* at pci? dev ? function ?	# AMD CPU Temperature sensors
 # AMD 768 and 8111 power/ACPI controllers
 amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
 # dbCool thermal monitor and fan controller
 #iic*	at amdpm?			# sensors below are on this bus
 #dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
 #dbcool* at iic? addr 0x2D		# Tyan S2881
 #dbcool* at iic? addr 0x2E		# Tyan S2882-D
 # LM7[89] and compatible hardware monitors
 #lm0	at isa?	port 0x290		# other common: 0x280, 0x310, 0xc00
 # VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer
 #viaenv*	at pci? dev ? function ?
 # PCI network interfaces
 age*	at pci? dev ? function ?	# Attansic/Atheros L1 Gigabit Ethernet
 an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
 ale*	at pci? dev ? function ?	# Attansic/Atheros L1E Ethernet
 ath*	at pci? dev ? function ?	# Atheros 5210/5211/5212 802.11
 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
 dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
 en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
 esh*	at pci? dev ? function ?	# Essential HIPPI card
 ex*	at pci? dev ? function ?	# 3Com 90x[BC]
 fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI
 fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
 gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
 hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
 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
 jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
 le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
 lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
 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
 ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
 nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
 ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
 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
 rtk*	at pci? dev ? function ?	# Realtek 8129/8139
 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
 sk*	at skc?				# SysKonnect SK9821 Gigabit Ethernet
 ste*	at pci? dev ? function ?	# Sundance ST-201 Ethernet
 stge*	at pci? dev ? function ?	# Sundance/Tamarack TC9021 Gigabit
 ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
 tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
 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
 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
 xge*	at pci? dev ? function ?	# Neterion (S2io) Xframe-I 10GbE
 # MII/PHY support
 acphy*	at mii? phy ?			# Altima AC101 and AMD Am79c874 PHYs
 amhphy* at mii? phy ?			# AMD 79c901 Ethernet 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
 dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
 exphy*	at mii? phy ?			# 3Com internal PHYs
 gentbi* at mii? phy ?			# Generic Ten-Bit 1000BASE-[CLS]X PHYs
 glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
 gphyter* at mii? phy ?			# NS83861 Gig-E PHY
 icsphy* at mii? phy ?			# Integrated Circuit Systems ICS189x
 igphy*	at mii? phy ?			# Intel IGP01E1000
 ikphy*	at mii? phy ?			# Intel 82563 PHYs
 inphy*	at mii? phy ?			# Intel 82555 PHYs
 iophy*	at mii? phy ?			# Intel 82553 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
 rlphy*	at mii? phy ?			# Realtek 8139/8201L 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
 # I2O devices
 iop*	at pci? dev ? function ?	# I/O processor
 iopsp*	at iop? tid ?			# SCSI/FC-AL ports
 ld*	at iop? tid ?			# block devices
 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
 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
 mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
 mpt*	at pci? dev ? function ?	# LSI Fusion SCSI/FC
 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 ?
 icpsp*	at icp? unit ?			# SCSI pass-through
 # 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
 #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
 # USB Controller and Devices
 # PCI USB controllers
 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)
 # USB bus support
 usb*    at ehci?
 usb*    at ohci?
 usb*    at uhci?
 # USB Hubs
 uhub*   at usb?
 uhub*   at uhub? port ?
 # USB HID device
 uhidev* at uhub? port ? configuration ? interface ?
 # USB Mice
 ums*    at uhidev? reportid ?
 wsmouse* at ums? mux 0
 # USB eGalax touch-panel
 uep*    at uhub? port ?
 wsmouse* at uep? mux 0
 # USB Keyboards
 ukbd*   at uhidev? reportid ?
 wskbd*  at ukbd? console ? mux 1
 # USB serial adapter
 ucycom*	at uhidev? reportid ?
 # USB Generic HID devices
 uhid*   at uhidev? reportid ?
 # USB Printer
 ulpt*   at uhub? port ? configuration ? interface ?
 # USB Modem
 umodem* at uhub? port ? configuration ?
 ucom*   at umodem?
 # Huawei E220 3G/HSDPA modem
 uhmodem* at uhub? port ? configuration ? interface ?
 ucom*	at uhmodem? portno ?
 # USB Mass Storage
 umass*  at uhub? port ? configuration ? interface ?
 wd*     at umass?
 # USB audio
 uaudio* at uhub? port ? configuration ?
 # USB MIDI
 umidi* at uhub? port ? configuration ?
 # USB IrDA
 # USB-IrDA bridge spec
 uirda* at uhub? port ? configuration ? interface ?
 irframe* at uirda?
 # SigmaTel STIr4200 USB/IrDA Bridge
 ustir* at uhub? port ?
 irframe* at ustir?
 # USB Ethernet adapters
 aue*    at uhub? port ?         # ADMtek AN986 Pegasus based adapters
 axe*    at uhub? port ?         # ASIX AX88172 based adapters
 cdce*   at uhub? port ?         # CDC, Ethernet Networking Control Model
 cue*    at uhub? port ?         # CATC USB-EL1201A based adapters
 kue*    at uhub? port ?         # Kawasaki LSI KL5KUSB101B based adapters
 udav*   at uhub? port ?         # Davicom DM9601 based adapters
 url*    at uhub? port ?         # Realtek RTL8150L based adapters
 # USB 802.11 adapters
 atu*    at uhub? port ?         # Atmel AT76C50XX based adapters
 ral*	at uhub? port ?		# Ralink Technology RT25x0 802.11a/b/g
 rum*	at uhub? port ?		# Ralink Technology RT2501/RT2601 802.11a/b/g
 # Prolific PL2301/PL2302 host-to-host adapter
 upl*    at uhub? port ?
 # Serial adapters
 ubsa*   at uhub? port ?         # Belkin serial adapter
 ucom*   at ubsa? portno ?
 uftdi*  at uhub? port ?         # FTDI FT8U100AX serial adapter
 ucom*   at uftdi? portno ?
 umct*   at uhub? port ?         # MCT USB-RS232 serial adapter
 ucom*   at umct? portno ?
 uplcom* at uhub? port ?         # I/O DATA USB-RSAQ2 serial adapter
 ucom*   at uplcom? portno ?
 uvscom* at uhub? port ?         # SUNTAC Slipper U VS-10U serial adapter
 ucom*   at uvscom? portno ?
 # Diamond Multimedia Rio 500
 urio*   at uhub? port ?
 # USB Handspring Visor
 uvisor* at uhub? port ?
 ucom*   at uvisor?
 # Kyocera AIR-EDGE PHONE
 ukyopon* at uhub? port ?
 ucom*	at ukyopon? portno ?
 # USB scanners
 uscanner* at uhub? port ?
 # USB scanners that use SCSI emulation, e.g., HP5300
 usscanner* at uhub? port ?
 # Y@P firmware loader
 uyap* 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
 # CardBus IEEE1394 controllers
 #fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
 ieee1394if* at fwohci?
 fwip*	at ieee1394if?			# IP over IEEE1394
 sbp*	at ieee1394if? euihi ? euilo ?	# SCSI over IEEE1394
 # 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
 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
 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
 eap*	at pci? dev ? function ?	# Ensoniq AudioPCI
 emuxki* at pci? dev ? function ?	# Creative SBLive! and PCI512
 esa*	at pci? dev ? function ?	# ESS Allegro-1 / Maestro-3 PCI Audio
 esm*	at pci? dev ? function ?	# ESS Maestro-1/2/2e PCI Audio Accelerator
 eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
 fms*	at pci? dev ? function ?	# Forte Media FM801
 neo*	at pci? dev ? function ?	# NeoMagic 256 AC'97 Audio
 sv*	at pci? dev ? function ?	# S3 SonicVibes
 yds*	at pci? dev ? function ?	# Yamaha DS-1 PCI Audio
 # OPL[23] FM synthesizers
 #opl0	at isa? port 0x388	# use only if not attached to sound card
 opl*	at cmpci? flags 1
 opl*	at eso?
 opl*	at fms?
 opl*	at sv?
 opl*	at yds?
 # Audio support
 audio*	at audiobus?
 # MPU 401 UARTs
 #mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
 mpu*	at cmpci?
 mpu*	at eso?
 mpu*	at fms?
 mpu*	at yds?
 # MIDI support
 midi*	at midibus?
 # Bluetooth Controller and Device support
 # Bluetooth PCMCIA Controllers
 #bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A
 #btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139
 # Bluetooth USB Controllers
 ubt* at uhub? port ?
 # Bluetooth Device Hub
 #bthub* at bt3c?
 #bthub* at btbh?
 bthub* at ubt?
 # Bluetooth HID support
 bthidev* at bthub?
 # Bluetooth Mouse
 btms* at bthidev? reportid ?
 wsmouse* at btms? mux 0
 # Bluetooth Keyboard
 btkbd* at bthidev? reportid ?
 wskbd* at btkbd? console ? mux 1
 # Bluetooth Audio support
 btsco* at bthub?
 # Cryptographic Devices
 # PCI cryptographic devices
 hifn*	at pci? dev ? function ?	# Hifn 7755/7811/795x
 ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x
 cinclude "arch/i386/conf/GENERIC.local"
 # Pseudo-Devices
 pseudo-device 	crypto		# /dev/crypto device
 pseudo-device	swcrypto	# software crypto implementation
 # disk/mass storage pseudo-devices
 pseudo-device	bio			# RAID control device driver
 pseudo-device	ccd		4	# concatenated/striped disk devices
 pseudo-device	cgd		4	# cryptographic disk devices
 pseudo-device	raid		8	# RAIDframe disk driver
 options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
 # Options to enable various other RAIDframe RAID types.
 #options 	RF_INCLUDE_EVENODD=1
 #options 	RF_INCLUDE_RAID5_RS=1
 #options 	RF_INCLUDE_PARITYLOGGING=1
 #options 	RF_INCLUDE_CHAINDECLUSTER=1
 #options 	RF_INCLUDE_INTERDECLUSTER=1
 #options 	RF_INCLUDE_PARITY_DECLUSTERING=1
 #options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
 pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk device (ramdisk)
 pseudo-device	vnd			# disk-like interface to files
 # network pseudo-devices
 pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
 pseudo-device	ppp			# Point-to-Point Protocol
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
 pseudo-device	sl			# Serial Line IP
 pseudo-device	strip			# Starmode Radio IP (Metricom)
 pseudo-device	irframetty		# IrDA frame line discipline
 pseudo-device	tap			# virtual Ethernet
 pseudo-device	tun			# network tunneling over tty
 pseudo-device	gre			# generic L3 over IP tunnel
 pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
 #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
 #options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
 #pseudo-device	pf			# PF packet filter
 #pseudo-device	pflog			# PF log if
 # 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	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda		4	# coda minicache <-> venus comm.
 # a pseudo device needed for SMBFS
 pseudo-device	nsmb			# experimental - SMB requester
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont
 # userland interface to drivers, including autoconf and properties retrieval
 pseudo-device   drvctl
 # xen pseudo-devices
 pseudo-device	xenevt
 pseudo-device	xvif
 pseudo-device	xbdback
 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
 acpi0 		at hypervisor?
 options 	MPBIOS
 options 	MPDEBUG
 options 	MPVERBOSE
 options 	ACPIVERBOSE
 #options 	PCI_ADDR_FIXUP		# fixup PCI I/O addresses
 #options 	PCI_BUS_FIXUP		# fixup PCI bus numbering
 #options 	PCI_INTR_FIXUP		# fixup PCI interrupt routing
 ioapic*		at mainbus? apid ?
 # ACPI devices
 acpiacad* 	at acpi?		# ACPI AC Adapter
 acpibat* 	at acpi?		# ACPI Battery
 acpibut* 	at acpi?		# ACPI Button
 acpidalb*	at acpi?		# ACPI Direct Application Launch Button
 # The ACPI Embedded Controller is generally configured via the special ECDT.
 # This is required as parts of the DSDT can reference the EC before the normal
 # attach phase.
 acpiec* 	at acpi?		# ACPI Embedded Controller (late binding)
 acpiecdt* 	at acpi?		# ACPI Embedded Controller (early binding)
 acpilid* 	at acpi?		# ACPI Lid Switch
 hpqlb*		at acpi?		# HP Quick Launch Buttons

 @@ -1,830 +1,828 @@
-/*	$NetBSD: x86_machdep.c,v 1.32 2009/06/20 13:10:14 cegger Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.33 2009/08/05 20:15:36 jym Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
  * Copyright (c) 2005, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.32 2009/06/20 13:10:14 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.33 2009/08/05 20:15:36 jym Exp $");
 #include "opt_modular.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kcore.h>
 #include <sys/errno.h>
 #include <sys/kauth.h>
 #include <sys/mutex.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/atomic.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
 #include <sys/extent.h>
 #include <x86/cpu_msr.h>
 #include <x86/cpuvar.h>
 #include <x86/cputypes.h>
 #include <x86/machdep.h>
 #include <x86/pio.h>
 #include <dev/isa/isareg.h>
 #include <dev/ic/i8042reg.h>
 #include <machine/bootinfo.h>
 #include <machine/vmparam.h>
 #include <uvm/uvm_extern.h>
 int check_pa_acc(paddr_t, vm_prot_t);
 /* --------------------------------------------------------------------- */
 /*
  * Main bootinfo structure.  This is filled in by the bootstrap process
  * done in locore.S based on the information passed by the boot loader.
  */
 struct bootinfo bootinfo;
 /* --------------------------------------------------------------------- */
 /*
  * Given the type of a bootinfo entry, looks for a matching item inside
  * the bootinfo structure.  If found, returns a pointer to it (which must
  * then be casted to the appropriate bootinfo_* type); otherwise, returns
  * NULL.
  */
 void *
 lookup_bootinfo(int type)
+{
 	bool found;
 	int i;
 	struct btinfo_common *bic;
 	bic = (struct btinfo_common *)(bootinfo.bi_data);
 	found = FALSE;
 	for (i = 0; i < bootinfo.bi_nentries && !found; i++) {
 		if (bic->type == type)
 			found = TRUE;
 		else
 			bic = (struct btinfo_common *)
 			    ((uint8_t *)bic + bic->len);
+	}
 	return found ? bic : NULL;
+}
 /*
  * check_pa_acc: check if given pa is accessible.
  */
 int
 check_pa_acc(paddr_t pa, vm_prot_t prot)
+{
 	extern phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
 	extern int mem_cluster_cnt;
 	int i;
 	for (i = 0; i < mem_cluster_cnt; i++) {
 		const phys_ram_seg_t *seg = &mem_clusters[i];
 		paddr_t lstart = seg->start;
 		if (lstart <= pa && pa - lstart <= seg->size) {
 			return 0;
+		}
+	}
 	return kauth_authorize_machdep(kauth_cred_get(),
 	    KAUTH_MACHDEP_UNMANAGEDMEM, NULL, NULL, NULL, NULL);
+}
 /*
  * This function is to initialize the mutex used by x86/msr_ipifuncs.c.
  */
 void
 x86_init(void)
+{
 #ifndef XEN
 	msr_cpu_broadcast_initmtx();
 #endif
+}
 #ifdef MODULAR
 /*
  * Push any modules loaded by the boot loader.
  */
 void
 module_init_md(void)
+{
 	struct btinfo_modulelist *biml;
 	struct bi_modulelist_entry *bi, *bimax;
 	biml = lookup_bootinfo(BTINFO_MODULELIST);
 	if (biml == NULL) {
 		aprint_debug("No module info at boot\n");
 		return;
+	}
 	bi = (struct bi_modulelist_entry *)((uint8_t *)biml + sizeof(*biml));
 	bimax = bi + biml->num;
 	for (; bi < bimax; bi++) {
 		if (bi->type != BI_MODULE_ELF) {
 			aprint_debug("Skipping non-ELF module\n");
 			continue;
+		}
 		aprint_debug("Prep module path=%s len=%d pa=%x\n", bi->path,
 		    bi->len, bi->base);
 		KASSERT(trunc_page(bi->base) == bi->base);
 		(void)module_prime((void *)((uintptr_t)bi->base + KERNBASE),
 		    bi->len);
+	}
+}
 #endif	/* MODULAR */
 void
 cpu_need_resched(struct cpu_info *ci, int flags)
+{
 	struct cpu_info *cur;
 	lwp_t *l;
 	KASSERT(kpreempt_disabled());
 	cur = curcpu();
 	l = ci->ci_data.cpu_onproc;
 	ci->ci_want_resched |= flags;
 	if (__predict_false((l->l_pflag & LP_INTR) != 0)) {
 		/*
 		 * No point doing anything, it will switch soon.
 		 * Also here to prevent an assertion failure in
 		 * kpreempt() due to preemption being set on a
 		 * soft interrupt LWP.
 		 */
 		return;
+	}
 	if (l == ci->ci_data.cpu_idlelwp) {
 		if (ci == cur)
 			return;
 #ifndef XEN /* XXX review when Xen gets MP support */
 		if (x86_cpu_idle == x86_cpu_idle_halt)
 			x86_send_ipi(ci, 0);
 #endif
 		return;
+	}
 	if ((flags & RESCHED_KPREEMPT) != 0) {
 #ifdef __HAVE_PREEMPTION
 		atomic_or_uint(&l->l_dopreempt, DOPREEMPT_ACTIVE);
 		if (ci == cur) {
 			softint_trigger(1 << SIR_PREEMPT);
 		} else {
 			x86_send_ipi(ci, X86_IPI_KPREEMPT);
+		}
 #endif
 	} else {
 		aston(l, X86_AST_PREEMPT);
 		if (ci == cur) {
 			return;
+		}
 		if ((flags & RESCHED_IMMED) != 0) {
 			x86_send_ipi(ci, 0);
+		}
+	}
+}
 void
 cpu_signotify(struct lwp *l)
+{
 	KASSERT(kpreempt_disabled());
 	aston(l, X86_AST_GENERIC);
 	if (l->l_cpu != curcpu())
 		x86_send_ipi(l->l_cpu, 0);
+}
 void
 cpu_need_proftick(struct lwp *l)
+{
 	KASSERT(kpreempt_disabled());
 	KASSERT(l->l_cpu == curcpu());
 	l->l_pflag |= LP_OWEUPC;
 	aston(l, X86_AST_GENERIC);
+}
 bool
 cpu_intr_p(void)
+{
 	int idepth;
 	kpreempt_disable();
 	idepth = curcpu()->ci_idepth;
 	kpreempt_enable();
 	return (idepth >= 0);
+}
 #ifdef __HAVE_PREEMPTION
 /*
  * Called to check MD conditions that would prevent preemption, and to
  * arrange for those conditions to be rechecked later.
  */
 bool
 cpu_kpreempt_enter(uintptr_t where, int s)
+{
 	struct cpu_info *ci;
 	lwp_t *l;
 	KASSERT(kpreempt_disabled());
 	l = curlwp;
 	ci = curcpu();
 	/*
 	 * If SPL raised, can't go.  Note this implies that spin
 	 * mutexes at IPL_NONE are _not_ valid to use.
 	 */
 	if (s > IPL_PREEMPT) {
 		softint_trigger(1 << SIR_PREEMPT);
 		aston(l, X86_AST_PREEMPT);	/* paranoid */
 		return false;
+	}
 	/* Must save cr2 or it could be clobbered. */
 	((struct pcb *)l->l_addr)->pcb_cr2 = rcr2();
 	return true;
+}
 /*
  * Called after returning from a kernel preemption, and called with
  * preemption disabled.
  */
 void
 cpu_kpreempt_exit(uintptr_t where)
+{
 	extern char x86_copyfunc_start, x86_copyfunc_end;
 	KASSERT(kpreempt_disabled());
 	/*
 	 * If we interrupted any of the copy functions we must reload
 	 * the pmap when resuming, as they cannot tolerate it being
 	 * swapped out.
 	 */
 	if (where >= (uintptr_t)&x86_copyfunc_start &&
 	    where < (uintptr_t)&x86_copyfunc_end) {
 		pmap_load();
+	}
 	/* Restore cr2 only after the pmap, as pmap_load can block. */
 	lcr2(((struct pcb *)curlwp->l_addr)->pcb_cr2);
+}
 /*
  * Return true if preemption is disabled for MD reasons.  Must be called
  * with preemption disabled, and thus is only for diagnostic checks.
  */
 bool
 cpu_kpreempt_disabled(void)
+{
 	return curcpu()->ci_ilevel > IPL_NONE;
+}
 #endif	/* __HAVE_PREEMPTION */
 void (*x86_cpu_idle)(void);
 static char x86_cpu_idle_text[16];
 SYSCTL_SETUP(sysctl_machdep_cpu_idle, "sysctl machdep cpu_idle")
+{
 	const struct sysctlnode	*mnode, *node;
 	sysctl_createv(NULL, 0, NULL, &mnode,
 	    CTLFLAG_PERMANENT, CTLTYPE_NODE, "machdep", NULL,
 	    NULL, 0, NULL, 0, CTL_MACHDEP, CTL_EOL);
 	sysctl_createv(NULL, 0, &mnode, &node,
 		       CTLFLAG_PERMANENT, CTLTYPE_STRING, "idle-mechanism",
 		       SYSCTL_DESCR("Mechanism used for the idle loop."),
 		       NULL, 0, x86_cpu_idle_text, 0,
 		       CTL_CREATE, CTL_EOL);
+}
 void
 x86_cpu_idle_init(void)
+{
 #ifndef XEN
 	if ((curcpu()->ci_feature2_flags & CPUID2_MONITOR) == 0 ||
 	    cpu_vendor == CPUVENDOR_AMD) {
 		strlcpy(x86_cpu_idle_text, "halt", sizeof(x86_cpu_idle_text));
 		x86_cpu_idle = x86_cpu_idle_halt;
 	} else {
 		strlcpy(x86_cpu_idle_text, "mwait", sizeof(x86_cpu_idle_text));
 		x86_cpu_idle = x86_cpu_idle_mwait;
+	}
 #else
 	strlcpy(x86_cpu_idle_text, "xen", sizeof(x86_cpu_idle_text));
 	x86_cpu_idle = x86_cpu_idle_xen;
 #endif
+}
 #ifndef XEN
 #define KBTOB(x)	((size_t)(x) * 1024UL)
 #define MBTOB(x)	((size_t)(x) * 1024UL * 1024UL)
 extern paddr_t avail_start, avail_end;
 static int
 add_mem_cluster(phys_ram_seg_t *seg_clusters, int seg_cluster_cnt,
 	struct extent *iomem_ex,
 	uint64_t seg_start, uint64_t seg_end, uint32_t type)
+{
 	uint64_t new_physmem = 0;
 	phys_ram_seg_t *cluster;
 	int i;
 #ifdef i386
 #define TOPLIMIT	0x100000000ULL
 #else
 #define TOPLIMIT	0x100000000000ULL
 #endif
 	if (seg_end > TOPLIMIT) {
 		aprint_verbose("WARNING: skipping large memory map entry: "
 		    "0x%"PRIx64"/0x%"PRIx64"/0x%x\n",
 		    seg_start,
 		    (seg_end - seg_start),
 		    type);
 		return seg_cluster_cnt;
+	}
 	/*
 	 * XXX Chop the last page off the size so that
 	 * XXX it can fit in avail_end.
 	 */
 	if (seg_end == TOPLIMIT)
 		seg_end -= PAGE_SIZE;
 	if (seg_end <= seg_start)
 		return seg_cluster_cnt;
 	for (i = 0; i < seg_cluster_cnt; i++) {
 		cluster = &seg_clusters[i];
 		if ((cluster->start == round_page(seg_start))
 		    && (cluster->size == trunc_page(seg_end) - cluster->start))
+		{
 #ifdef DEBUG_MEMLOAD
 			printf("WARNING: skipping duplicate segment entry\n");
 #endif
 			return seg_cluster_cnt;
+		}
+	}
 	/*
 	 * Allocate the physical addresses used by RAM
 	 * from the iomem extent map.  This is done before
 	 * the addresses are page rounded just to make
 	 * sure we get them all.
 	 */
 	if (seg_start < 0x100000000ULL) {
 		uint64_t io_end;
 		if (seg_end > 0x100000000ULL)
 			io_end = 0x100000000ULL;
 		else
 			io_end = seg_end;
 		if (iomem_ex != NULL && extent_alloc_region(iomem_ex, seg_start,
 		    io_end - seg_start, EX_NOWAIT)) {
 			/* XXX What should we do? */
 			printf("WARNING: CAN't ALLOCATE MEMORY SEGMENT "
 			    "(0x%"PRIx64"/0x%"PRIx64"/0x%x) FROM "
 			    "IOMEM EXTENT MAP!\n",
 			    seg_start, seg_end - seg_start, type);
 			return seg_cluster_cnt;
+		}
+	}
 	/*
 	 * If it's not free memory, skip it.
 	 */
 	if (type != BIM_Memory)
 		return seg_cluster_cnt;
 	/* XXX XXX XXX */
 	if (seg_cluster_cnt >= VM_PHYSSEG_MAX)
 		panic("%s: too many memory segments (increase VM_PHYSSEG_MAX)",
 			__func__);
 #ifdef PHYSMEM_MAX_ADDR
 	if (seg_start >= MBTOB(PHYSMEM_MAX_ADDR))
 		return seg_cluster_cnt;
 	if (seg_end > MBTOB(PHYSMEM_MAX_ADDR))
 		seg_end = MBTOB(PHYSMEM_MAX_ADDR);
 #endif
 	seg_start = round_page(seg_start);
 	seg_end = trunc_page(seg_end);
 	if (seg_start == seg_end)
 		return seg_cluster_cnt;
 	cluster = &seg_clusters[seg_cluster_cnt];
 	cluster->start = seg_start;
 	if (iomem_ex != NULL)
 		new_physmem = physmem + atop(seg_end - seg_start);
 #ifdef PHYSMEM_MAX_SIZE
 	if (iomem_ex != NULL) {
 		if (physmem >= atop(MBTOB(PHYSMEM_MAX_SIZE)))
 			return seg_cluster_cnt;
 		if (new_physmem > atop(MBTOB(PHYSMEM_MAX_SIZE))) {
 			seg_end = seg_start + MBTOB(PHYSMEM_MAX_SIZE) - ptoa(physmem);
 			new_physmem = atop(MBTOB(PHYSMEM_MAX_SIZE));
+		}
+	}
 #endif
 	cluster->size = seg_end - seg_start;
 	if (iomem_ex != NULL) {
 		if (avail_end < seg_end)
 			avail_end = seg_end;
 		physmem = new_physmem;
+	}
 	seg_cluster_cnt++;
 	return seg_cluster_cnt;
+}
 int
 initx86_parse_memmap(struct btinfo_memmap *bim, struct extent *iomem_ex)
+{
 	uint64_t seg_start, seg_end;
 	uint64_t addr, size;
 	uint32_t type;
 	int x;
 	KASSERT(bim != NULL);
 	KASSERT(bim->num > 0);
 #ifdef DEBUG_MEMLOAD
 	printf("BIOS MEMORY MAP (%d ENTRIES):\n", bim->num);
 #endif
 	for (x = 0; x < bim->num; x++) {
 		addr = bim->entry[x].addr;
 		size = bim->entry[x].size;
 		type = bim->entry[x].type;
 #ifdef DEBUG_MEMLOAD
 		printf("    addr 0x%"PRIx64"  size 0x%"PRIx64"  type 0x%x\n",
 			addr, size, type);
 #endif
 		/*
 		 * If the segment is not memory, skip it.
 		 */
 		switch (type) {
 		case BIM_Memory:
 		case BIM_ACPI:
 		case BIM_NVS:
 			break;
 		default:
 			continue;
+		}
 		/*
 		 * If the segment is smaller than a page, skip it.
 		 */
 		if (size < NBPG)
 			continue;
 		seg_start = addr;
 		seg_end = addr + size;
 		/*
 		 *   Avoid Compatibility Holes.
 		 * XXX  Holes within memory space that allow access
 		 * XXX to be directed to the PC-compatible frame buffer
 		 * XXX (0xa0000-0xbffff),to adapter ROM space
 		 * XXX (0xc0000-0xdffff), and to system BIOS space
 		 * XXX (0xe0000-0xfffff).
 		 * XXX  Some laptop(for example,Toshiba Satellite2550X)
 		 * XXX report this area and occurred problems,
 		 * XXX so we avoid this area.
 		 */
 		if (seg_start < 0x100000 && seg_end > 0xa0000) {
 			printf("WARNING: memory map entry overlaps "
 			    "with ``Compatibility Holes'': "
 			    "0x%"PRIx64"/0x%"PRIx64"/0x%x\n", seg_start,
 			    seg_end - seg_start, type);
 			mem_cluster_cnt = add_mem_cluster(
 				mem_clusters, mem_cluster_cnt, iomem_ex,
 				seg_start, 0xa0000, type);
 			mem_cluster_cnt = add_mem_cluster(
 				mem_clusters, mem_cluster_cnt, iomem_ex,
 x100000, seg_end, type);
 		} else
 			mem_cluster_cnt = add_mem_cluster(
 				mem_clusters, mem_cluster_cnt, iomem_ex,
 				seg_start, seg_end, type);
+	}
 	return 0;
+}
 int
 initx86_fake_memmap(struct extent *iomem_ex)
+{
 	phys_ram_seg_t *cluster;
 	KASSERT(mem_cluster_cnt == 0);
 	/*
 	 * Allocate the physical addresses used by RAM from the iomem
 	 * extent map.  This is done before the addresses are
 	 * page rounded just to make sure we get them all.
 	 */
 	if (extent_alloc_region(iomem_ex, 0, KBTOB(biosbasemem),
 	    EX_NOWAIT))
+	{
 		/* XXX What should we do? */
 		printf("WARNING: CAN'T ALLOCATE BASE MEMORY FROM "
 		    "IOMEM EXTENT MAP!\n");
+	}
 	cluster = &mem_clusters[0];
 	cluster->start = 0;
 	cluster->size = trunc_page(KBTOB(biosbasemem));
 	physmem += atop(cluster->size);
 	if (extent_alloc_region(iomem_ex, IOM_END, KBTOB(biosextmem),
 	    EX_NOWAIT))
+	{
 		/* XXX What should we do? */
 		printf("WARNING: CAN'T ALLOCATE EXTENDED MEMORY FROM "
 		    "IOMEM EXTENT MAP!\n");
+	}
 #if NISADMA > 0
 	/*
 	 * Some motherboards/BIOSes remap the 384K of RAM that would
 	 * normally be covered by the ISA hole to the end of memory
 	 * so that it can be used.  However, on a 16M system, this
 	 * would cause bounce buffers to be allocated and used.
 	 * This is not desirable behaviour, as more than 384K of
 	 * bounce buffers might be allocated.  As a work-around,
 	 * we round memory down to the nearest 1M boundary if
 	 * we're using any isadma devices and the remapped memory
 	 * is what puts us over 16M.
 	 */
 	if (biosextmem > (15*1024) && biosextmem < (16*1024)) {
 		char pbuf[9];
 		format_bytes(pbuf, sizeof(pbuf),
 		    biosextmem - (15*1024));
 		printf("Warning: ignoring %s of remapped memory\n",
 		    pbuf);
 		biosextmem = (15*1024);
+	}
 #endif
 	cluster = &mem_clusters[1];
 	cluster->start = IOM_END;
 	cluster->size = trunc_page(KBTOB(biosextmem));
 	physmem += atop(cluster->size);
 	mem_cluster_cnt = 2;
 	avail_end = IOM_END + trunc_page(KBTOB(biosextmem));
 	return 0;
+}
 #ifdef amd64
 extern vaddr_t kern_end;
 extern vaddr_t module_start, module_end;
 #endif
 int
 initx86_load_memmap(paddr_t first_avail)
+{
 	uint64_t seg_start, seg_end;
 	uint64_t seg_start1, seg_end1;
 	int first16q, x;
 	/*
 	 * If we have 16M of RAM or less, just put it all on
 	 * the default free list.  Otherwise, put the first
 	 * 16M of RAM on a lower priority free list (so that
 	 * all of the ISA DMA'able memory won't be eaten up
 	 * first-off).
 	 */
 	if (avail_end <= (16 * 1024 * 1024))
 		first16q = VM_FREELIST_DEFAULT;
 	else
 		first16q = VM_FREELIST_FIRST16;
 	/* Make sure the end of the space used by the kernel is rounded. */
 	first_avail = round_page(first_avail);
 #ifdef amd64
 	kern_end = KERNBASE + first_avail;
 	module_start = kern_end;
 	module_end = KERNBASE + NKL2_KIMG_ENTRIES * NBPD_L2;
 #endif
 	/*
 	 * Now, load the memory clusters (which have already been
 	 * rounded and truncated) into the VM system.
+	 *
 	 * NOTE: WE ASSUME THAT MEMORY STARTS AT 0 AND THAT THE KERNEL
 	 * IS LOADED AT IOM_END (1M).
 	 */
 	for (x = 0; x < mem_cluster_cnt; x++) {
 		const phys_ram_seg_t *cluster = &mem_clusters[x];
 		seg_start = cluster->start;
 		seg_end = cluster->start + cluster->size;
 		seg_start1 = 0;
 		seg_end1 = 0;
 		/*
 		 * Skip memory before our available starting point.
 		 */
 		if (seg_end <= avail_start)
 			continue;
 		if (avail_start >= seg_start && avail_start < seg_end) {
 			if (seg_start != 0)
 				panic("init_x86_64: memory doesn't start at 0");
 			seg_start = avail_start;
 			if (seg_start == seg_end)
 				continue;
+		}
 		/*
 		 * If this segment contains the kernel, split it
 		 * in two, around the kernel.
 		 */
 		if (seg_start <= IOM_END && first_avail <= seg_end) {
 			seg_start1 = first_avail;
 			seg_end1 = seg_end;
 			seg_end = IOM_END;
 			KASSERT(seg_end < seg_end1);
+		}
 		/* First hunk */
 		if (seg_start != seg_end) {
 			if (seg_start < (16 * 1024 * 1024) &&
 			    first16q != VM_FREELIST_DEFAULT) {
 				uint64_t tmp;
 				if (seg_end > (16 * 1024 * 1024))
 					tmp = (16 * 1024 * 1024);
 				else
 					tmp = seg_end;
 				if (tmp != seg_start) {
 #ifdef DEBUG_MEMLOAD
 					printf("loading 0x%"PRIx64"-0x%"PRIx64
 					    " (0x%"PRIx64"-0x%"PRIx64")\n",
 					    seg_start, tmp,
 					    (uint64_t)atop(seg_start),
 					    (uint64_t)atop(tmp));
 #endif
 					uvm_page_physload(atop(seg_start),
 					    atop(tmp), atop(seg_start),
 					    atop(tmp), first16q);
+				}
 				seg_start = tmp;
+			}
 			if (seg_start != seg_end) {
 #ifdef DEBUG_MEMLOAD
 				printf("loading 0x%"PRIx64"-0x%"PRIx64
 				    " (0x%"PRIx64"-0x%"PRIx64")\n",
 				    seg_start, seg_end,
 				    (uint64_t)atop(seg_start),
 				    (uint64_t)atop(seg_end));
 #endif
 				uvm_page_physload(atop(seg_start),
 				    atop(seg_end), atop(seg_start),
 				    atop(seg_end), VM_FREELIST_DEFAULT);
+			}
+		}
 		/* Second hunk */
 		if (seg_start1 != seg_end1) {
 			if (seg_start1 < (16 * 1024 * 1024) &&
 			    first16q != VM_FREELIST_DEFAULT) {
 				uint64_t tmp;
 				if (seg_end1 > (16 * 1024 * 1024))
 					tmp = (16 * 1024 * 1024);
 				else
 					tmp = seg_end1;
 				if (tmp != seg_start1) {
 #ifdef DEBUG_MEMLOAD
 					printf("loading 0x%"PRIx64"-0x%"PRIx64
 					    " (0x%"PRIx64"-0x%"PRIx64")\n",
 					    seg_start1, tmp,
 					    (uint64_t)atop(seg_start1),
 					    (uint64_t)atop(tmp));
 #endif
 					uvm_page_physload(atop(seg_start1),
 					    atop(tmp), atop(seg_start1),
 					    atop(tmp), first16q);
+				}
 				seg_start1 = tmp;
+			}
 			if (seg_start1 != seg_end1) {
 #ifdef DEBUG_MEMLOAD
 				printf("loading 0x%"PRIx64"-0x%"PRIx64
 				    " (0x%"PRIx64"-0x%"PRIx64")\n",
 				    seg_start1, seg_end1,
 				    (uint64_t)atop(seg_start1),
 				    (uint64_t)atop(seg_end1));
 #endif
 				uvm_page_physload(atop(seg_start1),
 				    atop(seg_end1), atop(seg_start1),
 				    atop(seg_end1), VM_FREELIST_DEFAULT);
+			}
+		}
+	}
 	return 0;
+}
 #endif
 void
 x86_reset(void)
+{
 	uint8_t b;
 	/*
 	 * The keyboard controller has 4 random output pins, one of which is
 	 * connected to the RESET pin on the CPU in many PCs.  We tell the
 	 * keyboard controller to pulse this line a couple of times.
 	 */
 	outb(IO_KBD + KBCMDP, KBC_PULSE0);
 	delay(100000);
 	outb(IO_KBD + KBCMDP, KBC_PULSE0);
 	delay(100000);
 	/*
 	 * Attempt to force a reset via the Reset Control register at
 	 * I/O port 0xcf9.  Bit 2 forces a system reset when it
 	 * transitions from 0 to 1.  Bit 1 selects the type of reset
 	 * to attempt: 0 selects a "soft" reset, and 1 selects a
 	 * "hard" reset.  We try a "hard" reset.  The first write sets
 	 * bit 1 to select a "hard" reset and clears bit 2.  The
 	 * second write forces a 0 -> 1 transition in bit 2 to trigger
 	 * a reset.
 	 */
 	outb(0xcf9, 0x2);
 	outb(0xcf9, 0x6);
 	DELAY(500000);  /* wait 0.5 sec to see if that did it */
 	/*
 	 * Attempt to force a reset via the Fast A20 and Init register
 	 * at I/O port 0x92.  Bit 1 serves as an alternate A20 gate.
 	 * Bit 0 asserts INIT# when set to 1.  We are careful to only
 	 * preserve bit 1 while setting bit 0.  We also must clear bit
 	 * 0 before setting it if it isn't already clear.
 	 */
 	b = inb(0x92);
 	if (b != 0xff) {
 		if ((b & 0x1) != 0)
 			outb(0x92, b & 0xfe);
 		outb(0x92, b | 0x1);
 		DELAY(500000);  /* wait 0.5 sec to see if that did it */
+	}
+}

 @@ -1,392 +1,411 @@
-#	$NetBSD: files.xen,v 1.102 2009/07/29 12:02:06 cegger Exp $
+#	$NetBSD: files.xen,v 1.103 2009/08/05 20:15:37 jym Exp $
 #	NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
 #	NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
 maxpartitions 8
 maxusers 2 16 128
 defparam opt_kernbase.h	KERNBASE
 # options for MP configuration through the MP spec
 defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
 # delay before cpu_reset() for reboot.
 defparam		CPURESET_DELAY
 # Beep on halt
 defflag opt_beep.h		BEEP_ONHALT
 defparam opt_beep.h		BEEP_ONHALT_COUNT=3
 defparam opt_beep.h		BEEP_ONHALT_PITCH=1500
 defparam opt_beep.h		BEEP_ONHALT_PERIOD=250
 # PCI fixup options
 defflag opt_pcifixup.h	PCI_ADDR_FIXUP PCI_BUS_FIXUP
 			PCI_INTR_FIXUP PCI_INTR_FIXUP_FORCE
 defparam		PCI_CONF_MODE
 # Intel Enhanced Speedstep
 defflag					ENHANCED_SPEEDSTEP
 defflag	opt_est.h			EST_FREQ_USERWRITE
 file	arch/x86/x86/est.c		enhanced_speedstep
 file	arch/x86/x86/intel_busclock.c	enhanced_speedstep
 # AMD Powernow/Cool`n'Quiet Technology
 defflag opt_powernow_k8.h	POWERNOW_K8
 # Powernow common functions
 file	arch/x86/x86/powernow_k8.c	powernow_k8
 file	arch/x86/x86/powernow_common.c	powernow_k8 | powernow_k7
 file	arch/xen/x86/autoconf.c
 ifdef i386
 file	arch/i386/i386/aout_machdep.c	exec_aout
 file	arch/i386/i386/busfunc.S
 file	arch/i386/i386/cpufunc.S
 file	arch/i386/i386/cpu_in_cksum.S   (inet | inet6) & cpu_in_cksum
 file	arch/i386/i386/db_dbgreg.S	ddb | kstack_check_dr0
 file	arch/i386/i386/db_disasm.c	ddb
 file	arch/i386/i386/db_interface.c	ddb
 file	arch/i386/i386/db_memrw.c	ddb | kgdb
 file	arch/i386/i386/db_trace.c	ddb
 file	arch/i386/i386/dumpsys.c
 file	arch/i386/i386/gdt.c
 file	arch/i386/i386/ipkdb_glue.c	ipkdb
 file	arch/i386/i386/kgdb_machdep.c	kgdb
 file	arch/i386/i386/kobj_machdep.c	modular
 file	arch/i386/i386/machdep.c
 file	arch/i386/i386/longrun.c
 file	arch/i386/i386/mem.c
 file	arch/i386/i386/mtrr_k6.c	mtrr
 file	arch/i386/i386/process_machdep.c
 file	arch/i386/i386/procfs_machdep.c	procfs
 file	arch/i386/i386/trap.c
 file	arch/i386/i386/lock_stubs.S
 file	arch/i386/i386/mptramp.S		multiprocessor
 file	arch/i386/i386/pmc.c			perfctrs
 file	crypto/des/arch/i386/des_enc.S		des
 file	crypto/des/arch/i386/des_cbc.S		des
 file	crypto/blowfish/arch/i386/bf_enc.S	blowfish
 file	crypto/blowfish/arch/i386/bf_cbc.S	blowfish
 # AMD PowerNow K7
 defflag					POWERNOW_K7
 file	arch/i386/i386/powernow_k7.c		powernow_k7
 elifdef amd64
 file	arch/amd64/amd64/busfunc.S
 file	arch/amd64/amd64/cpufunc.S
 file	arch/amd64/amd64/cpu_in_cksum.S		(inet | inet6) & cpu_in_cksum
 file	arch/amd64/amd64/db_disasm.c		ddb
 file	arch/amd64/amd64/db_interface.c	 ddb
 file	arch/amd64/amd64/db_memrw.c		ddb | kgdb
 file	arch/amd64/amd64/db_trace.c		ddb
 file	arch/amd64/amd64/kgdb_machdep.c	 kgdb
 file	arch/amd64/amd64/kobj_machdep.c	 	modular
 file	arch/amd64/amd64/gdt.c
 file	arch/amd64/amd64/machdep.c
 file	arch/amd64/amd64/mem.c
 file	arch/amd64/amd64/process_machdep.c
 file	arch/amd64/amd64/procfs_machdep.c	procfs
 file	arch/amd64/amd64/trap.c
 file	arch/amd64/amd64/fpu.c
 file	arch/amd64/amd64/lock_stubs.S
 file	arch/amd64/amd64/mptramp.S		multiprocessor
 endif
 file	kern/subr_disk_mbr.c		disk
 file	arch/xen/x86/hypervisor_machdep.c
 # file 	arch/x86/x86/mtrr_i686.c	mtrr
 file	arch/x86/x86/syscall.c
 file	arch/xen/x86/x86_xpmap.c
 file	arch/xen/x86/xen_intr.c
 file	arch/xen/x86/xenfunc.c
 file	arch/xen/xen/xen_machdep.c
 file	arch/xen/xen/xen_debug.c
 file	arch/xen/xen/clock.c
 file	arch/x86/isa/rtc.c		dom0ops
 file	arch/xen/xen/evtchn.c
 file	arch/xen/xen/xengnt.c
 file	dev/cons.c
+#
 # Machine-independent SCSI drivers
+#
 include	"dev/scsipi/files.scsipi"
+#
 # Machine-independent ATA drivers
+#
 include	"dev/ata/files.ata"
 # Memory Disk for install floppy
 file	dev/md_root.c			memory_disk_hooks
 file	arch/x86/x86/bus_dma.c		pci
 file	arch/x86/x86/core_machdep.c	coredump
 file	arch/xen/x86/xen_bus_dma.c	pci
 file	arch/x86/x86/bus_space.c	pci
 file	arch/xen/x86/consinit.c
 file	arch/x86/x86/identcpu.c
 file	arch/xen/x86/intr.c
 file	arch/x86/x86/ipi.c
 file	arch/x86/x86/pmap.c
 file	arch/x86/x86/sys_machdep.c
 file	arch/x86/x86/tsc.c
 file	arch/x86/x86/vm_machdep.c
 file	arch/x86/x86/x86_machdep.c
 file	arch/x86/x86/cpu_topology.c
 include	"arch/xen/conf/files.compat"
 # BIOS32 routines
 define	bios32
 ifdef i386
 file	arch/i386/i386/bios32.c		bios32 needs-flag
 elifdef amd64
 file	arch/amd64/amd64/bios32.c	bios32 needs-flag
 endif
 # xen specific mainbus attributes
 define cpubus { [apid = -1] }
 define ioapicbus { [apid = -1] }
 define apmbus {}
 define pnpbiosbus {}
 define hypervisorbus {}
 define xendevbus {}
 define ipmibus {}
+#
 # System bus types
+#
 device mainbus: cpubus, ioapicbus, hypervisorbus, bios32, ipmibus
 attach	mainbus at root
 file	arch/xen/x86/mainbus.c		mainbus
 # Xen hypervisor
 device	hypervisor { [apid = -1]}: isabus, pcibus, sysmon_power, xendevbus, acpibus
 attach hypervisor at hypervisorbus
 file	arch/xen/xen/hypervisor.c	hypervisor needs-flag
 file	arch/xen/xen/shutdown_xenbus.c	hypervisor
 # Xenbus
 device xenbus {[id = -1]}
 attach xenbus at xendevbus
 file arch/xen/xenbus/xenbus_client.c xenbus needs-flag
 file arch/xen/xenbus/xenbus_comms.c xenbus needs-flag
 file arch/xen/xenbus/xenbus_dev.c xenbus & dom0ops needs-flag
 file arch/xen/xenbus/xenbus_probe.c xenbus needs-flag
 file arch/xen/xenbus/xenbus_xs.c xenbus needs-flag
 ifdef i386
 # Numeric Processing Extension; Math Co-processor
 device	npx
 file	arch/i386/isa/npx.c		npx needs-flag
 attach	npx at xendevbus with npx_hv
 file	arch/xen/i386/npx_hv.c		npx_hv
 endif
 # Xen console support
 device	xencons: tty
 attach	xencons at xendevbus
 file	arch/xen/xen/xencons.c		xencons needs-flag
 # Xen event peudo-device
 defpseudo xenevt
 defpseudo xvif
 defpseudo xbdback
 # Xen Network driver
 device	xennet: arp, ether, ifnet
 attach xennet at xenbus
 file	arch/xen/xen/if_xennet_xenbus.c xennet needs-flag
 # Xen Block device driver and wd/sd/cd identities
 device	xbd: disk
 attach	xbd at xenbus
 file	arch/xen/xen/xbd_xenbus.c	xbd
 # PCI frontend
 device xpci: pcibus
 attach xpci at xenbus with xpci_xenbus
 file	arch/xen/xen/xpci_xenbus.c	xpci_xenbus
 # Non-Xen specific devices and options
 include	"dev/pckbport/files.pckbport"
+#
 # Machine-independent PCI devices
+#
 include "dev/i2o/files.i2o"
 include "dev/pci/files.pci"
 include "dev/pci/files.agp"
 file	arch/xen/xen/pciide_machdep.c	pciide_common
 device	pciback {unit = -1}
 attach	pciback at pci
 file	arch/xen/xen/pciback.c		pciback
 # x86 specific PCI hardware
 include "arch/x86/pci/files.pci"
+#
 # Machine-independent ISA devices
+#
 include "dev/isa/files.isa"
 include "dev/usb/files.usb"
 include "dev/ieee1394/files.ieee1394"
 device	fdc {drive = -1} #XXX
 include "dev/apm/files.apm"
 include "dev/acpi/files.acpi"
 file	arch/xen/xen/xen_acpi_machdep.c	acpi
 file	arch/x86/x86/mpacpi.c		acpi
 file	arch/x86/x86/acpi_machdep.c	acpi
 file	arch/x86/x86/i8259.c
 # MP configuration using Intel SMP specification 1.4
 file	arch/x86/x86/mpbios.c		mpbios
 # MP configuration using either ACPI or Intel SMP specification 1.4
 file 	arch/x86/x86/mp.c		acpi | mpbios
 file	arch/x86/pci/pci_bus_fixup.c	pci_bus_fixup
 file	arch/x86/pci/pci_addr_fixup.c	pci_addr_fixup
 file	arch/x86/x86/apic.c		ioapic
 device ioapic
 attach ioapic at ioapicbus
 file	arch/x86/x86/ioapic.c		ioapic needs-flag
 #IPMI device
 device ipmi : sysmon_envsys, sysmon_wdog
 attach ipmi at ipmibus
 file	arch/x86/x86/ipmi.c		ipmi needs-flag
 # CPUS
 device cpu
 attach cpu at cpubus
 device vcpu
 attach vcpu at xendevbus
 file	arch/xen/x86/cpu.c		cpu | vcpu
 file	arch/x86/x86/msr_ipifuncs.c
+#
 # Compatibility modules
+#
 ifdef i386
 # VM86 mode
 file	arch/i386/i386/vm86.c			vm86
 # VM86 in kernel
 file	arch/i386/i386/kvm86.c			kvm86
 file	arch/i386/i386/kvm86call.S		kvm86
 # Binary compatibility with previous NetBSD releases (COMPAT_XX)
 file	arch/i386/i386/compat_13_machdep.c	compat_13
 file	arch/i386/i386/compat_16_machdep.c	compat_16 | compat_ibcs2
 # SVR4 binary compatibility (COMPAT_SVR4)
 include	"compat/svr4/files.svr4"
 file	arch/i386/i386/svr4_machdep.c		compat_svr4
 file	arch/i386/i386/svr4_sigcode.S		compat_svr4
 file	arch/i386/i386/svr4_syscall.c		compat_svr4
 # MACH binary compatibility (COMPAT_MACH)
 include	"compat/mach/files.mach"
 file	arch/i386/i386/mach_machdep.c		compat_mach | compat_darwin
 file	arch/i386/i386/mach_sigcode.S		compat_mach | compat_darwin
 file	arch/i386/i386/mach_syscall.c		compat_mach | compat_darwin
 file	arch/i386/i386/macho_machdep.c		exec_macho
 # DARWIN binary compatibility (COMPAT_DARWIN)
 include	"compat/darwin/files.darwin"
 file	arch/i386/i386/darwin_machdep.c		compat_darwin
 # iBCS-2 binary compatibility (COMPAT_IBCS2)
 include	"compat/ibcs2/files.ibcs2"
 file	arch/i386/i386/ibcs2_machdep.c		compat_ibcs2
 file	arch/i386/i386/ibcs2_sigcode.S		compat_ibcs2
 file	arch/i386/i386/ibcs2_syscall.c		compat_ibcs2
 # Linux binary compatibility (COMPAT_LINUX)
 include	"compat/linux/files.linux"
 include	"compat/linux/arch/i386/files.linux_i386"
 file	arch/i386/i386/linux_sigcode.S		compat_linux
 file	arch/i386/i386/linux_syscall.c		compat_linux
 file	arch/x86/x86/linux_trap.c		compat_linux
 # FreeBSD binary compatibility (COMPAT_FREEBSD)
 include	"compat/freebsd/files.freebsd"
 file	arch/i386/i386/freebsd_machdep.c	compat_freebsd
 file	arch/i386/i386/freebsd_sigcode.S	compat_freebsd
 file	arch/i386/i386/freebsd_syscall.c	compat_freebsd
 # Win32 binary compatibility (COMPAT_PECOFF)
 include	"compat/pecoff/files.pecoff"
 elifdef amd64
 # NetBSD/i386 32-bit binary compatibility (COMPAT_NETBSD32)
 include "compat/netbsd32/files.netbsd32"
 file	arch/amd64/amd64/netbsd32_machdep.c	compat_netbsd32
 file	arch/amd64/amd64/netbsd32_sigcode.S	compat_netbsd32 & compat_16
 file	arch/amd64/amd64/netbsd32_syscall.c	compat_netbsd32
 # Linux compatibility (COMPAT_LINUX)
 include "compat/linux/files.linux"
 include "compat/linux/arch/amd64/files.linux_amd64"
 file	arch/amd64/amd64/linux_sigcode.S	compat_linux
 file	arch/amd64/amd64/linux_syscall.c	compat_linux
 file	arch/x86/x86/linux_trap.c		compat_linux
 # Linux 32 bit compatibility (COMPAT_LINUX32)
 include "compat/linux32/files.linux32"
 include "compat/linux32/arch/amd64/files.linux32_amd64"
 file	arch/amd64/amd64/linux32_sigcode.S	compat_linux32
 file	arch/amd64/amd64/linux32_syscall.c	compat_linux32
 endif
 # OSS audio driver compatibility
 include	"compat/ossaudio/files.ossaudio"
 # Bluetooth
 include "dev/bluetooth/files.bluetooth"
+#
 # CARDBUS
+#
 include	"dev/cardbus/files.cardbus"
 ifdef i386
 file	arch/i386/i386/rbus_machdep.c	cardbus
 elifdef amd64
 file	arch/amd64/amd64/rbus_machdep.c cardbus
 endif
 # this wants to be probed as late as possible.
+#
 # Machine-independent PCMCIA drivers
+#
 include	"dev/pcmcia/files.pcmcia"
 # Domain-0 operations
 defflag	opt_xen.h			DOM0OPS XEN_COMPAT_030001
 file	arch/xen/xen/privcmd.c		dom0ops
 file 	arch/xen/x86/xen_shm_machdep.c	dom0ops
 file	arch/x86/pci/pci_machdep.c	hypervisor & pci & dom0ops
 file	arch/xen/xen/pci_intr_machdep.c	hypervisor & pci
 file	arch/xen/xen/isa_machdep.c	hypervisor & dom0ops
 file	arch/xen/xen/xenevt.c		xenevt & dom0ops
 file	arch/xen/xen/xennetback_xenbus.c xvif
 file	arch/xen/xen/xennet_checksum.c	xvif | xennet
 file	arch/xen/xen/xbdback_xenbus.c xbdback
 ifdef i386
 include "arch/i386/conf/majors.i386"
 elifdef amd64
 include "arch/amd64/conf/majors.amd64"
 endif

 @@ -1,73 +1,64 @@
-#	$NetBSD: files.compat,v 1.20 2009/07/29 12:02:06 cegger Exp $
+#	$NetBSD: files.compat,v 1.21 2009/08/05 20:15:37 jym Exp $
 #	NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
 # options for MP configuration through the MP spec
 #defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
 #defflag opt_mpacpi.h MPACPI MPACPI_SCANPCI
 # MTRR support
 defflag                 MTRR
 defflag opt_xen.h		XEN PAE
 # XXX define fake options to make config create the .h files
 defflag	lapic.h			XXXLAPIC
 defflag	apm.h			XXXAPM
 defflag	apmbios.h		XXXAPMBIOS
 defflag	eisa.h			XXXEISA
 defflag	isadma.h		XXXISADMA
 defflag	mca.h			XXXMCA
 defflag	ega.h			XXXEGA
 defflag	pcdisplay.h		XXXPCDISPLAY
 defflag	pc.h			XXXPC
 defflag	pnpbios.h		XXXPNPBIOS
 defflag	bioscall.h		XXXBIOSCALL
 defflag	opt_pcibios.h		XXXOPT_PCIBIOS
 defflag	opt_pcifixup.h		XXXOPT_PCIFIXUP
 # VM86 emulation
 defflag	opt_vm86.h			XXXVM86
 defflag	opt_kvm86.h			XXXKVM86
 # User-settable LDT (used by WINE)
 defflag	opt_user_ldt.h			XXXUSER_LDT
 # X server support in console drivers
 defflag	opt_xserver.h			XXXXSERVER XXXXSERVER_DDB
 # The REAL{BASE,EXT}MEM options
 defparam opt_realmem.h			XXXREALBASEMEM XXXREALEXTMEM
 # understand boot device passed by pre-1.3 bootblocks
 defflag	opt_compat_oldboot.h		XXXCOMPAT_OLDBOOT
 # Large page size
 defflag	opt_largepages.h		XXXLARGEPAGES
 # kernel stack debug
 defflag	opt_kstack_dr0.h		XXXKSTACK_CHECK_DR0
 # Microsoft Xbox support
 defflag	opt_xbox.h			XXXXBOX
 #Pentium 4+ Thermal Monitor ODCM (aka On Demand Clock Modulation)
 defflag opt_intel_odcm.h	XXXINTEL_ONDEMAND_CLOCKMOD
 # Intel On Die Temperature sensor
 defflag opt_intel_coretemp.h		XXXINTEL_CORETEMP
 # AMD Powernow/Cool`n'Quiet Technology
 defflag opt_powernow_k8.h	XXPOWERNOW_K8
 # Intel Enhanced Speedstep
 defflag	opt_enhanced_speedstep.h XXXENHANCED_SPEEDSTEP
 defflag opt_est.h		XXXEST_FREQ_USERWRITE
 defflag opt_powernow_k7.h XXXPOWERNOW_K7
 # Multiboot support
 defflag 	opt_multiboot.h		XXXMULTIBOOT
 # The PHYSMEM_MAX_{SIZE,ADDR} optionms
 defparam opt_physmem.h	XXXPHYSMEM_MAX_ADDR XXXPHYSMEM_MAX_SIZE