Wed Apr 26 18:20:01 2017 UTC ()
Catch up with GENERIC changes.


(christos)
diff -r1.56 -r1.57 src/sys/arch/amd64/conf/ALL
cvs diff -r1.56 -r1.57 src/sys/arch/amd64/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/ALL 2017/04/18 19:09:12 1.56
+++ src/sys/arch/amd64/conf/ALL 2017/04/26 18:20:01 1.57
@@ -1,56 +1,63 @@ @@ -1,56 +1,63 @@
1# $NetBSD: ALL,v 1.56 2017/04/18 19:09:12 riastradh Exp $ 1# $NetBSD: ALL,v 1.57 2017/04/26 18:20:01 christos Exp $
2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp 2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
3# 3#
4# ALL machine description file 4# ALL machine description file
5# 5#
6# This machine description includes all devices and options and it is 6# This machine description includes all devices and options and it is
7# used to compile-test the source and does not necessarily produce a 7# used to compile-test the source and does not necessarily produce a
8# bootable or useful kernel. 8# bootable or useful kernel.
9# 9#
10# For further information on hardware support for this architecture, see 10# For further information on hardware support for this architecture, see
11# the intro(4) man page. For further information about kernel options 11# the intro(4) man page. For further information about kernel options
12# for this architecture, see the options(4) man page. For an explanation 12# for this architecture, see the options(4) man page. For an explanation
13# of each device driver in this file see the section 4 man page for the 13# of each device driver in this file see the section 4 man page for the
14# device. 14# device.
15 15
16include "arch/amd64/conf/std.amd64" 16include "arch/amd64/conf/std.amd64"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.56 $" 20#ident "ALL-$Revision: 1.57 $"
21 21
22maxusers 64 # estimated number of users 22maxusers 64 # estimated number of users
23 23
24makeoptions USE_SSP=yes 24makeoptions USE_SSP=yes
25 25
26# CPU-related options. 26# CPU-related options.
27#options VM86 # virtual 8086 emulation 27#options VM86 # virtual 8086 emulation
28#options USER_LDT # user-settable LDT; used by WINE 28#options USER_LDT # user-settable LDT; used by WINE
29options X86EMU # 386 Real Mode emulator 29options X86EMU # 386 Real Mode emulator
30#options PAE # PAE mode (36 bits physical addressing) 30#options PAE # PAE mode (36 bits physical addressing)
31 31
32# CPU features 32# CPU features
33acpicpu* at cpu? # ACPI CPU (including frequency scaling) 33acpicpu* at cpu? # ACPI CPU (including frequency scaling)
34coretemp* at cpu? # Intel on-die thermal sensor 34coretemp* at cpu? # Intel on-die thermal sensor
35est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) 35est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
36odcm0 at cpu0 # On-demand clock modulation 36odcm0 at cpu0 # On-demand clock modulation
37#padlock0 at cpu0 # VIA PadLock 37#padlock0 at cpu0 # VIA PadLock
38powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI) 38powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
39viac7temp* at cpu? # VIA C7 temperature sensor 39viac7temp* at cpu? # VIA C7 temperature sensor
40vmt0 at cpu0 # VMware Tools 40vmt0 at cpu0 # VMware Tools
41 41
42options PMC # performance-monitoring counters support 42options PMC # performance-monitoring counters support
43 43
 44# Beep when it is safe to power down the system (requires sysbeep)
 45options BEEP_ONHALT
 46# Some tunable details of the above feature (default values used below)
 47options BEEP_ONHALT_COUNT=3 # Times to beep
 48options BEEP_ONHALT_PITCH=1500 # Default frequency (in Hz)
 49options BEEP_ONHALT_PERIOD=250 # Default duration (in msecs)
 50
44options MULTIBOOT # Multiboot support (see multiboot(8)) 51options MULTIBOOT # Multiboot support (see multiboot(8))
45 52
46# delay between "rebooting ..." message and hardware reset, in milliseconds 53# delay between "rebooting ..." message and hardware reset, in milliseconds
47options CPURESET_DELAY=2000 54options CPURESET_DELAY=2000
48 55
49# This option allows you to force a serial console at the specified 56# This option allows you to force a serial console at the specified
50# I/O address. see console(4) for details. 57# I/O address. see console(4) for details.
51options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600 58options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
52# you don't want the option below ON iff you are using the 59# you don't want the option below ON iff you are using the
53# serial console option of the new boot strap code. 60# serial console option of the new boot strap code.
54options CONS_OVERRIDE # Always use above! independent of boot info 61options CONS_OVERRIDE # Always use above! independent of boot info
55 62
56# The following options override the memory sizes passed in from the boot 63# The following options override the memory sizes passed in from the boot
@@ -85,93 +92,90 @@ options SYSVSEM # System V-like semaph @@ -85,93 +92,90 @@ options SYSVSEM # System V-like semaph
85options SEMMNI=10 # number of semaphore identifiers 92options SEMMNI=10 # number of semaphore identifiers
86options SEMMNS=60 # number of semaphores in system 93options SEMMNS=60 # number of semaphores in system
87options SEMUME=10 # max number of undo entries per process 94options SEMUME=10 # max number of undo entries per process
88options SEMMNU=30 # number of undo structures in system 95options SEMMNU=30 # number of undo structures in system
89options SYSVSHM # System V-like memory sharing 96options SYSVSHM # System V-like memory sharing
90 97
91options MODULAR # new style module(7) framework 98options MODULAR # new style module(7) framework
92options MODULAR_DEFAULT_AUTOLOAD 99options MODULAR_DEFAULT_AUTOLOAD
93 100
94options USERCONF # userconf(4) support 101options USERCONF # userconf(4) support
95options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 102options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
96options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 103options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
97 104
98# Beep when it is safe to power down the system (requires sysbeep) 
99options BEEP_ONHALT 
100# Some tunable details of the above feature (default values used below) 
101options BEEP_ONHALT_COUNT=3 # Times to beep 
102options BEEP_ONHALT_PITCH=1500 # Default frequency (in Hz) 
103options BEEP_ONHALT_PERIOD=250 # Default duration (in msecs) 
104 
105# Alternate buffer queue strategies for better responsiveness under high 105# Alternate buffer queue strategies for better responsiveness under high
106# disk I/O load. 106# disk I/O load.
107options BUFQ_READPRIO 107options BUFQ_READPRIO
108options BUFQ_PRIOCSCAN 108options BUFQ_PRIOCSCAN
109 109
110# Diagnostic/debugging support options 110# Diagnostic/debugging support options
111options DIAGNOSTIC # inexpensive kernel consistency checks 111options DIAGNOSTIC # inexpensive kernel consistency checks
 112 # XXX to be commented out on release branch
