Pullup rev 1.233 - rev 1.358 of GENERIC to CARDBUS, and merge conflicts.

Add GENERIC rev in "from:" line to aid future merging.
Major highlights include COMPAT_14, COMPAT_AOUT, NTFS, OVERLAY,
SOFTDEP, INET6, IPSEC, pcic iosiz changes, cz, dpt, rtk (cardbus!),
awi, cnw, ray, wi, xi, joy, and gif.
This commit is contained in:
jhawk 2000-07-08 02:47:02 +00:00
parent b44d184dec
commit 71f3f1c282
1 changed files with 254 additions and 67 deletions

View File

@ -1,6 +1,7 @@
# $NetBSD: CARDBUS,v 1.15 2000/07/05 04:07:25 sommerfeld Exp $
# $NetBSD: CARDBUS,v 1.16 2000/07/08 02:47:02 jhawk Exp $
#
# CARDBUS -- GENERIC + CardBus support
# from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
#
include "arch/i386/conf/std.i386"
@ -23,10 +24,6 @@ options USER_LDT # user-settable LDT; used by WINE
# delay between "rebooting ..." message and hardware reset, in milliseconds
#options CPURESET_DELAY=2000
# Misc. i386-specific options
options XSERVER # X server support in console drivers
#options XSERVER_DDB # PF12 gets you into DDB when X is running
# This option allows you to force a serial console at the specified
# I/O address. see console(4) for details.
#options "CONSDEVNAME=\"com\"",CONADDR=0x2f8,CONSPEED=57600
@ -76,6 +73,7 @@ options COMPAT_10 # NetBSD 1.0,
options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # NetBSD 1.2,
options COMPAT_13 # NetBSD 1.3,
options COMPAT_14 # NetBSD 1.4,
options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
@ -84,17 +82,21 @@ 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_AOUT # binary compat for NetBSD a.out binaries
# File systems
file-system FFS # UFS
file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
file-system MFS # memory file system
file-system NFS # Network File System client
file-system NTFS # Windows/NT file system (experimental)
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
file-system KERNFS # /kern
file-system NULLFS # loopback file system
file-system OVERLAY # overlay file system
file-system PORTAL # portal filesystem (still experimental)
file-system PROCFS # /proc
file-system UMAPFS # NULLFS + uid and gid remapping
@ -103,8 +105,8 @@ file-system CODA # Coda File System; also needs vcoda (below)
# File system options
options QUOTA # UFS quotas
#options FFS_EI # FFS Endian Independant support
#options SOFTDEP # FFS soft updates support.
#options FFS_EI # FFS Endian Independent support
options SOFTDEP # FFS soft updates support.
options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
@ -112,6 +114,11 @@ options NFSSERVER # Network File System server
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
options PULLDOWN_TEST # use m_pulldown for IPv4/v6 processing
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
options NS # XNS
#options NSIP # XNS tunneling over IP
@ -119,11 +126,11 @@ options ISO,TPIP # OSI
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
#options PPP_BSDCOMP # BSD-Compress compression support for PPP
#options PPP_DEFLATE # Deflate compression support for PPP
#options PPP_FILTER # Active filter support for PPP (requires bpf)
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options IPFILTER_LOG # ipmon(8) log support
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
options PPP_FILTER # Active filter support for PPP (requires bpf)
options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
#options TCP_COMPAT_42
@ -131,13 +138,15 @@ options NETATALK # AppleTalk networking protocols
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
options EISAVERBOSE # verbose EISA device autoconfig messages
options MIIVERBOSE # verbose PHY autoconfig messages
options PCIVERBOSE # verbose PCI device autoconfig messages
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
#options PCMCIAVERBOSE # verbose PCMCIA configuration messages
options SCSIVERBOSE # human readable SCSI error messages
options USBVERBOSE # verbose USB device autoconfig messages
options NFS_BOOT_BOOTP,NFS_BOOT_BOOTPARAM
#options PNPBIOSVERBOSE # verbose PnP BIOS messages
#options PNPBIOSDEBUG # more fullsome Pnp BIOS debugging messages
options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
#
# wscons options
@ -157,6 +166,8 @@ options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time
#options WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink
options PCDISPLAY_SOFTCURSOR
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
@ -171,14 +182,58 @@ mainbus0 at root
#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
#options APM_V10_ONLY # Use only the APM 1.0 calls
#options APM_NO_POWEROFF # Don't power off on halt(8)
#options APM_POWER_PRINT # Print stats on the console
#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
# Basic Bus Support
# Plug-and-Play BIOS and attached devices
#pnpbios* at mainbus?
# mainboard audio chips
#ess* at pnpbios? index ? # ESS AudioDrive
#sb* at pnpbios? index ? # NeoMagic 256AV in sb mode
#wss* at pnpbios? index ? # NeoMagic 256AV in wss mode
#ym* at pnpbios? index ? # OPL3-SA3
# com port
# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
# Interfaces" to "com*", otherwise com2 will attach at pnpbios? and there
# will be no com0. A side effect is pcmcia (and other) com? previously
# starting at com3 may attach as com1 or com2.
#com* at pnpbios? index ? # serial ports
# parallel port
# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
# "printer interfaces".
#lpt* at pnpbios? index ? # parallel ports
#pckbc* at pnpbios? index ? # PC keyboard/mouse controller
#fdc* at pnpbios? index ? # floppy controller
# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
#pciide* at pnpbios? index ?
# PCI bus support
pci* at mainbus? bus ?
pci* at pchb? bus ?
pci* at ppb? bus ?
# Configure PCI using BIOS information
#options PCIBIOS # PCI BIOS support
#options PCIBIOSVERBOSE # PCI BIOS verbose info
#options PCIBIOS_INTR_FIXUP # fixup PCI interrupt routing
#options PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
#options PCIBIOS_BUS_FIXUP # fixup PCI bus numbering
#options PCIBIOS_ADDR_FIXUP # fixup PCI I/O addresses
# PCI bridges
pchb* at pci? dev ? function ? # PCI-Host bridges
pceb* at pci? dev ? function ? # PCI-EISA bridges
@ -201,9 +256,9 @@ pcmcia* at pcic? controller ? socket ?
pcmcia* at tcic? controller ? socket ?
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x4000
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
# PCI PCMCIA controllers
pcic0 at pci? dev? function ?
@ -214,14 +269,14 @@ isapnp0 at isa?
# ISA Plug-and-Play PCMCIA controllers
pcic* at isapnp?
# CardBus bridge support
cbb* at pci? dev ? function ?
cardslot* at cbb?
# CardBus bus support
cardbus* at cardslot?
pcmcia* at cardslot?
cbb* at pci? dev? function ?
cardslot* at cbb?
# Coprocessor Support
# Math Coprocessor support
@ -232,28 +287,31 @@ npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
# Keyboard layout configuration for pccons
#options FRENCH_KBD
#options FINNISH_KBD
#options GERMAN_KBD
#options NORWEGIAN_KBD
# pccons-specific options:
#options XSERVER_DDB # PF12 gets you into DDB when X is running
#options XSERVER # X server support
# wscons
pckbc0 at isa? # pc keyboard controller
pckbd* at pckbc? # PC keyboard
# "opms" should not be enabled together with "pms" or "pmsi"
#pms* at pckbc? # PS/2 mouse for wsmouse
#pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse
opms* at pckbc? # backwards compatible PS/2 mouse
pms* at pckbc? # PS/2 mouse for wsmouse
pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse
#opms* at pckbc? # backwards compatible PS/2 mouse
vga0 at isa?
vga* at pci?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
wskbd* at pckbd? console ?
#wsmouse* at pms?
#wsmouse* at pmsi?
wsmouse* at pms? mux 0
wsmouse* at pmsi? mux 0
pcppi0 at isa?
sysbeep0 at pcppi?
@ -263,6 +321,7 @@ sysbeep0 at pcppi?
# PCI serial interfaces
com* at puc? port ? # 16x50s on "universal" comm boards
cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards
cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards
# ISA Plug-and-Play serial interfaces
com* at isapnp? # Modems and serial boards
@ -285,12 +344,16 @@ com2 at isa? port 0x3e8 irq 5
#ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards
#com* at ast? slave ?
#boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards
#boca0 at isa? port 0x100 irq 5 # BOCA 16-port serial cards (BB2016)
#boca1 at isa? port 0x140 irq 5 # this line is also needed for BB2016
#com* at boca? slave ?
#tcom0 at isa? port 0x100 irq 7 # TC-800 8-port serial cards
#com* at tcom? slave ?
#rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards
#com* at rtfps? slave ?
#cy0 at isa? iomem 0xd4000 irq 12 # Cyclades serial cards
#addcom0 at isa? port 0x108 irq 5 # Addonics FlexPort 8S
#com* at addcom? slave ?
# Parallel Printer Interfaces
@ -303,46 +366,65 @@ lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports
lpt1 at isa? port 0x278
lpt2 at isa? port 0x3bc
# Hardware monitors
# LM7[89] and compatible hardware monitors
#lm0 at isa? port 0x290 # other common ports: 0x280, 0x310
# VIA VT82C686A hardware monitor
#viapm* at pci? dev ? function ?
#viaenv* at viapm?
# SCSI Controllers and Devices
# PCI SCSI controllers
adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
adw* at pci? dev ? function ? # AdvanSys 9xxUW SCSI
adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
bha* at pci? dev ? function ? # BusLogic 9xx SCSI
dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
ncr* at pci? dev ? function ? # NCR 53c8xx SCSI
#ncr* at pci? dev ? function ? # NCR 53c8xx SCSI (old driver)
siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
# EISA SCSI controllers
ahb* at eisa? slot ? # Adaptec 174[02] SCSI
ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI
bha* at eisa? slot ? # BusLogic 7xx SCSI
dpt* at eisa? slot ? # DPT EATA SCSI
uha* at eisa? slot ? # UltraStor 24f SCSI
# PCMCIA SCSI controllers
aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI
# ISA Plug-and-Play SCSI controllers
aha* at isapnp? # Adaptec AHA-154[02
aic* at isapnp? # Adaptec AHA-1520B
# ISA SCSI controllers
adv0 at isa? port ? irq ? drq ? # AdvanSys APB-514[02]
aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI
aha1 at isa? port 0x334 irq ? drq ?
ahc0 at isa? port ? irq ? # Adaptec 284x SCSI
aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI
bha0 at isa? port 0x330 irq ? drq ? # BusLogic [457]4X SCSI
bha1 at isa? port 0x334 irq ? drq ?
nca0 at isa? port 0x360 irq 15 # Port-mapped NCR 53C80 contoller
nca1 at isa? iomem 0xd8000 irq 5 # Memory-mapped controller (T128, etc.)
# The "nca" and "dpt" probes might give false hits or hang your machine.
#dpt0 at isa? port 0x170 irq ? drq ? # DPT SmartCache/SmartRAID
#nca0 at isa? port 0x360 irq 15 # Port-mapped NCR 53C80 contoller
#nca1 at isa? iomem 0xd8000 irq 5 # Memory-mapped controller (T128, etc.)
sea0 at isa? iomem 0xc8000 irq 5 # Seagate/Future Domain SCSI
uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI
uha1 at isa? port 0x340 irq ? drq ?
wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
wds1 at isa? port 0x358 irq 11 drq 5
# CardBus SCSI cards
ahc* at cardbus? dev ? function ? # Adaptec ADP-1480
# SCSI bus support
scsibus* at adv?
scsibus* at adw?
@ -351,11 +433,14 @@ scsibus* at ahb?
scsibus* at ahc?
scsibus* at aic?
scsibus* at bha?
scsibus* at dpt?
scsibus* at esp?
scsibus* at isp?
scsibus* at nca?
scsibus* at ncr?
#scsibus* at nca?
#scsibus* at ncr?
scsibus* at pcscp?
scsibus* at sea?
scsibus* at siop?
scsibus* at uha?
scsibus* at wds?
@ -364,16 +449,21 @@ sd* at scsibus? target ? lun ? # SCSI disk drives
st* at scsibus? target ? lun ? # SCSI tape drives
cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
ch* at scsibus? target ? lun ? # SCSI autochangers
ses* at scsibus? target ? lun ? # SCSI Enclosure Services devices
ss* at scsibus? target ? lun ? # SCSI scanners
uk* at scsibus? target ? lun ? # SCSI unknown
# RAID controllers and devices
cac* at pci? dev ? function ? # Compaq array controller
ca* at cac? unit ? # Compaq array disk device
# IDE and related devices
# PCI IDE controllers - see pciide(4) for supported hardware.
# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
# how to set up DMA modes for this chip. This may work, or may cause
# a machine hang with some controllers.
pciide* at pci ? dev ? function ? flags 0x0000
pciide* at pci? dev ? function ? flags 0x0000
# ISA Plug-and-Play IDE controllers
wdc* at isapnp?
@ -382,8 +472,11 @@ wdc* at isapnp?
wdc* at pcmcia? function ?
# ISA ST506, ESDI, and IDE controllers
wdc0 at isa? port 0x1f0 irq 14
wdc1 at isa? port 0x170 irq 15
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
# fall back to 16bits I/O if 32bits I/O are not functional).
# Some controllers pass the initial 32bit test, but will fail later.
wdc0 at isa? port 0x1f0 irq 14 flags 0x00
wdc1 at isa? port 0x170 irq 15 flags 0x00
# IDE drives
# Flags are used only with controllers that support DMA operations
@ -441,14 +534,24 @@ esh* at pci? dev ? function ? # Essential HIPPI card
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
le* at pci? dev ? function ? # PCnet-PCI Ethernet
ne* at pci? dev ? function ? # NE2000-compatible Ethernet
tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
ne* at pci? dev ? function ? # NE2000-compatible Ethernet
ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
rtk* at pci? dev ? function ? # Realtek 8129/8139
sip* at pci? dev ? function ? # SiS 900 Ethernet
ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
tlp* at pci? dev ? function ? # DECchip 21x4x (and clones) Ethernet
#options TLP_MATCH_21040
#options TLP_MATCH_21041
#options TLP_MATCH_21140
#options TLP_MATCH_21142
vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
# EISA network interfaces
ep* at eisa? slot ? # 3Com 3c579 Ethernet
fea* at eisa? slot ? # DEC DEFEA FDDI
tlp* at eisa? slot ? # DEC DE-425 Ethernet
# ISA Plug-and-Play network interfaces
ep* at isapnp? # 3Com 3c509 Ethernet
@ -456,10 +559,19 @@ ne* at isapnp? # NE2000-compatible Ethernet
tr* at isapnp? # IBM/3COM TROPIC Token-Ring
# PCMCIA network interfaces
awi* at pcmcia? function ? # BayStack 650/660 (802.11FH/DS)
cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer
ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
mbe* at pcmcia? function ? # MB8696x based Ethernet
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
com* at mhzc?
sm* at mhzc?
# ISA network interfaces
ate0 at isa? port 0x2a0 irq ? # AT1700
@ -467,7 +579,7 @@ 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
ep0 at isa? port ? irq ? # 3C509 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-180 series
@ -478,6 +590,7 @@ lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
#le* at depca?
nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
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
@ -492,35 +605,37 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10
# CardBus network cards
ex* at cardbus? dev ? function ? # 3Com 3C575TX
fxp* at cardbus? dev ? function ? # Intel i8255x
rtk* at cardbus? dev ? function ? # Realtek 8129/8139
tlp* at cardbus? dev ? function ? # DECchip 21143
# CardBus SCSI cards
ahc* at cardbus? dev ? function ? # Adaptec ADP-1480
# MII/PHY support
dmphy* at mii? phy ? # Davicom DM9101 PHYs
exphy* at mii? phy ? # 3Com internal PHYs
icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
nsphyter* at mii? phy ? # NS83843 PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
ukphy* at mii? phy ? # generic unknown PHYs
# USB Controller and Devices
# PCI USB controllers
uhci* at pci? # Universal Host Controller (Intel)
ohci* at pci? # Open Host Controller
ohci* at pci? dev ? function ? # Open Host Controller
uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# CardBus USB controllers
ohci* at cardbus? dev ? function ? # Open Host Controller
# USB bus support
usb* at uhci?
usb* at ohci?
usb* at uhci?
# USB Hubs
uhub* at usb?
@ -528,11 +643,11 @@ uhub* at uhub? port ? configuration ? interface ?
# USB Mice
ums* at uhub? port ? configuration ? interface ?
wsmouse* at ums?
wsmouse* at ums? mux 0
# USB Keyboards
ukbd* at uhub? port ? configuration ? interface ?
wskbd* at ukbd? console ?
wskbd* at ukbd? console ? mux 1
# USB Generic HID devices
uhid* at uhub? port ? configuration ? interface ?
@ -540,18 +655,51 @@ uhid* at uhub? port ? configuration ? interface ?
# USB Printer
ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
umodem* at uhub? port ? configuration ?
ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
atapibus* at umass? channel ?
scsibus* at umass? channel ?
# USB audio
uaudio* at uhub? port ? configuration ?
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
cue* at uhub? port ? # CATC USB-EL1201A based adapters
kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
# Prolofic PL2301/PL2302 host-to-host adapter
upl* at uhub? port ?
# Serial adapters
# FTDI FT8U100AX serial adapter
#uftdi* at uhub? port ?
#ucom* at uftdi? portno ?
# Diamond Multimedia Rio 500
urio* at uhub? port ?
# USB Handspring Visor
uvisor* at uhub? port ?
ucom* at uvisor?
# USB Generic driver
ugen* at uhub? port ? configuration ? interface ?
ugen* at uhub? port ?
# Audio Devices
# PCI audio devices
auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
eap* at pci? dev ? function ? # Ensoniq AudioPCI
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
fms* at pci? dev ? function ? # Forte Media FM801
sv* at pci? dev ? function ? # S3 SonicVibes
# ISA Plug-and-Play audio devices
@ -564,6 +712,7 @@ ym* at isapnp? # Yamaha OPL3-SA3 audio
# ISA audio devices
# the "aria" probe might give false hits
#aria0 at isa? port 0x290 irq 10 # Aria
#ess0 at isa? port 0x220 irq 5 drq 1 drq2 5 # ESS 18XX
gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis Ultra Sound
pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
@ -571,48 +720,76 @@ sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver
sb0 at isa? port 0x220 irq 5 drq 1 drq2 5 # SoundBlaster
wss0 at isa? port 0x530 irq 10 drq 0 drq2 1 # Windows Sound System
# OPL[23] FM syntheziers
#cms0 at isa? port 0x220 # Creative Music System
# OPL[23] FM synthesizers
#opl0 at isa? port 0x388 # use only if not attached to sound card
opl* at eso?
opl* at ess?
opl* at fms?
opl* at sb?
opl* at sv?
opl* at wss?
opl* at ym?
# Audio support
#audio* at aria?
audio* at auvia?
audio* at clcs?
audio* at cmpci?
audio* at eap?
audio* at eso?
audio* at ess?
audio* at fms?
audio* at gus?
audio* at guspnp?
audio* at pas?
audio* at sb?
audio* at sp?
audio* at sv?
audio* at uaudio?
audio* at wss?
audio* at ym?
# MPU 401 UARTs
#mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
mpu* at eso?
mpu* at fms?
mpu* at sb?
mpu* at ym?
# MIDI support
midi* at pcppi? # MIDI interface to the PC speaker
midi* at sb? # SB MPU401 port
#midi* at cms? # Creative Music System
midi* at eap? # 137[01] MIDI port
midi* at mpu? # MPU 401
midi* at opl? # OPL FM synth
midi* at pcppi? # MIDI interface to the PC speaker
midi* at sb? # SB1 MIDI port
# The spkr driver provides a simple tone interface to the built in speaker.
#spkr0 at pcppi? # PC speaker
# TV cards
# Brooktree 848/849/878/879 based TV cards
bktr* at pci? dev ? function ?
# Mice
# ISA busmice
#lms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#lms1 at isa? port 0x238 irq 5
#mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#mms1 at isa? port 0x238 irq 5
#wsmouse* at lms?
#wsmouse* at mms?
lms0 at isa? port 0x23c irq 5 # Logitech bus mouse
lms1 at isa? port 0x238 irq 5
mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
mms1 at isa? port 0x238 irq 5
wsmouse* at lms? mux 0
wsmouse* at mms? mux 0
# backwards compatible versions
olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
olms1 at isa? port 0x238 irq 5
omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
omms1 at isa? port 0x238 irq 5
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
@ -621,6 +798,9 @@ omms1 at isa? port 0x238 irq 5
# ISA Plug-and-Play joysticks
joy* at isapnp? # Game ports (usually on audio cards)
# PCI joysticks
joy* at pci? # Game ports (usually on audio cards)
# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
@ -640,6 +820,7 @@ include "arch/i386/conf/GENERIC.local"
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
#pseudo-device raid 4 # RAIDframe disk driver
#options RAID_AUTOCONFIG # auto-configuration of RAID components
pseudo-device md 1 # memory disk device (ramdisk)
pseudo-device vnd 4 # disk-like interface to files
@ -653,6 +834,9 @@ pseudo-device strip 2 # Starmode Radio IP (Metricom)
pseudo-device tun 2 # network tunneling over tty
pseudo-device gre 2 # generic L3 over IP tunnel
pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003)
pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device faith 1 # IPv[46] tcp relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
# miscellaneous pseudo-devices
pseudo-device pty 64 # pseudo-terminals
@ -664,3 +848,6 @@ pseudo-device rnd # /dev/random and in-kernel generator
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda 4 # coda minicache <-> venus comm.
# mouse & keyboard multiplexor pseudo-devices
pseudo-device wsmux 2