Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/GENERIC,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.925.2.7 retrieving revision 1.926 diff -u -p -r1.925.2.7 -r1.926 --- src/sys/arch/i386/conf/GENERIC 2011/08/27 15:37:23 1.925.2.7 +++ src/sys/arch/i386/conf/GENERIC 2009/02/16 22:43:47 1.926 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.925.2.7 2011/08/27 15:37:23 jym Exp $ +# $NetBSD: GENERIC,v 1.926 2009/02/16 22:43:47 jmcneill Exp $ # # GENERIC machine description file # @@ -22,23 +22,38 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.925.2.7 $" +#ident "GENERIC-$Revision: 1.926 $" maxusers 64 # estimated number of users +makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486, + # tune for more modern + +# For GENERIC, we build the exec formats as modules by default. +no options EXEC_AOUT # exec a.out binaries +no options EXEC_ELF32 # exec ELF binaries +no options EXEC_SCRIPT # exec #! scripts +no options COREDUMP + # CPU-related options. options VM86 # virtual 8086 emulation options USER_LDT # user-settable LDT; used by WINE -#options PAE # PAE mode (36 bits physical addressing) -# CPU features -acpicpu* at cpu? # ACPI CPU (including frequency scaling) -coretemp* at cpu? # Intel on-die thermal sensor -est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) -#odcm0 at cpu0 # On-demand clock modulation -#padlock0 at cpu0 # VIA PadLock -powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI) -viac7temp* at cpu? # VIA C7 temperature sensor +# 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 + +# VIA PadLock +#options VIA_PADLOCK + +# Intel(R) On Demand Clock Modulation (aka ODCM) +#options INTEL_ONDEMAND_CLOCKMOD options MTRR # memory-type range register syscall support # doesn't work with MP just yet.. @@ -84,9 +99,10 @@ options KTRACE # system call tracing v 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 P1003_1B_SEMAPHORE # p1003.1b semaphore support +no options AIO # POSIX AIO, built as a module -options MODULAR # new style module(7) framework +options MODULAR # new style module framework options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) @@ -105,10 +121,8 @@ options SYSCTL_INCLUDE_DESCR # Include options BUFQ_PRIOCSCAN # Diagnostic/debugging support options -options DIAGNOSTIC # expensive kernel consistency checks - # XXX to be commented out on release branch +#options DIAGNOSTIC # expensive kernel consistency checks #options DEBUG # expensive debugging checks/support -#options LOCKDEBUG # expensive locking checks/support #options KMEMSTATS # kernel memory statistics (vmstat -m) options DDB # in-kernel debugger #options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic' @@ -116,35 +130,39 @@ options DDB_HISTORY_SIZE=512 # enable h #options DDB_VERBOSE_HELP #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 -#makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table #options SYSCALL_STATS # per syscall counts #options SYSCALL_TIMES # per syscall times #options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) -# 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 -options COMPAT_40 # NetBSD 4.0 -options COMPAT_50 # NetBSD 5.0 -options COMPAT_43 # 4.3BSD, 386BSD, and BSDI +# Compatibility options, built as modules by default +#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 +#options COMPAT_40 # NetBSD 4.0 +#options COMPAT_50 # NetBSD 5.0 +#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI #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_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_NDIS # NDIS network driver +#options COMPAT_PECOFF # kernel support to run Win32 apps options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Wedge support @@ -154,52 +172,48 @@ options DKWEDGE_METHOD_GPT # Supports G #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges -file-system FFS # UFS -file-system NFS # Network File System client -file-system EXT2FS # second extended file system (linux) -file-system LFS # log-structured file system -file-system MFS # memory file system -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 PROCFS # /proc -file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) -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/ptm support -file-system TMPFS # Efficient memory file-system -#file-system UDF # experimental - OSTA UDF CD/DVD file-system -#file-system HFS # experimental - Apple HFS+ (read-only) -#file-system NILFS # experimental - NTT's NiLFS(2) -#file-system V7FS # 7th Edition(V7) File System +# File systems, built as modules by default +#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/ptm support +#file-system TMPFS # Efficient memory file-system +#file-system UDF # experimental - OSTA UDF CD/DVD file-system +#file-system HFS # experimental - Apple HFS+ (read-only) # File system options -options QUOTA # legacy UFS quotas -options QUOTA2 # new, in-filesystem UFS quotas +#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 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. -#options V7FS_EI # V7FS Endian Independent support # Networking options #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP -options INET6 # IPv6 +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 MPLS # MultiProtocol Label Switching (needs ifmpls) #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast #options ISO,TPIP # OSI @@ -211,7 +225,6 @@ options PPP_FILTER # Active filter supp options PFIL_HOOKS # pfil(9) packet filter hooks options IPFILTER_LOG # ipmon(8) log support options IPFILTER_LOOKUP # ippool(8) support -options IPFILTER_COMPAT # Compat for IP-Filter #options IPFILTER_DEFAULT_BLOCK # block all packets by default #options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG @@ -287,12 +300,9 @@ options PCDISPLAY_SOFTCURSOR options WSDISPLAY_SCROLLSUPPORT # enable VGA raster mode capable of displaying multilingual text on console #options VGA_RASTERCONSOLE -# enable splash screen support; requires genfb or radeonfb +# enable splash screen support; requires hw driver support #options SPLASHSCREEN - -# Keylock support -#options KEYLOCK -#options secmodel_keylock # Requires options KEYLOCK +#options SPLASHSCREEN_PROGRESS # Kernel root file system and dump configuration. config netbsd root on ? type ? @@ -304,9 +314,9 @@ config netbsd root on ? type ? # # Doesn't do anything yet. -#p64h2apic* at pci? dev? function? # P64H2 IOxAPIC +#p64h2apic* at pci? dev? function? # P64H2 IOxAPIC -#apm0 at mainbus0 # Advanced power management +#apm0 at mainbus0 # Advanced power management # Tuning for power management, see apm(4) for more details. #options APM_NO_IDLE # Don't call BIOS CPU idle function @@ -328,63 +338,54 @@ ipmi0 at mainbus? #options MPBIOS_SCANPCI # find PCI roots using MPBIOS options ACPI_SCANPCI # find PCI roots using ACPI -acpi0 at mainbus0 +acpi0 at mainbus0 #options ACPI_ACTIVATE_DEV # If set, activate inactive devices +#options ACPICA_PEDANTIC # force strict conformance to the Spec. options VGA_POST # in-kernel support for VGA POST # ACPI devices apm* at acpi? # ACPI apm emulation -acpiacad* at acpi? # ACPI AC Adapter -acpibat* at acpi? # ACPI Battery -acpibut* at acpi? # ACPI Button +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 (late) -acpiecdt* at acpi? # ACPI Embedded Controller (early) -acpifan* at acpi? # ACPI Fan -acpilid* at acpi? # ACPI Lid Switch -#acpipmtr* at acpi? # ACPI Power Meter (experimental) -#acpismbus* at acpi? # ACPI SMBus CMI (experimental) +# 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 acpitz* at acpi? # ACPI Thermal Zone -acpivga* at acpi? # ACPI Display Adapter -acpiout* at acpivga? # ACPI Display Output Device -acpiwdrt* at acpi? # ACPI Watchdog Resource Table -acpiwmi* at acpi? # ACPI WMI Mapper # Mainboard devices -aibs* at acpi? # ASUSTeK AI Booster hardware monitor +aiboost* at acpi? # ASUS AI Booster Hardware Monitor asus* at acpi? # ASUS hotkeys attimer* at acpi? # AT Timer -#com* at acpi? # Serial communications interface -#fdc* at acpi? # Floppy disk controller -fujbp* at acpi? # Fujitsu Brightness & Pointer -fujhk* at acpi? # Fujitsu Hotkeys -#hpacel* at acpi? # HP 3D DriveGuard accelerometer -#hpqlb* at acpi? # HP Quick Launch Buttons -hpet* at acpihpetbus? # High Precision Event Timer (table) -hpet* at acpinodebus? # High Precision Event Timer (device) +#com* at acpi? # Serial communications interface +#fdc* at acpi? # Floppy disk controller +hpqlb* at acpi? # HP Quick Launch Buttons +hpet* at acpi? # High Precision Event Timer joy* at acpi? # Joystick/Game port -#lpt* at acpi? # Parallel port +#lpt* at acpi? # Parallel port mpu* at acpi? # Roland MPU-401 MIDI UART npx* at acpi? # Math coprocessor -pckbc* at acpi? # PC keyboard controller -pcppi* at acpi? # AT-style speaker sound -sony* at acpi? # Sony Miscellaneous Controller +pckbc* at acpi? # PC keyboard controller +pcppi* at acpi? # AT-style speaker sound thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys -ug* at acpi? # Abit uGuru Hardware monitor -vald* at acpi? # Toshiba Libretto hotkeys -wb* at acpi? # Winbond W83L518D SD/MMC reader -sdmmc* at wb? # SD/MMC bus -wmidell* at acpiwmibus? # Dell WMI mappings -wmieeepc* at acpiwmibus? # Asus Eee PC WMI mappings -wmihp* at acpiwmibus? # HP WMI mappings -wmimsi* at acpiwmibus? # MSI WMI mappings -wss* at acpi? # NeoMagic 256AV in wss mode -ym* at acpi? # Yamaha OPL3-SA[23] audio +ug* at acpi? # Abit uGuru Hardware monitor +wss* at acpi? # NeoMagic 256AV in wss mode +ym* at acpi? # Yamaha OPL3-SA[23] audio # Sony Vaio jog dial -spic* at acpi? # Sony Programmable I/O Controller -wsmouse* at spic? +spic* at acpi? # Sony Programmable I/O Controller +wsmouse* at spic? + +# Sony LCD brightness etc. +sony* at acpi? # Sony Miscellaneous Controller + +# Toshiba Libretto devices +vald* at acpi? # Plug-and-Play BIOS and attached devices @@ -441,26 +442,23 @@ pci* at elansc? bus ? # System Controllers elansc* at mainbus? bus ? # AMD Elan SC520 System Controller -gpio* at elansc? +gpio* at elansc? # Temperatures -amdtemp* at pchb? # AMD CPU Temperature sensors +amdtemp* at pci? dev ? function ? # AMD CPU Temperature sensors # PCI bridges #amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET -#hpet* at amdpcib? -ichlpcib* at pci? dev ? function ? # Intel ICH PCI-LPC w/ timecounter, +#hpet* at amdpcib? +ichlpcib* at pci? dev ? function ? # Intel ICH PCI-ISA w/ timecounter, # watchdog, SpeedStep and HPET -fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator -#hpet* at ichlpcib? +#hpet* at ichlpcib? gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/ -gpio* at gcscpcib? # timecounter, watchdog and GPIO +gpio* at gcscpcib? # timecounter, watchdog and GPIO #piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep -gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA w/ GPIO -viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support -iic* at viapcib? -rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/ - # watchdog +#gscpcib* at pci? dev ? function ? # NS Geode PCI-ISA w/ GPIO support +#viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support +#iic* at viapcib? pchb* at pci? dev ? function ? # PCI-Host bridges pceb* at pci? dev ? function ? # PCI-EISA bridges pcib* at pci? dev ? function ? # PCI-ISA bridges @@ -469,9 +467,7 @@ ppb* at pci? dev ? function ? # PCI-PCI # XXX 'puc's aren't really bridges, but there's no better place for them here puc* at pci? dev ? function ? # PCI "universal" comm. cards -pwdog* at pci ? dev ? function ? # QUANCOM PWDOG1 - -agp* at pchb? +agp* at pchb? # EISA bus support @@ -479,13 +475,12 @@ eisa0 at mainbus? eisa0 at pceb? # ISA bus support -#isa0 at amdpcib? -isa0 at gcscpcib? +#isa0 at amdpcib? +isa0 at gcscpcib? isa0 at ichlpcib? #isa0 at piixpcib? #isa0 at gscpcib? -isa0 at viapcib? -isa0 at rdcpcib? +#isa0 at viapcib? isa0 at mainbus? isa0 at pceb? isa0 at pcib? @@ -529,7 +524,7 @@ npx0 at isa? port 0xf0 irq 13 # x86 math # Console Devices # wscons -pckbc0 at isa? # PC keyboard controller +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 @@ -538,35 +533,23 @@ options PMS_ELANTECH_TOUCHPAD # Enable vga0 at isa? vga* at pci? dev ? function ? pcdisplay0 at isa? # CGA, MDA, EGA, HGA -genfb* at pci? dev ? function ? -options VCONS_DRAW_INTR +genfb* at pci? def ? function ? #machfb* at pci? dev ? function ? # ATI Mach64 framebuffer driver wsdisplay* at vga? console ? wsdisplay* at pcdisplay? console ? wsdisplay* at wsemuldisplaydev? -#wsdisplay* at machfb? console ? +#wsdisplay* at machfb? console ? wskbd* at pckbd? console ? wsmouse* at pms? mux 0 # VIA Unichrome framebuffer console -#unichromefb* at pci? dev ? function ? -#wsdisplay* at unichromefb? +#unichromefb* at pci? dev ? function ? +#wsdisplay* at unichromefb? attimer0 at isa? pcppi0 at isa? sysbeep0 at pcppi? -# DRI driver -i915drm* at drm? # Intel i915, i945 DRM driver -mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver -mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver -r128drm* at drm? # ATI Rage 128 DRM driver -radeondrm* at drm? # ATI Radeon DRM driver -savagedrm* at drm? # S3 Savage DRM driver -sisdrm* at drm? # SiS DRM driver -tdfxdrm* at drm? # 3dfx (voodoo) DRM driver -viadrm* at drm? # VIA DRM driver - # Serial Devices # PCI serial interfaces @@ -627,18 +610,17 @@ lpt2 at isa? port 0x3bc # AMD 768 and 8111 power/ACPI controllers amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface -iic* at amdpm? +#iic* at amdpm? # sensors below are on this bus -# Acer Labs M7101 SMBus controller -alipm* at pci? dev ? function ? -iic* at alipm? +# Intel Core's on-die Thermal sensor +options INTEL_CORETEMP # Intel ICH SMBus controller -ichsmb* at pci? dev ? function ? +ichsmb* at pci? dev ? function ? iic* at ichsmb? # NVIDIA nForce2/3/4 SMBus controller -nfsmbc* at pci? dev ? function ? +nfsmbc* at pci? dev ? function ? nfsmb* at nfsmbc? iic* at nfsmb? @@ -652,7 +634,7 @@ iic* at piixpm? # SMBus on PIIX4 #dbcool* at iic? addr 0x2E # Tyan S2882-D # IBM Thinkpad Active Protection System -#aps0 at isa? port 0x1600 +#aps0 at isa? port 0x1600 # Fintek Super I/O with hardware monitor #finsio0 at isa? port 0x4e @@ -660,44 +642,27 @@ iic* at piixpm? # SMBus on PIIX4 # iTE IT87xxF Super I/O with watchdog and sensors support #itesio0 at isa? port 0x2e -# Winbond LPC Super I/O -#wbsio* at isa? port 0x2e -#wbsio* at isa? port 0x4e - -# IBM Hawk Integrated Systems Management Processor -#ibmhawk0 at iic? addr 0x37 - # LM7[89] and compatible hardware monitors -# Use flags to select temp sensor type (see lm(4) man page for details) -#lm0 at isa? port 0x290 flags 0x0 # other common: 0x280, 0x310 -#lm* at wbsio? +#lm0 at isa? port 0x290 # other common: 0x280, 0x310 # SMSC LPC47B397 hardware monitor functions #smsc0 at isa? port 0x02e -# SMSC LPC47M192 hardware monitor -#smscmon* at iic? addr 0x2c -#smscmon* at iic? addr 0x2d # (alternate address) - # PC87366 hardware monitor #nsclpcsio* at isa? #gpio* at nsclpcsio? # Abit uGuru Hardware system monitor -#ug0 at isa? port 0xe0 +#ug0 at isa? port 0xe0 # VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer -#viaenv* at pci? dev ? function ? +#viaenv* at pci? dev ? function ? # Serial Presence Detect capable memory modules #spdmem* at iic? addr 0x50 #spdmem* at iic? addr 0x51 #spdmem* at iic? addr 0x52 #spdmem* at iic? addr 0x53 -#spdmem* at iic? addr 0x54 -#spdmem* at iic? addr 0x55 -#spdmem* at iic? addr 0x56 -#spdmem* at iic? addr 0x57 # I2O devices iop* at pci? dev ? function ? # I/O processor @@ -706,23 +671,14 @@ ld* at iop? tid ? # block devices dpti* at iop? tid 0 # DPT/Adaptec control interface # GPIO devices -gpio* at gscpcib? -#gpio* at gpiosim? +#gpio* at gscpcib? # 1-Wire support -#gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio -gpioow* at gpio? -onewire* at gpioow? +#gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio +#onewire* at gpioow? # 1-Wire devices -owtemp* at onewire? # Temperature sensors - -# i2c support -gpioiic* at gpio? -iic* at gpioiic? - -# Keylock support -#gpiolock* at gpio? +#owtemp* at onewire? # Temperature sensors # SCSI Controllers and Devices @@ -755,10 +711,10 @@ uha* at eisa? slot ? # UltraStor 24f S # PCMCIA SCSI controllers aic* at pcmcia? function ? # Adaptec APA-1460 SCSI esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI -spc* at pcmcia? function ? # Fujitsu MB87030/MB89352 SCSI +spc* at pcmcia? function ? # Fujitsu MB87030/MB89352 SCSI # ISA Plug-and-Play SCSI controllers -aha* at isapnp? # Adaptec AHA-154[02 +aha* at isapnp? # Adaptec AHA-154[02 aic* at isapnp? # Adaptec AHA-1520B # ISA SCSI controllers @@ -830,33 +786,29 @@ icpsp* at icp? unit ? # SCSI pass-thro # 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 +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 -gcscide* at pci? dev ? function ? # AMD CS5535 Companion IDE controllers -geodeide* at pci? dev ? function ? # AMD Geode IDE controllers +gcscide* at pci? dev ? function ? # AMD CS5535 Companion 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? -mvsata* at pci? dev ? function ? # Marvell Hercules-I/II -optiide* at pci? dev ? function ? # Opti IDE controllers -piixide* at pci? dev ? function ? # Intel 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 -rdcide* at pci? dev ? function ? # RDC PMX-1000 IDE controllers satalink* at pci? dev ? function ? # SiI SATALink controllers -schide* at pci? dev ? function ? # Intel SCH IDE controllers siisata* at pci? dev ? function ? # SiI SteelVine controllers siside* at pci? dev ? function ? # SiS IDE controllers -slide* at pci? dev ? function ? # Symphony Labs IDE controllers -svwsata* at pci? dev ? function ? # ServerWorks SATA controllers +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 -toshide* at pci? dev ? function ? # TOSHIBA PICCOLO controllers viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers # ISA Plug-and-Play IDE controllers @@ -867,7 +819,6 @@ wdc* at pcmcia? function ? # CardBus IDE controllers njata* at cardbus? function ? flags 0x01 # Workbit NinjaATA-32 -siisata* at cardbus? function ? # SiI SteelVine controllers # ISA ST506, ESDI, and IDE controllers # Use flags 0x01 if you want to try to use 32bits data I/O (the driver will @@ -878,7 +829,7 @@ wdc1 at isa? port 0x170 irq 15 flags 0x0 # ATA (IDE) bus support atabus* at ata? -options ATADEBUG +options ATADEBUG # IDE drives # Flags are used only with controllers that support DMA operations @@ -934,23 +885,18 @@ ed* at edc? # Network Interfaces # PCI network interfaces -age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) -alc* at pci? dev ? function ? # Attansic/Atheros L1C/L2C Ethernet -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 -bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless +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 -et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit -ex* at pci? dev ? function ? # 3Com 3c90x[BC] +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 @@ -958,14 +904,14 @@ hme* at pci? dev ? function ? # Sun Micr 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 +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 -#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver +#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver 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 @@ -984,7 +930,6 @@ ti* at pci? dev ? function ? # Alteon AC tl* at pci? dev ? function ? # ThunderLAN-based Ethernet tlp* at pci? dev ? function ? # DECchip 21x4x and clones txp* at pci? dev ? function ? # 3com 3cr990 -vte* at pci? dev ? function ? # RDC R6040 10/100 Ethernet 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) @@ -1003,7 +948,7 @@ ep* at isapnp? # 3Com 3c509 Ethernet fmv* at isapnp? # Fujitsu FMV-183 le* at isapnp? # AMD PCnet-ISA Ethernet ne* at isapnp? # NE2000-compatible Ethernet -tr* at isapnp? # IBM/3Com TROPIC Token-Ring +tr* at isapnp? # IBM/3COM TROPIC Token-Ring # PCMCIA network interfaces an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11) @@ -1017,7 +962,7 @@ ray* at pcmcia? function ? # Raytheon R sm* at pcmcia? function ? # Megahertz Ethernet # tr at pcmcia has problems with Cardbus bridges #tr* at pcmcia? function ? # TROPIC based Token-Ring -wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11) +wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11) xirc* at pcmcia? function ? # Xircom CreditCard Ethernet com* at xirc? xi* at xirc? @@ -1029,10 +974,10 @@ sm* at mhzc? ate0 at isa? port 0x2a0 irq ? # AT1700 cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet -eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards -el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards -ep* at isa? port ? irq ? # 3c509 Ethernet cards -ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507 +eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards +el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards +ep* at isa? port ? irq ? # 3C509 ethernet cards +ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507 ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN fmv0 at isa? port 0x2a0 irq ? # FMV-181/182 ix0 at isa? port 0x300 irq 10 # EtherExpress/16 @@ -1045,19 +990,19 @@ le* at nele? #ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan le* at bicc? -ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards +ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards ne1 at isa? port 0x300 irq 10 sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring -tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring +tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet we1 at isa? port 0x300 iomem 0xcc000 irq 10 # CardBus network cards ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 atw* at cardbus? function ? # ADMtek ADM8211 (802.11) -ex* at cardbus? function ? # 3Com 3c575TX +ex* at cardbus? function ? # 3Com 3C575TX fxp* at cardbus? function ? # Intel i8255x ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g re* at cardbus? function ? # Realtek 8139C+/8169/8169S/8110S @@ -1078,19 +1023,16 @@ le* at mca? slot ? # SKNET Personal/MC # 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 -etphy* at mii? phy ? # Agere/LSI ET1011 TruePHY Gig-E 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 -ihphy* at mii? phy ? # Intel 82577 PHYs ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs @@ -1100,7 +1042,6 @@ 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 -rdcphy* at mii? phy ? # RDC R6040 10/100 PHY 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 @@ -1141,7 +1082,7 @@ uhub* at usb? uhub* at uhub? port ? # USB HID device -uhidev* at uhub? port ? configuration ? interface ? +uhidev* at uhub? port ? configuration ? interface ? # USB Mice ums* at uhidev? reportid ? @@ -1155,56 +1096,45 @@ wsmouse* at uep? mux 0 ukbd* at uhidev? reportid ? wskbd* at ukbd? console ? mux 1 -# USB TEMPer and TEMPerHUM -uthum* at uhidev? reportid ? - # USB serial adapter -ucycom* at uhidev? reportid ? +ucycom* at uhidev? reportid ? # USB Generic HID devices uhid* at uhidev? reportid ? -# USB LCDs and USB-VGA adaptors -udl* at uhub? port ? # DisplayLink DL-1x0/1x5 -wsdisplay* at udl? - # USB Printer ulpt* at uhub? port ? configuration ? interface ? # USB Modem -umodem* at uhub? port ? configuration ? +umodem* at uhub? port ? configuration ? ucom* at umodem? -# Option N.V. Wireless WAN modems -uhso* at uhub? port ? configuration ? +# 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 ? -uaudio* at usbifif? +uaudio* at uhub? port ? configuration ? # USB MIDI -umidi* at uhub? port ? configuration ? +umidi* at uhub? port ? configuration ? # USB IrDA # USB-IrDA bridge spec -uirda* at uhub? port ? configuration ? interface ? +uirda* at uhub? port ? configuration ? interface ? irframe* at uirda? stuirda* at uhub? port ? configuration ? interface ? irframe* at stuirda? # SigmaTel STIr4200 USB/IrDA Bridge -ustir* at uhub? port ? +ustir* at uhub? port ? irframe* at ustir? -# Windows Media Center IR transceiver -irmce* at uhub? port ? -cir* at irmce? - # USB Ethernet adapters aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters axe* at uhub? port ? # ASIX AX88172 based adapters @@ -1213,14 +1143,11 @@ cue* at uhub? port ? # CATC USB-EL1201A 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 -urndis* at uhub? port ? # Microsoft RNDIS specification # USB 802.11 adapters atu* at uhub? port ? # Atmel AT76C50XX based adapters -otus* at uhub? port ? # Atheros AR9001U ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g -upgt* at uhub? port ? # Intersil PrismGT zyd* at uhub? port ? # Zydas ZD1211 # Prolific PL2301/PL2302 host-to-host adapter @@ -1230,7 +1157,7 @@ upl* at uhub? port ? ubsa* at uhub? port ? # Belkin serial adapter ucom* at ubsa? portno ? -uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter +uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter ucom* at uchcom? portno ? uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter @@ -1252,13 +1179,13 @@ uvscom* at uhub? port ? # SUNTAC Slippe ucom* at uvscom? portno ? # RIM BlackBerry -uberry* at uhub? port ? +uberry* at uhub? port ? # Diamond Multimedia Rio 500 urio* at uhub? port ? # USB Handspring Visor -uvisor* at uhub? port ? +uvisor* at uhub? port ? ucom* at uvisor? # Kyocera AIR-EDGE PHONE @@ -1272,10 +1199,10 @@ uscanner* at uhub? port ? usscanner* at uhub? port ? # Topfield TF5000PVR range of DVB recorders -utoppy* at uhub? port ? +utoppy* at uhub? port ? # Y@P firmware loader -uyap* at uhub? port ? +uyap* at uhub? port ? # D-Link DSB-R100 USB radio udsbr* at uhub? port ? @@ -1283,46 +1210,35 @@ radio* at udsbr? # USB Generic driver ugen* at uhub? port ? +# On ugen bulk endpoints, perform read-ahead and write-behind. +options UGEN_BULK_RA_WB # USB 3G datacards -u3ginit* at uhub? port ? u3g* at uhub? port ? ucom* at u3g? # USB generic serial port (e.g., data over cellular) -ugensa* at uhub? port ? +ugensa* at uhub? port ? ucom* at ugensa? # IrDA and Consumer Ir devices # Toshiba Oboe -oboe* at pci? dev ? function ? +oboe* at pci? dev ? function ? irframe* at oboe? # PCI IEEE1394 controllers -fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller +fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller # CardBus IEEE1394 controllers -fwohci* at cardbus? function ? # IEEE1394 Open Host Controller +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 -# SD/MMC/SDIO Controller and Device support - -# PCI SD/MMC controller -sdhc* at pci? # SD Host Controller - -# CardBus SD/MMC controller -sdhc* at cardbus? function ? # SD Host Controller - -sdmmc* at sdhc? # SD/MMC bus -ld* at sdmmc? - - # Audio Devices # PCI audio devices @@ -1331,7 +1247,7 @@ auich* at pci? dev ? function ? # Intel 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 +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 @@ -1375,10 +1291,6 @@ opl* at wss? opl* at yds? opl* at ym? -# High Definition Audio -hdaudio* at pci? dev ? function ? # High Definition Audio -hdafg* at hdaudiobus? - # Audio support audio* at audiobus? @@ -1402,15 +1314,15 @@ midi* at pcppi? # MIDI interface to the # FM-Radio devices # ISA radio devices -#az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card +#az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card #az1 at isa? port 0x358 -#rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible +#rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible #rt1 at isa? port 0x284 #rt2 at isa? port 0x30c #rt3 at isa? port 0x384 -#rtii0 at isa? port 0x20c # AIMS Lab Radiotrack II FM Radio Card +#rtii0 at isa? port 0x20c # AIMS Lab Radiotrack II FM Radio Card #rtii1 at isa? port 0x30c -#sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card +#sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card # PCI radio devices #gtp* at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card @@ -1425,7 +1337,7 @@ midi* at pcppi? # MIDI interface to the # Video capture devices -pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam +pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam uvideo* at uhub? # USB Video Class capture devices video* at videobus? @@ -1433,12 +1345,9 @@ video* at videobus? # TV cards # Brooktree 848/849/878/879 based TV cards -bktr* at pci? dev ? function ? -radio* at bktr? +bktr* at pci? dev ? function ? +radio* at bktr? -# Conexant CX2388[0-3]-based DTV cards -#cxdtv* at pci? dev ? function ? -#iic* at cxdtv? # Bluetooth Controller and Device support @@ -1446,19 +1355,14 @@ radio* at bktr? bt3c* at pcmcia? function ? # 3Com 3CRWB6096-A btbc* at pcmcia? function ? # AnyCom BlueCard LSE041/039/139 -# Bluetooth SDIO Controller -sbt* at sdmmc? - # Bluetooth USB Controllers ubt* at uhub? port ? -aubtfwl* at uhub? port ? # Bluetooth Device Hub bthub* at bcsp? bthub* at bt3c? bthub* at btbc? bthub* at btuart? -bthub* at sbt? bthub* at ubt? # Bluetooth HID support @@ -1472,10 +1376,6 @@ wsmouse* at btms? mux 0 btkbd* at bthidev? reportid ? wskbd* at btkbd? console ? mux 1 -# Bluetooth Apple Magic Mouse -btmagic* at bthub? -wsmouse* at btmagic? mux 0 - # Bluetooth Audio support btsco* at bthub? @@ -1533,8 +1433,8 @@ cinclude "arch/i386/conf/GENERIC.local" # Pseudo-Devices -pseudo-device crypto # /dev/crypto device -pseudo-device swcrypto # software crypto implementation +pseudo-device crypto # /dev/crypto device +pseudo-device swcrypto # software crypto implementation # disk/mass storage pseudo-devices pseudo-device bio # RAID control device driver @@ -1550,36 +1450,30 @@ options RAID_AUTOCONFIG # auto-configu #options RF_INCLUDE_INTERDECLUSTER=1 #options RF_INCLUDE_PARITY_DECLUSTERING=1 #options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 -pseudo-device fss # file system snapshot device -pseudo-device putter # for puffs and pud +pseudo-device fss 4 # file system snapshot device -pseudo-device md # memory disk device (ramdisk) -options MEMORY_DISK_HOOKS # enable root ramdisk -options MEMORY_DISK_DYNAMIC # loaded via kernel module(7) +pseudo-device md 1 # memory disk device (ramdisk) +options MEMORY_DISK_HOOKS # enable root ramdisk +options MEMORY_DISK_DYNAMIC # loaded via kernel module pseudo-device vnd # disk-like interface to files options VND_COMPRESSION # compressed vnd(4) -# NPF -#pseudo-device npf - # network pseudo-devices pseudo-device bpfilter # Berkeley packet filter #pseudo-device carp # Common Address Redundancy Protocol pseudo-device ipfilter # IP filter (firewall) and NAT pseudo-device loop # network loopback -#pseudo-device ifmpls # MPLS pseudo-interface pseudo-device ppp # Point-to-Point Protocol pseudo-device pppoe # PPP over Ethernet (RFC 2516) -#options PPPOE_SERVER # Enable PPPoE server via link0 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 (RFC 1933) -#pseudo-device faith # IPv[46] TCP relay translation i/f +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 @@ -1587,14 +1481,13 @@ pseudo-device bridge # simple inter-ne pseudo-device agr # IEEE 802.3ad link aggregation #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if -#pseudo-device etherip # Tunnel Ethernet over IP # srt is EXPERIMENTAL #pseudo-device srt # source-address-based routing # -# accept filters -pseudo-device accf_data # "dataready" accept filter -pseudo-device accf_http # "httpready" accept filter +# accept filters, built as modules by default +#pseudo-device accf_data # "dataready" accept filter +#pseudo-device accf_http # "httpready" accept filter # miscellaneous pseudo-devices pseudo-device pty # pseudo-terminals @@ -1607,13 +1500,12 @@ pseudo-device ksyms # /dev/ksyms pseudo-device lockstat # lock profiling pseudo-device bcsp # BlueCore Serial Protocol pseudo-device btuart # Bluetooth HCI UART (H4) -#pseudo-device gpiosim 1 # GPIO simulator # a pseudo device needed for Coda # also needs CODA (above) -pseudo-device vcoda 4 # coda minicache <-> venus comm. +#pseudo-device vcoda 4 # coda minicache <-> venus comm. # a pseudo device needed for SMBFS -pseudo-device nsmb # experimental - SMB requester +#pseudo-device nsmb # experimental - SMB requester # wscons pseudo-devices pseudo-device wsmux # mouse & keyboard multiplexor @@ -1622,6 +1514,9 @@ pseudo-device wsfont # cmos(4) pseudo-device pseudo-device cmos +# pseudo audio device driver +pseudo-device pad + # userland interface to drivers, including autoconf and properties retrieval pseudo-device drvctl @@ -1634,12 +1529,12 @@ pseudo-device veriexec # removing fingerprint methods will have almost no impact on the kernel # code size. # -options VERIFIED_EXEC_FP_RMD160 -options VERIFIED_EXEC_FP_SHA256 -options VERIFIED_EXEC_FP_SHA384 -options VERIFIED_EXEC_FP_SHA512 -options VERIFIED_EXEC_FP_SHA1 -options VERIFIED_EXEC_FP_MD5 +options VERIFIED_EXEC_FP_RMD160 +options VERIFIED_EXEC_FP_SHA256 +options VERIFIED_EXEC_FP_SHA384 +options VERIFIED_EXEC_FP_SHA512 +options VERIFIED_EXEC_FP_SHA1 +options VERIFIED_EXEC_FP_MD5 options PAX_MPROTECT=0 # PaX mprotect(2) restrictions options PAX_ASLR=0 # PaX Address Space Layout Randomization