112options DEBUG # expensive debugging checks/support 113options DEBUG # expensive debugging checks/support
113options LOCKDEBUG # expensive locking checks/support 114options LOCKDEBUG # expensive locking checks/support
114options DDB # in-kernel debugger 115options DDB # in-kernel debugger
 116options DDB_COMMANDONENTER="bt" # execute command when ddb is entered
115options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic' 117options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
116options DDB_HISTORY_SIZE=512 # enable history editing in DDB 118options DDB_HISTORY_SIZE=512 # enable history editing in DDB
117options DDB_VERBOSE_HELP 119options DDB_VERBOSE_HELP
118options KGDB # remote debugger 120options KGDB # remote debugger
119options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 121options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
120#options IPKDB # IP Kernel Debugger 122#options IPKDB # IP Kernel Debugger
121#options IPKDBKEY="\"Pass_phrase_to_debug_over_network\"" 123#options IPKDBKEY="\"Pass_phrase_to_debug_over_network\""
 124makeoptions COPTS="-O2 -fno-omit-frame-pointer"
122makeoptions DEBUG="-g" # compile full symbol table 125makeoptions DEBUG="-g" # compile full symbol table
123options SYSCALL_STATS # per syscall counts 126options SYSCALL_STATS # per syscall counts
124options SYSCALL_TIMES # per syscall times 127options SYSCALL_TIMES # per syscall times
125options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) 128options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris)
126options KDTRACE_HOOKS # kernel DTrace hooks 129options KDTRACE_HOOKS # kernel DTrace hooks
127options UVMHIST # kernhist for uvm subsystem 130options UVMHIST # kernhist for uvm subsystem
128options BIOHIST # kernhist for buff I/O 131options BIOHIST # kernhist for buff I/O
129 132
130# Compatibility options 133# Compatibility options
131#options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI 134options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
132#options COMPAT_09 # NetBSD 0.9, 135options EXEC_AOUT # required by binaries from before 1.5
133#options COMPAT_10 # NetBSD 1.0, 136options COMPAT_09 # NetBSD 0.9,
134#options COMPAT_11 # NetBSD 1.1, 137options COMPAT_10 # NetBSD 1.0,
135#options COMPAT_12 # NetBSD 1.2 (and 386BSD and BSDI), 138options COMPAT_11 # NetBSD 1.1,
136#options COMPAT_13 # NetBSD 1.3 (and 386BSD and BSDI), 139options COMPAT_12 # NetBSD 1.2 (and 386BSD and BSDI),
137#options COMPAT_14 # NetBSD 1.4, 140options COMPAT_13 # NetBSD 1.3 (and 386BSD and BSDI),
138#options COMPAT_15 # NetBSD 1.5, 141options COMPAT_14 # NetBSD 1.4,
 142options COMPAT_15 # NetBSD 1.5,
139options COMPAT_16 # NetBSD 1.6, 143options COMPAT_16 # NetBSD 1.6,
140options COMPAT_20 # NetBSD 2.0, 144options COMPAT_20 # NetBSD 2.0,
141options COMPAT_30 # NetBSD 3.0, 145options COMPAT_30 # NetBSD 3.0,
142options COMPAT_40 # NetBSD 4.0, 146options COMPAT_40 # NetBSD 4.0,
143options COMPAT_50 # NetBSD 5.0, 147options COMPAT_50 # NetBSD 5.0,
144options COMPAT_60 # NetBSD 6.0, and 148options COMPAT_60 # NetBSD 6.0, and
145options COMPAT_70 # NetBSD 7.0 binary compatibility. 149options COMPAT_70 # NetBSD 7.0 binary compatibility.
146options COMPAT_43 # 4.3BSD, 386BSD, and BSDI 150options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
147options COMPAT_44 # 4.4BSD 151options COMPAT_44 # 4.4BSD
148options COMPAT_386BSD_MBRPART # recognize old partition ID 152options COMPAT_386BSD_MBRPART # recognize old partition ID
149options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 153options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
150 154
151options COMPAT_NETBSD32 # NetBSD 32-bit 
152options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility 155options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
153options COMPAT_IBCS2 # binary compatibility with SCO and ISC 156options COMPAT_NETBSD32 # NetBSD 32-bit
154options COMPAT_LINUX # binary compatibility with Linux 157options COMPAT_LINUX # binary compatibility with Linux
155options COMPAT_LINUX32 # binary compatibility with Linux 32-bit 158options COMPAT_LINUX32 # binary compatibility with Linux 32-bit
 159options COMPAT_IBCS2 # binary compatibility with SCO and ISC
156options COMPAT_FREEBSD # binary compatibility with FreeBSD 160options COMPAT_FREEBSD # binary compatibility with FreeBSD
157options COMPAT_NDIS # NDIS network driver 161options COMPAT_NDIS # NDIS network driver
158options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 162options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
159 163
160# Wedge support 164# Wedge support
161options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances 165options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
162options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges 166options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
163#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges 167options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
164#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges 168options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
165options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges 169options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
166options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges 170options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges
167 171
168# File systems 172# File systems
169file-system FFS # UFS 173file-system FFS # UFS
170file-system EXT2FS # second extended file system (linux) 174file-system EXT2FS # second extended file system (linux)
171file-system LFS # log-structured file system 175file-system LFS # log-structured file system
172file-system MFS # memory file system 176file-system MFS # memory file system
173file-system NFS # Network File System client 177file-system NFS # Network File System client
174file-system NTFS # Windows/NT file system (experimental) 178file-system NTFS # Windows/NT file system (experimental)
175file-system CD9660 # ISO 9660 + Rock Ridge file system 179file-system CD9660 # ISO 9660 + Rock Ridge file system
176file-system MSDOSFS # MS-DOS file system 180file-system MSDOSFS # MS-DOS file system
177file-system FDESC # /dev/fd 181file-system FDESC # /dev/fd
@@ -298,28 +302,26 @@ options WSKBD_EVENT_AUTOREPEAT # auto  @@ -298,28 +302,26 @@ options WSKBD_EVENT_AUTOREPEAT # auto
298# don't attach pckbd as the console if no PS/2 keyboard is found 302# don't attach pckbd as the console if no PS/2 keyboard is found
299options PCKBD_CNATTACH_MAY_FAIL 303options PCKBD_CNATTACH_MAY_FAIL
300# see dev/pckbport/wskbdmap_mfii.c for implemented layouts 304# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
301options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver 305options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver
302options UKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for ukbd driver 306options UKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for ukbd driver
303# allocate a number of virtual screens at autoconfiguration time 307# allocate a number of virtual screens at autoconfiguration time
304options WSDISPLAY_DEFAULTSCREENS=4 308options WSDISPLAY_DEFAULTSCREENS=4
305# use a large software cursor that doesn't blink 309# use a large software cursor that doesn't blink
306options PCDISPLAY_SOFTCURSOR 310options PCDISPLAY_SOFTCURSOR
307# modify the screen type of the console; defaults to "80x25" 311# modify the screen type of the console; defaults to "80x25"
308options VGA_CONSOLE_SCREENTYPE="\"80x24\"" 312options VGA_CONSOLE_SCREENTYPE="\"80x24\""
309# work around a hardware bug that loaded fonts don't work; found on ATI cards 313# work around a hardware bug that loaded fonts don't work; found on ATI cards
310options VGA_CONSOLE_ATI_BROKEN_FONTSEL 314options VGA_CONSOLE_ATI_BROKEN_FONTSEL
311# issue VGA BIOS POST on resume 
312options VGA_POST 
313# console scrolling support. 315# console scrolling support.
314options WSDISPLAY_SCROLLSUPPORT 316options WSDISPLAY_SCROLLSUPPORT
315# enable VGA raster mode capable of displaying multilingual text on console 317# enable VGA raster mode capable of displaying multilingual text on console
316#options VGA_RASTERCONSOLE 318#options VGA_RASTERCONSOLE
317# enable splash screen support; requires hw driver support 319# enable splash screen support; requires hw driver support
318#options SPLASHSCREEN 320#options SPLASHSCREEN
319 321
320# Keylock support 322# Keylock support
321options KEYLOCK 323options KEYLOCK
322options secmodel_keylock # Requires options KEYLOCK 324options secmodel_keylock # Requires options KEYLOCK
323 325
324# Kernel root file system and dump configuration. 326# Kernel root file system and dump configuration.
325config netbsd root on ? type ? 327config netbsd root on ? type ?
@@ -338,33 +340,37 @@ config netbsd root on ? type ? @@ -338,33 +340,37 @@ config netbsd root on ? type ?
338#options APM_POWER_PRINT # Print stats on the console 340#options APM_POWER_PRINT # Print stats on the console
339#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts 341#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
340 342
341 343
342# Basic Bus Support 344# Basic Bus Support
343 345
344#IPMI support 346#IPMI support
345ipmi0 at mainbus? 347ipmi0 at mainbus?
346 348
347# Advanced Configuration and Power Interface 349# Advanced Configuration and Power Interface
348 350
349# This option can be used to retrieve CPU and APIC information. 351# This option can be used to retrieve CPU and APIC information.
350# that I/O APICs can be used if ACPI is enabled below. 352# that I/O APICs can be used if ACPI is enabled below.
351options MPBIOS_SCANPCI # find PCI roots using MPBIOS 353options ACPI_SCANPCI # find PCI roots using ACPI
352options ACPI_SCANPCI # find PCI roots using ACPI 354options MPBIOS # configure CPUs and APICs using MPBIOS
 355options MPBIOS_SCANPCI # MPBIOS configures PCI roots
 356options PCI_INTR_FIXUP # PCI interrupt routing via ACPI
 357options PCI_BUS_FIXUP # fixup PCI bus numbering
 358options PCI_ADDR_FIXUP # fixup PCI I/O addresses
 359options ACPI_ACTIVATE_DEV # If set, activate inactive devices
 360options VGA_POST # in-kernel support for VGA POST
353 361
354acpi0 at mainbus0 362acpi0 at mainbus0
355 363
356options ACPI_ACTIVATE_DEV # If set, activate inactive devices 
357 
358# ACPI devices 364# ACPI devices
359apm* at acpi? # ACPI apm emulation 365apm* at acpi? # ACPI apm emulation
360acpiacad* at acpi? # ACPI AC Adapter 366acpiacad* at acpi? # ACPI AC Adapter
361acpibat* at acpi? # ACPI Battery 367acpibat* at acpi? # ACPI Battery
362acpibut* at acpi? # ACPI Button 368acpibut* at acpi? # ACPI Button
363acpidalb* at acpi? # ACPI Direct Application Launch Button 369acpidalb* at acpi? # ACPI Direct Application Launch Button
364acpiec* at acpi? # ACPI Embedded Controller (late) 370acpiec* at acpi? # ACPI Embedded Controller (late)
365acpiecdt* at acpi? # ACPI Embedded Controller (early) 371acpiecdt* at acpi? # ACPI Embedded Controller (early)
366acpifan* at acpi? # ACPI Fan 372acpifan* at acpi? # ACPI Fan
367acpilid* at acpi? # ACPI Lid Switch 373acpilid* at acpi? # ACPI Lid Switch
368acpipmtr* at acpi? # ACPI Power Meter (experimental) 374acpipmtr* at acpi? # ACPI Power Meter (experimental)
369# XXX Do not enable this in a real kernel unless you also disable any 375# XXX Do not enable this in a real kernel unless you also disable any
370# XXX "native" i2c controller. Otherwise you'll have two accessors to 376# XXX "native" i2c controller. Otherwise you'll have two accessors to
@@ -384,148 +390,147 @@ attimer* at acpi? # AT Timer @@ -384,148 +390,147 @@ attimer* at acpi? # AT Timer
384com* at acpi? # Serial communications interface 390com* at acpi? # Serial communications interface
385fdc* at acpi? # Floppy disk controller 391fdc* at acpi? # Floppy disk controller
386fujbp* at acpi? # Fujitsu Brightness & Pointer 392fujbp* at acpi? # Fujitsu Brightness & Pointer
387fujhk* at acpi? # Fujitsu Hotkeys 393fujhk* at acpi? # Fujitsu Hotkeys
388hpacel* at acpi? # HP 3D DriveGuard accelerometer 394hpacel* at acpi? # HP 3D DriveGuard accelerometer
389hpqlb* at acpi? # HP Quick Launch Buttons 395hpqlb* at acpi? # HP Quick Launch Buttons
390hpet* at acpihpetbus? # High Precision Event Timer (table) 396hpet* at acpihpetbus? # High Precision Event Timer (table)
391hpet* at acpinodebus? # High Precision Event Timer (device) 397hpet* at acpinodebus? # High Precision Event Timer (device)
392joy* at acpi? # Joystick/Game port 398joy* at acpi? # Joystick/Game port
393lpt* at acpi? # Parallel port 399lpt* at acpi? # Parallel port
394mpu* at acpi? # Roland MPU-401 MIDI UART 400mpu* at acpi? # Roland MPU-401 MIDI UART
395pckbc* at acpi? # PC keyboard controller 401pckbc* at acpi? # PC keyboard controller
396pcppi* at acpi? # AT-style speaker sound 402pcppi* at acpi? # AT-style speaker sound
 403sdhc* at acpi? # SD Host Controller
 404sony* at acpi? # Sony Notebook Controller
 405spic* at acpi? # Sony Programmable I/O Controller
 406wsmouse* at spic? # mouse
397thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys 407thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys
398#tpm* at acpi? # ACPI TPM (Experimental) 408tpm* at acpi? # ACPI TPM (Experimental)
399ug* at acpi? # Abit uGuru Hardware monitor 409ug* at acpi? # Abit uGuru Hardware monitor
 410valz* at acpi? # Toshiba Dynabook hotkeys
400wb* at acpi? # Winbond W83L518D SD/MMC reader 411wb* at acpi? # Winbond W83L518D SD/MMC reader
401sdmmc* at wb? # SD/MMC bus 412sdmmc* at wb? # SD/MMC bus
 413sdhc* at acpi? # SD Host Controller
 414sony* at acpi? # Sony Notebook Controller
402wmidell* at acpiwmibus? # Dell WMI mappings 415wmidell* at acpiwmibus? # Dell WMI mappings
403wmieeepc* at acpiwmibus? # Asus Eee PC WMI mappings 416wmieeepc* at acpiwmibus? # Asus Eee PC WMI mappings
404wmihp* at acpiwmibus? # HP WMI mappings 417wmihp* at acpiwmibus? # HP WMI mappings
405wmimsi* at acpiwmibus? # MSI WMI mappings 418wmimsi* at acpiwmibus? # MSI WMI mappings
406wss* at acpi? # NeoMagic 256AV in wss mode 419wss* at acpi? # NeoMagic 256AV in wss mode
407ym* at acpi? # Yamaha OPL3-SA[23] audio 420ym* at acpi? # Yamaha OPL3-SA[23] audio
408 421
409# Sony Vaio jog dial 
410spic* at acpi? # Sony Programmable I/O Controller 
411wsmouse* at spic? 
412 
413# Sony LCD brightness etc. 
414sony* at acpi? # Sony Miscellaneous Controller 
415 
416# Toshiba Libretto devices 
417vald* at acpi? 
418 
419# Apple System Management Controller devices 422# Apple System Management Controller devices
420applesmcfan* at applesmcbus? 423applesmcfan* at applesmcbus?
421applesmctemp* at applesmcbus? 424applesmctemp* at applesmcbus?
422 425
423# PCI bus support 426# PCI bus support
424pci* at mainbus? bus ? 427pci* at mainbus? bus ?
425pci* at pchb? bus ? 428pci* at pchb? bus ?
426pci* at ppb? bus ? 429pci* at ppb? bus ?
427 430
428# Configure PCI using BIOS information 431# Configure PCI using BIOS information
429options PCIBIOS # PCI BIOS support 432options PCIBIOS # PCI BIOS support
430options PCIBIOSVERBOSE # PCI BIOS verbose info 433options PCIBIOSVERBOSE # PCI BIOS verbose info
431options PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11 434options PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
432options PCIBIOS_INTR_GUESS # see pcibios(4) 435options PCIBIOS_INTR_GUESS # see pcibios(4)
433options PCIBIOS_LIBRETTO_FIXUP # this code makes the Toshiba Libretto 436options PCIBIOS_LIBRETTO_FIXUP # this code makes the Toshiba Libretto
434 # L2/L3 work, but should not be enabled 437 # L2/L3 work, but should not be enabled
435 # on anything else. 438 # on anything else.
436options PCIBIOS_SHARP_MM20_FIXUP # this code makes the Sharp MM 20 439options PCIBIOS_SHARP_MM20_FIXUP # this code makes the Sharp MM 20
437 # work, but should not be enabled 440 # work, but should not be enabled
438 # on anything else. 441 # on anything else.
439#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup 442#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
440 443
441# PCI fixups, for both PCIBIOS and ACPI 
442options PCI_ADDR_FIXUP # fixup PCI I/O addresses 
443options PCI_BUS_FIXUP # fixup PCI bus numbering 
444options PCI_INTR_FIXUP # fixup PCI interrupt routing 
445 
446# Temperatures 444# Temperatures
447amdnb_misc* at pci? # AMD NB Misc Configuration 445amdnb_misc* at pci? # AMD NB Misc Configuration
448amdtemp* at amdnb_misc? # AMD CPU Temperature sensors 446amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
449 447
450# PCI bridges 448# PCI bridges
451amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET 
452hpet* at amdpcib? 
453ichlpcib* at pci? dev ? function ? # Intel ICH PCI-ISA w/ timecounter, 
454 # watchdog, gpio, SpeedStep and HPET 
455hpet0 at ichlpcib? # High Precision Event Timer 
456fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator 
457tco* at ichlpcib? # TCO watchdog timer 
458rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/ 449rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/
459pchb* at pci? dev ? function ? # PCI-Host bridges 450pchb* at pci? dev ? function ? # PCI-Host bridges
460options AGP_X86 451options AGP_X86
461pcib* at pci? dev ? function ? # PCI-ISA bridges 452pcib* at pci? dev ? function ? # PCI-ISA bridges
462ppb* at pci? dev ? function ? # PCI-PCI bridges 453ppb* at pci? dev ? function ? # PCI-PCI bridges
463# XXX 'puc's aren't really bridges, but there's no better place for them here 454# XXX 'puc's aren't really bridges, but there's no better place for them here
464puc* at pci? dev ? function ? # PCI "universal" comm. cards 455puc* at pci? dev ? function ? # PCI "universal" comm. cards
465 456
 457amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET
 458hpet* at amdpcib?
 459
466pwdog* at pci? dev ? function ? # QUANCOM PWDOG1 460pwdog* at pci? dev ? function ? # QUANCOM PWDOG1
467 461
468agp* at pchb? 462ichlpcib* at pci? dev ? function ? # Intel ICH PCI-LPC w/ timecounter,
 463 # watchdog, gpio, Speedstep and HPET
 464fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator
 465hpet* at ichlpcib?
 466tco* at ichlpcib? # TCO watch dog timer
 467
 468aapic* at pci? dev ? function ? # AMD 8131 IO apic
469 469
 470agp* at pchb?
470 471
471# ISA bus support 472# ISA bus support
 473isa0 at mainbus?
 474isa0 at pcib?
472isa0 at amdpcib? 475isa0 at amdpcib?
473isa0 at ichlpcib? 476isa0 at ichlpcib?
474isa0 at rdcpcib? 477isa0 at rdcpcib?
475isa0 at mainbus? 478isa0 at rdcpcib?
476isa0 at pcib? 
477 479
478# IBM 4810 BSP cash drawer port 480# IBM 4810 BSP cash drawer port
479ibmcd* at pci? dev ? function ? 481ibmcd* at pci? dev ? function ?
480gpio* at ibmcd? 482gpio* at ibmcd?
481 483
482# CardBus bridge support 484# CardBus bridge support
483cbb* at pci? dev ? function ? 485cbb* at pci? dev ? function ?
484cardslot* at cbb? 486cardslot* at cbb?
485 487
486# CardBus bus support 488# CardBus bus support
487cardbus* at cardslot? 489cardbus* at cardslot?
488pcmcia* at cardslot? 490pcmcia* at cardslot?
489 491
490# Coprocessor Support 492# Coprocessor Support
491 493
492# Console Devices 494# Console Devices
493 495
494# wscons 496# wscons
495pckbc0 at isa? # PC keyboard controller 497pckbc0 at isa? # PC keyboard controller
496pckbd* at pckbc? # PC keyboard 498pckbd* at pckbc? # PC keyboard
497pms* at pckbc? # PS/2 mouse for wsmouse 499pms* at pckbc? # PS/2 mouse for wsmouse
498options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads 500options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
499options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads 501options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
500vga0 at isa? 502vga0 at isa?
501vga* at pci? dev ? function ? 503vga* at pci? dev ? function ?
 504genfb* at pci? dev ? function ?
 505options VCONS_DRAW_INTR
 506wsdisplay* at vga? console ?
 507wsdisplay* at wsemuldisplaydev?
502pcdisplay0 at isa? # CGA, MDA, EGA, HGA 508pcdisplay0 at isa? # CGA, MDA, EGA, HGA
503wskbd* at pckbd? console ? 509wskbd* at pckbd? console ?
504wsmouse* at pms? mux 0 510wsmouse* at pms? mux 0
505 511
506chipsfb* at pci? dev ? function ? 512chipsfb* at pci? dev ? function ?
507genfb* at pci? dev ? function ? 513genfb* at pci? dev ? function ?
508gffb* at pci? dev ? function ? 514gffb* at pci? dev ? function ?
509igsfb* at pci? dev ? function ? 515igsfb* at pci? dev ? function ?
510machfb* at pci? dev ? function ? 516machfb* at pci? dev ? function ?
511pm2fb* at pci? dev ? function ? 517pm2fb* at pci? dev ? function ?
512r128fb* at pci? dev ? function ? 518r128fb* at pci? dev ? function ?
513radeonfb* at pci? dev ? function ? 519radeonfb* at pci? dev ? function ?
514tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics 520tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics
515unichromefb* at pci? dev ? function ? # VIA Unichrome framebuffer console 521unichromefb* at pci? dev ? function ? # VIA Unichrome framebuffer console
516voodoofb* at pci? dev ? function ? 522voodoofb* at pci? dev ? function ?
517wcfb* at pci? dev ? function ? 523wcfb* at pci? dev ? function ?
518wsdisplay* at wsemuldisplaydev? 
519 524
520# DRI legacy drivers 525# DRI legacy drivers
521#i915drm* at drm? # Intel i915, i945 DRM driver 526#i915drm* at drm? # Intel i915, i945 DRM driver
522#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver 527#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
523#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver 528#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
524#r128drm* at drm? # ATI Rage 128 DRM driver 529#r128drm* at drm? # ATI Rage 128 DRM driver
525#radeondrm* at drm? # ATI Radeon DRM driver 530#radeondrm* at drm? # ATI Radeon DRM driver
526#savagedrm* at drm? # S3 Savage DRM driver 531#savagedrm* at drm? # S3 Savage DRM driver
527#sisdrm* at drm? # SiS DRM driver 532#sisdrm* at drm? # SiS DRM driver
528#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver 533#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
529#vboxdrm* at drm? # VirtualBox DRM driver 534#vboxdrm* at drm? # VirtualBox DRM driver
530#viadrm* at drm? # VIA UniChrome DRM driver 535#viadrm* at drm? # VIA UniChrome DRM driver
531 536
@@ -588,26 +593,48 @@ com* at ioat? slave ? @@ -588,26 +593,48 @@ com* at ioat? slave ?
588 593
589# Parallel Printer Interfaces 594# Parallel Printer Interfaces
590 595
591# PCI parallel printer interfaces 596# PCI parallel printer interfaces
592lpt* at puc? port ? # || ports on "universal" comm boards 597lpt* at puc? port ? # || ports on "universal" comm boards
593 598
594# ISA parallel printer interfaces 599# ISA parallel printer interfaces
595lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports 600lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports
596lpt1 at isa? port 0x278 601lpt1 at isa? port 0x278
597lpt2 at isa? port 0x3bc 602lpt2 at isa? port 0x3bc
598 603
599# Hardware monitors 604# Hardware monitors
600 605
 606amdnb_misc* at pci? # AMD NB Misc Configuration
 607amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
 608
 609# Winbond LPC Super I/O
 610wbsio* at isa? port 0x2e
 611wbsio* at isa? port 0x4e
 612
 613# IBM Hawk Integrated Systems Management Processor
 614ibmhawk0 at iic? addr 0x37
 615
 616# LM7[89] and compatible hardware monitors
 617# Use flags to select temp sensor type (see lm(4) man page for details)
 618lm0 at isa? port 0x290 flags 0x0 # other common ports: 0x280, 0x310
 619lm* at wbsio?
 620
 621# SMSC LPC47B397 hardware monitor functions
 622smsc0 at isa? port 0x02e
 623
 624# SMSC LPC47M192 hardware monitor
 625smscmon* at iic? addr 0x2c
 626smscmon* at iic? addr 0x2d # (alternate address)
 627
601# AMD 768 and 8111 power/ACPI controllers 628# AMD 768 and 8111 power/ACPI controllers
602amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface 629amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
603iic* at amdpm? # sensors below are on this bus 630iic* at amdpm? # sensors below are on this bus
604 631
605# Acer Labs M7101 SMBus controller 632# Acer Labs M7101 SMBus controller
606alipm* at pci? dev ? function ? 633alipm* at pci? dev ? function ?
607iic* at alipm? 634iic* at alipm?
608 635
609# Intel ICH SMBus controller 636# Intel ICH SMBus controller
610ichsmb* at pci? dev ? function ? 637ichsmb* at pci? dev ? function ?
611iic* at ichsmb? 638iic* at ichsmb?
612 639
613# NVIDIA nForce2/3/4 SMBus controller 640# NVIDIA nForce2/3/4 SMBus controller
@@ -697,26 +724,29 @@ gpioow* at gpio? offset ? mask ? # 1-wi @@ -697,26 +724,29 @@ gpioow* at gpio? offset ? mask ? # 1-wi
697gpioow* at gpio? 724gpioow* at gpio?
698onewire* at gpioow? 725onewire* at gpioow?
699 726
700# 1-Wire devices 727# 1-Wire devices
701owtemp* at onewire? # Temperature sensors 728owtemp* at onewire? # Temperature sensors
702 729
703# I2C support 730# I2C support
704gpioiic* at gpio? 731gpioiic* at gpio?
705iic* at gpioiic? 732iic* at gpioiic?
706 733
707# Keylock support 734# Keylock support
708gpiolock* at gpio? 735gpiolock* at gpio?
709 736
 737# Pulsing GPIO pins in software
 738gpiopwm* at gpio?
 739
710# Soekris 6501 GPIO/LED driver (provides gpiobus, needs gpio) 740# Soekris 6501 GPIO/LED driver (provides gpiobus, needs gpio)
711soekrisgpio0 at isa? port 0x680 741soekrisgpio0 at isa? port 0x680
712 742
713# SCSI Controllers and Devices 743# SCSI Controllers and Devices
714 744
715# PCI SCSI controllers 745# PCI SCSI controllers
716adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI 746adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
717adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI 747adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
718ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI 748ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
719ahd* at pci? dev ? function ? # Adaptec 29320, 39320 (aic790x) SCSI 749ahd* at pci? dev ? function ? # Adaptec 29320, 39320 (aic790x) SCSI
720bha* at pci? dev ? function ? # BusLogic 9xx SCSI 750bha* at pci? dev ? function ? # BusLogic 9xx SCSI
721dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID 751dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
722iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI 752iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI
@@ -897,71 +927,74 @@ fd0 at fdc0 drive 0 @@ -897,71 +927,74 @@ fd0 at fdc0 drive 0
897# ISA CD-ROM devices 927# ISA CD-ROM devices
898mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives 928mcd0 at isa? port 0x300 irq 10 # Mitsumi CD-ROM drives
899 929
900# ISA tape devices 930# ISA tape devices
901# note: the wt driver conflicts unpleasantly with SMC boards at the 931# note: the wt driver conflicts unpleasantly with SMC boards at the
902# same I/O address. The probe reprograms their EEPROMs. Don't 932# same I/O address. The probe reprograms their EEPROMs. Don't
903# uncomment it unless you are actually using it. 933# uncomment it unless you are actually using it.
904wt0 at isa? port 0x308 irq 5 drq 1 # Archive and Wangtek QIC tape drives 934wt0 at isa? port 0x308 irq 5 drq 1 # Archive and Wangtek QIC tape drives
905 935
906# Network Interfaces 936# Network Interfaces
907 937
908# PCI network interfaces 938# PCI network interfaces
909age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet 939age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet
910an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) 
911alc* at pci? dev ? function ? # Attansic/Atheros L1C/L2C Ethernet 940alc* at pci? dev ? function ? # Attansic/Atheros L1C/L2C Ethernet
912ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet 941ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet
 942an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11)
913ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 943ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11
914athn* at pci? dev ? function ? # Atheros AR9k (802.11a/g/n) 944athn* at pci? dev ? function ? # Atheros AR9k (802.11a/g/n)
915atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) 945atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11)
916bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet 946bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet
917bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet 947bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
918bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet 948bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet
919bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless 949bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless
920cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet 950cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet
921dge* at pci? dev ? function ? # Intel 82597 10GbE LR 951dge* at pci? dev ? function ? # Intel 82597 10GbE LR
922en* at pci? dev ? function ? # ENI/Adaptec ATM 952en* at pci? dev ? function ? # ENI/Adaptec ATM
923ep* at pci? dev ? function ? # 3Com 3c59x 953ep* at pci? dev ? function ? # 3Com 3c59x
924epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet 954epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
925esh* at pci? dev ? function ? # Essential HIPPI card 955esh* at pci? dev ? function ? # Essential HIPPI card
926et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit 956et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
927ex* at pci? dev ? function ? # 3Com 3c90x[BC] 957ex* at pci? dev ? function ? # 3Com 3c90x[BC]
928fpa* at pci? dev ? function ? # DEC DEFPA FDDI 958fpa* at pci? dev ? function ? # DEC DEFPA FDDI
929fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B 959fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
930gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet 960gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet
931gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet 961gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
932hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ 962hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
933ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 963ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100
934iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG 964iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG
935iwm* at pci? dev ? function ? # Intel Wireless WiFi Link 7xxx 965iwm* at pci? dev ? function ? # Intel Wireless WiFi Link 7xxx
936iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN 966iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN
937ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit 967ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit
938jme* at pci? dev ? function ? # JMicron JMC2[56]0 Ethernet 968ixv* at pci? dev ? function ? # Intel 8259x 10G virtual function
 969jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet
 970hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ
939le* at pci? dev ? function ? # PCnet-PCI Ethernet 971le* at pci? dev ? function ? # PCnet-PCI Ethernet
940lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet 972lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
941lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3 973lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
942malo* at pci? dev ? function ? # Marvell Libertas Wireless 974malo* at pci? dev ? function ? # Marvell Libertas Wireless
943mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet 975mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
944msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet 976msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
945mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet 977mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
946#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver 978#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver
947ne* at pci? dev ? function ? # NE2000-compatible Ethernet 979ne* at pci? dev ? function ? # NE2000-compatible Ethernet
948nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet 980nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet
949ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial 981ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
950pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet 982pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet
951ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g 983ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g
952re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S 984re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S
953rtk* at pci? dev ? function ? # Realtek 8129/8139 985rtk* at pci? dev ? function ? # Realtek 8129/8139
954rtw* at pci? dev ? function ? # Realtek 8180L (802.11) 986rtw* at pci? dev ? function ? # Realtek 8180L (802.11)
 987rtwn* at pci? dev ? function ? # Realtek 8188CE/8192CE 802.11b/g/n
955sf* at pci? dev ? function ? # Adaptec AIC-6915 Ethernet 988sf* at pci? dev ? function ? # Adaptec AIC-6915 Ethernet
956sip* at pci? dev ? function ? # SiS 900/DP83815 Ethernet 989sip* at pci? dev ? function ? # SiS 900/DP83815 Ethernet
957skc* at pci? dev ? function ? # SysKonnect SK9821 Gigabit Ethernet 990skc* at pci? dev ? function ? # SysKonnect SK9821 Gigabit Ethernet
958sk* at skc? # SysKonnect SK9821 Gigabit Ethernet 991sk* at skc? # SysKonnect SK9821 Gigabit Ethernet
959ste* at pci? dev ? function ? # Sundance ST-201 Ethernet 992ste* at pci? dev ? function ? # Sundance ST-201 Ethernet
960stge* at pci? dev ? function ? # Sundance/Tamarack TC9021 Gigabit 993stge* at pci? dev ? function ? # Sundance/Tamarack TC9021 Gigabit
961ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet 994ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
962tl* at pci? dev ? function ? # ThunderLAN-based Ethernet 995tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
963tlp* at pci? dev ? function ? # DECchip 21x4x and clones 996tlp* at pci? dev ? function ? # DECchip 21x4x and clones
964txp* at pci? dev ? function ? # 3com 3cr990 997txp* at pci? dev ? function ? # 3com 3cr990
965vge* at pci? dev ? function ? # VIATech VT612X Gigabit Ethernet 998vge* at pci? dev ? function ? # VIATech VT612X Gigabit Ethernet
966vmx* at pci? dev ? function ? # VMware VMXNET3 999vmx* at pci? dev ? function ? # VMware VMXNET3
967vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet 1000vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
@@ -1061,43 +1094,46 @@ qsphy* at mii? phy ? # Quality Semicon @@ -1061,43 +1094,46 @@ qsphy* at mii? phy ? # Quality Semicon
1061rdcphy* at mii? phy ? # RDC R6040 internal PHY 1094rdcphy* at mii? phy ? # RDC R6040 internal PHY
1062rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs 1095rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
1063rlphy* at mii? phy ? # Realtek 8139/8201L PHYs 1096rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
1064sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs 1097sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
1065tlphy* at mii? phy ? # ThunderLAN PHYs 1098tlphy* at mii? phy ? # ThunderLAN PHYs
1066tqphy* at mii? phy ? # TDK Semiconductor PHYs 1099tqphy* at mii? phy ? # TDK Semiconductor PHYs
1067ukphy* at mii? phy ? # generic unknown PHYs 1100ukphy* at mii? phy ? # generic unknown PHYs
1068urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs 1101urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
1069 1102
1070 1103
1071# USB Controller and Devices 1104# USB Controller and Devices
1072 1105
1073# PCI USB controllers 1106# PCI USB controllers
 1107xhci* at pci? dev ? function ? # eXtensible Host Controller
 1108 # xhci is at best experimental
1074ehci* at pci? dev ? function ? # Enhanced Host Controller 1109ehci* at pci? dev ? function ? # Enhanced Host Controller
1075ohci* at pci? dev ? function ? # Open Host Controller 1110ohci* at pci? dev ? function ? # Open Host Controller
1076uhci* at pci? dev ? function ? # Universal Host Controller (Intel) 1111uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
1077xhci* at pci? dev ? function ? # eXtensible Host Controller 1112xhci* at pci? dev ? function ? # eXtensible Host Controller
1078 1113
1079# CardBus USB controllers 1114# CardBus USB controllers
1080ehci* at cardbus? function ? # Enhanced Host Controller 1115ehci* at cardbus? function ? # Enhanced Host Controller
1081ohci* at cardbus? function ? # Open Host Controller 1116ohci* at cardbus? function ? # Open Host Controller
1082uhci* at cardbus? function ? # Universal Host Controller (Intel) 1117uhci* at cardbus? function ? # Universal Host Controller (Intel)
1083 1118
1084# ISA USB controllers 1119# ISA USB controllers
1085slhci0 at isa? port 0x300 irq 5 # ScanLogic SL811HS 1120slhci0 at isa? port 0x300 irq 5 # ScanLogic SL811HS
1086 1121
1087# PCMCIA USB controllers 1122# PCMCIA USB controllers
1088slhci* at pcmcia? function ? # ScanLogic SL811HS 1123slhci* at pcmcia? function ? # ScanLogic SL811HS
1089 1124
1090# USB bus support 1125# USB bus support
 1126usb* at xhci?
1091usb* at ehci? 1127usb* at ehci?
1092usb* at ohci? 1128usb* at ohci?
1093usb* at slhci? 1129usb* at slhci?
1094usb* at uhci? 1130usb* at uhci?
1095usb* at xhci? 1131usb* at xhci?
1096 1132
1097# USB Hubs 1133# USB Hubs
1098uhub* at usb? 1134uhub* at usb?
1099uhub* at uhub? port ? 1135uhub* at uhub? port ?
1100 1136
1101# USB HID device 1137# USB HID device
1102uhidev* at uhub? port ? configuration ? interface ? 1138uhidev* at uhub? port ? configuration ? interface ?
1103 1139
@@ -1169,29 +1205,31 @@ ustir* at uhub? port ? @@ -1169,29 +1205,31 @@ ustir* at uhub? port ?
1169irframe* at ustir? 1205irframe* at ustir?
1170 1206
1171# KingSun/DonShine USB/IrDA Bridge 1207# KingSun/DonShine USB/IrDA Bridge
1172udsir* at uhub? port ? 1208udsir* at uhub? port ?
1173irframe* at udsir? 1209irframe* at udsir?
1174 1210
1175# Windows Media Center IR tranceiver 1211# Windows Media Center IR tranceiver
1176irmce* at uhub? port ? 1212irmce* at uhub? port ?
1177cir* at irmce? 1213cir* at irmce?
1178 1214
1179# USB Ethernet adapters 1215# USB Ethernet adapters
1180aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters 1216aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
1181axe* at uhub? port ? # ASIX AX88172 based adapters 1217axe* at uhub? port ? # ASIX AX88172 based adapters
 1218axen* at uhub? port ? # ASIX AX88178a/AX88179 based adapters
1182cdce* at uhub? port ? # CDC, Ethernet Networking Control Model 1219cdce* at uhub? port ? # CDC, Ethernet Networking Control Model
1183cue* at uhub? port ? # CATC USB-EL1201A based adapters 1220cue* at uhub? port ? # CATC USB-EL1201A based adapters
1184kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters 1221kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
 1222#mos* at uhub? port ? # Moschip MCS7730/MCS7830/MCS7832 based adapters
1185udav* at uhub? port ? # Davicom DM9601 based adapters 1223udav* at uhub? port ? # Davicom DM9601 based adapters
1186url* at uhub? port ? # Realtek RTL8150L based adapters 1224url* at uhub? port ? # Realtek RTL8150L based adapters
1187urndis* at uhub? port ? # Microsoft RNDIS specification 1225urndis* at uhub? port ? # Microsoft RNDIS specification
1188 1226
1189# USB 802.11 adapters 1227# USB 802.11 adapters
1190atu* at uhub? port ? # Atmel AT76C50XX based adapters 1228atu* at uhub? port ? # Atmel AT76C50XX based adapters
1191athn* at uhub? port ? # Atheros AR9002U 1229athn* at uhub? port ? # Atheros AR9002U
1192otus* at uhub? port ? # Atheros AR9001U 1230otus* at uhub? port ? # Atheros AR9001U
1193ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g 1231ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
1194rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g 1232rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
1195run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n 1233run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
1196upgt* at uhub? port ? # Intersil PrismGT 1234upgt* at uhub? port ? # Intersil PrismGT
1197urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g 1235urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g
@@ -1401,30 +1439,34 @@ sf2r0 at isa? port 0x384 # SoundForte Ra @@ -1401,30 +1439,34 @@ sf2r0 at isa? port 0x384 # SoundForte Ra
1401# PCI radio devices 1439# PCI radio devices
1402gtp* at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card 1440gtp* at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
1403 1441
1404# Radio support 1442# Radio support
1405radio* at az? 1443radio* at az?
1406radio* at gtp? 1444radio* at gtp?
1407radio* at rt? 1445radio* at rt?
1408radio* at rtii? 1446radio* at rtii?
1409radio* at sf2r? 1447radio* at sf2r?
1410 1448
1411 1449
1412# Video capture devices 1450# Video capture devices
1413 1451
1414pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam 1452auvitek* at uhub? # Auvitek AU0828 USB TV
1415uvideo* at uhub? # USB Video Class capture devices 1453coram* at pci? dev ? function ? # Conexant CX23885 PCI-E TV
1416auvitek* at uhub? # Auvitek AU0828 video capture devices 1454cxdtv* at pci? dev ? function ? # Conexant CX2388[0-3] PCI TV
1417emdtv* at uhub? # Empia EM28xx video capture devices 1455emdtv* at uhub? # Empia EM28xx USB TV
 1456cir* at emdtv?
 1457pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
 1458uvideo* at uhub? # USB Video Class capture devices
 1459
1418video* at videobus? 1460video* at videobus?
1419dtv* at dtvbus? 1461dtv* at dtvbus?
1420 1462
1421 1463
1422# TV cards 1464# TV cards
1423 1465
1424# Brooktree 848/849/878/879 based TV cards 1466# Brooktree 848/849/878/879 based TV cards
1425bktr* at pci? dev ? function ? 1467bktr* at pci? dev ? function ?
1426radio* at bktr? 1468radio* at bktr?
1427 1469
1428# Conexant CX2388[0-3]-based DTV cards 1470# Conexant CX2388[0-3]-based DTV cards
1429cxdtv* at pci? dev ? function ? 1471cxdtv* at pci? dev ? function ?
1430iic* at cxdtv? 1472iic* at cxdtv?
@@ -1504,26 +1546,28 @@ joy0 at isa? port 0x201 @@ -1504,26 +1546,28 @@ joy0 at isa? port 0x201
1504 1546
1505# Planetconnect Satellite receiver driver. 1547# Planetconnect Satellite receiver driver.
1506satlink0 at isa? port 0x300 drq 1 1548satlink0 at isa? port 0x300 drq 1
1507 1549
1508# Middle Digital, Inc. PCI-Weasel serial console board control 1550# Middle Digital, Inc. PCI-Weasel serial console board control
1509# devices (watchdog timer, etc.) 1551# devices (watchdog timer, etc.)
1510weasel* at pci? 1552weasel* at pci?
1511 1553
1512# Virtio devices 1554# Virtio devices
1513virtio* at pci? dev ? function ? # Virtio PCI device 1555virtio* at pci? dev ? function ? # Virtio PCI device
1514viomb* at virtio? # Virtio memory balloon device 1556viomb* at virtio? # Virtio memory balloon device
1515ld* at virtio? # Virtio disk device 1557ld* at virtio? # Virtio disk device
1516vioif* at virtio? # Virtio network device 1558vioif* at virtio? # Virtio network device
 1559viornd* at virtio? # Virtio entropy device
 1560vioscsi* at virtio? # Virtio SCSI device
1517 1561
1518# Flash subsystem 1562# Flash subsystem
1519flash* at flashbus? 1563flash* at flashbus?
1520 1564
1521# NAND subsystem 1565# NAND subsystem
1522nand* at nandbus? 1566nand* at nandbus?
1523 1567
1524# Pull in optional local configuration 1568# Pull in optional local configuration
1525#include "arch/amd64/conf/ALL.local" 1569#include "arch/amd64/conf/ALL.local"
1526 1570
1527 1571
1528# Pseudo-Devices 1572# Pseudo-Devices
1529 1573
@@ -1649,29 +1693,31 @@ options FILEASSOC # fileassoc(9) - req @@ -1649,29 +1693,31 @@ options FILEASSOC # fileassoc(9) - req
1649pseudo-device veriexec 1693pseudo-device veriexec
1650# 1694#
1651# Uncomment the fingerprint methods below that are desired. Note that 1695# Uncomment the fingerprint methods below that are desired. Note that
1652# removing fingerprint methods will have almost no impact on the kernel 1696# removing fingerprint methods will have almost no impact on the kernel
1653# code size. 1697# code size.
1654# 1698#
1655options VERIFIED_EXEC_FP_RMD160 1699options VERIFIED_EXEC_FP_RMD160
1656options VERIFIED_EXEC_FP_SHA256 1700options VERIFIED_EXEC_FP_SHA256
1657options VERIFIED_EXEC_FP_SHA384 1701options VERIFIED_EXEC_FP_SHA384
1658options VERIFIED_EXEC_FP_SHA512 1702options VERIFIED_EXEC_FP_SHA512
1659options VERIFIED_EXEC_FP_SHA1 1703options VERIFIED_EXEC_FP_SHA1
1660options VERIFIED_EXEC_FP_MD5 1704options VERIFIED_EXEC_FP_MD5
1661 1705
1662options PAX_MPROTECT=0 # PaX mprotect(2) restrictions 1706options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
1663options PAX_ASLR=0 # PaX Address Space Layout Randomization 1707options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
1664#options PAX_SEGVGUARD=0 # PaX Segmentation fault guard 1708options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
 1709options PAX_ASLR=1 # PaX Address Space Layout Randomization
 1710options PAX_ASLR_DEBUG=1 # PaX ASLR debug
1665 1711
1666# 1712#
1667# NetBSD: GENERIC_ISDN,v 1.16 2010/01/03 03:53:34 dholland Exp 1713# NetBSD: GENERIC_ISDN,v 1.16 2010/01/03 03:53:34 dholland Exp
1668# 1714#
1669 1715
1670#--------------------------------------------------------------------- 1716#---------------------------------------------------------------------
1671# Various ISDN board drivers: 1717# Various ISDN board drivers:
1672#--------------------------------------------------------------------- 1718#---------------------------------------------------------------------
1673# Legacy ISA cards (no P&P support): 1719# Legacy ISA cards (no P&P support):
1674# 1720#
1675# Teles S0/8 or Niccy 1008 1721# Teles S0/8 or Niccy 1008
1676options ISICISA_TEL_S0_8 1722options ISICISA_TEL_S0_8
1677#isic0 at isa? iomem 0xd0000 irq 2 1723#isic0 at isa? iomem 0xd0000 irq 2