Sync NEWCARD a bit with GENERIC. Remove trailing '0' on unwired devices.
This commit is contained in:
Peter Wemm
parent
97608dbe74
commit
90c55ca555
@ -67,11 +67,11 @@ options SYSVSEM #SYSV-style semaphores
|
||||
#options NAPIC=1 # number of IO APICs
|
||||
#options NINTR=24 # number of INTs
|
||||
|
||||
device isa0
|
||||
device eisa0
|
||||
device pci0
|
||||
device pccard0
|
||||
#device cardbus0
|
||||
device isa
|
||||
device eisa
|
||||
device pci
|
||||
device pccard
|
||||
#device cardbus
|
||||
|
||||
# Floppy drives
|
||||
device fdc0 at isa? port IO_FD1 irq 6 drq 2
|
||||
@ -81,42 +81,39 @@ device fd1 at fdc0 drive 1
|
||||
# ATA and ATAPI devices
|
||||
device ata0 at isa? port IO_WD1 irq 14
|
||||
device ata1 at isa? port IO_WD2 irq 15
|
||||
device ata2
|
||||
device atadisk0 # ATA disk drives
|
||||
device atapicd0 # ATAPI CDROM drives
|
||||
device atapifd0 # ATAPI floppy drives
|
||||
device atapist0 # ATAPI tape drives
|
||||
device ata
|
||||
device atadisk # ATA disk drives
|
||||
device atapicd # ATAPI CDROM drives
|
||||
device atapifd # ATAPI floppy drives
|
||||
device atapist # ATAPI tape drives
|
||||
options ATA_STATIC_ID #Static device numbering
|
||||
#options ATA_ENABLE_ATAPI_DMA #Enable DMA on ATAPI devices
|
||||
|
||||
# SCSI Controllers
|
||||
# A single entry for any of these controllers (ahb, ahc, amd, ncr, etc...) is
|
||||
# sufficient for any number of installed devices.
|
||||
device ahb0 # EISA AHA1742 family
|
||||
device ahc0 # AHA2940 and onboard AIC7xxx devices
|
||||
device amd0 # AMD 53C974 (Teckram DC-390(T))
|
||||
device dpt0 # DPT Smartcache - See LINT for options!
|
||||
device isp0 # Qlogic family
|
||||
device ncr0 # NCR/Symbios Logic
|
||||
device sym0 # NCR/Symbios Logic (newer chipsets)
|
||||
device ahb # EISA AHA1742 family
|
||||
device ahc # AHA2940 and onboard AIC7xxx devices
|
||||
device amd # AMD 53C974 (Teckram DC-390(T))
|
||||
device dpt # DPT Smartcache - See LINT for options!
|
||||
device isp # Qlogic family
|
||||
device ncr # NCR/Symbios Logic
|
||||
device sym # NCR/Symbios Logic (newer chipsets)
|
||||
|
||||
device adv0 at isa? port ? irq ?
|
||||
device adw0
|
||||
device adw
|
||||
device bt0 at isa? port ? irq ?
|
||||
device aha0 at isa? port ? irq ?
|
||||
device aic0 at isa? port ? irq ?
|
||||
|
||||
# SCSI peripherals
|
||||
# Only one of each of these is needed, they are dynamically allocated.
|
||||
device scbus0 # SCSI bus (required)
|
||||
device da0 # Direct Access (disks)
|
||||
device sa0 # Sequential Access (tape etc)
|
||||
device cd0 # CD
|
||||
device pass0 # Passthrough device (direct SCSI access)
|
||||
device scbus # SCSI bus (required)
|
||||
device da # Direct Access (disks)
|
||||
device sa # Sequential Access (tape etc)
|
||||
device cd # CD
|
||||
device pass # Passthrough device (direct SCSI access)
|
||||
|
||||
# RAID controllers
|
||||
#device amr0 # AMI MegaRAID
|
||||
#device mlx0 # Mylex DAC960 family
|
||||
#device amr # AMI MegaRAID
|
||||
#device mlx # Mylex DAC960 family
|
||||
|
||||
# atkbdc0 controls both the keyboard and the PS/2 mouse
|
||||
device atkbdc0 at isa? port IO_KBD
|
||||
@ -146,7 +143,7 @@ device apm0 at nexus? flags 0x20 # Advanced Power Management
|
||||
|
||||
# PCCARD (PCMCIA) support
|
||||
device pcic0 at isa? port 0x3e0 irq 10 iomem 0xd0000
|
||||
#device pccbb0
|
||||
#device pccbb
|
||||
|
||||
# Serial (COM) ports
|
||||
device sio0 at isa? port IO_COM1 flags 0x10 irq 4
|
||||
@ -156,44 +153,44 @@ device sio3 at isa? disable port IO_COM4 irq 9
|
||||
|
||||
# Parallel port
|
||||
device ppc0 at isa? port? flags 0x40 irq 7
|
||||
device ppbus0 # Parallel port bus (required)
|
||||
device lpt0 # Printer
|
||||
device plip0 # TCP/IP over parallel
|
||||
device ppi0 # Parallel port interface device
|
||||
#device vpo0 # Requires scbus and da0
|
||||
device ppbus # Parallel port bus (required)
|
||||
device lpt # Printer
|
||||
device plip # TCP/IP over parallel
|
||||
device ppi # Parallel port interface device
|
||||
#device vpo # Requires scbus and da0
|
||||
|
||||
# PCI Ethernet NICs.
|
||||
device de0 # DEC/Intel DC21x4x (``Tulip'')
|
||||
device fxp0 # Intel EtherExpress PRO/100B (82557, 82558)
|
||||
device tx0 # SMC 9432TX (83c170 ``EPIC'')
|
||||
device vx0 # 3Com 3c590, 3c595 (``Vortex'')
|
||||
device de # DEC/Intel DC21x4x (``Tulip'')
|
||||
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
|
||||
device tx # SMC 9432TX (83c170 ``EPIC'')
|
||||
device vx # 3Com 3c590, 3c595 (``Vortex'')
|
||||
|
||||
# PCI Ethernet NICs that use the common MII bus controller code.
|
||||
device miibus0 # MII bus support
|
||||
device dc0 # DEC/Intel 21143 and various workalikes
|
||||
device rl0 # RealTek 8129/8139
|
||||
device sf0 # Adaptec AIC-6915 (``Starfire'')
|
||||
device sis0 # Silicon Integrated Systems SiS 900/SiS 7016
|
||||
device ste0 # Sundance ST201 (D-Link DFE-550TX)
|
||||
device tl0 # Texas Instruments ThunderLAN
|
||||
device vr0 # VIA Rhine, Rhine II
|
||||
device wb0 # Winbond W89C840F
|
||||
device xl0 # 3Com 3c90x (``Boomerang'', ``Cyclone'')
|
||||
device miibus # MII bus support
|
||||
device dc # DEC/Intel 21143 and various workalikes
|
||||
device rl # RealTek 8129/8139
|
||||
device sf # Adaptec AIC-6915 (``Starfire'')
|
||||
device sis # Silicon Integrated Systems SiS 900/SiS 7016
|
||||
device ste # Sundance ST201 (D-Link DFE-550TX)
|
||||
device tl # Texas Instruments ThunderLAN
|
||||
device vr # VIA Rhine, Rhine II
|
||||
device wb # Winbond W89C840F
|
||||
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
|
||||
|
||||
# ISA Ethernet NICs.
|
||||
device ed0 at isa? port 0x280 irq 10 iomem 0xd8000
|
||||
device ex0
|
||||
device ep0
|
||||
device ex
|
||||
device ep
|
||||
# WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
|
||||
# exists only as a PCMCIA device, so there is no ISA attatement needed
|
||||
# and resources will always be dynamically assigned by the pccard code.
|
||||
device wi0
|
||||
device wi
|
||||
# Aironet 4500/4800 802.11 wireless NICs. Note: the declaration below will
|
||||
# work for PCMCIA and PCI cards, as well as ISA cards set to ISA PnP
|
||||
# mode (the factory default). If you set the switches on your ISA
|
||||
# card for a manually chosen I/O address and IRQ, you must specify
|
||||
# those paremeters here.
|
||||
device an0
|
||||
device an
|
||||
# The probe order of these is presently determined by i386/isa/isa_compat.c.
|
||||
#device ie0 at isa? port 0x300 irq 10 iomem 0xd0000
|
||||
device fe0 at isa? port 0x300 irq ?
|
||||
@ -219,17 +216,17 @@ pseudo-device md # Memory "disks"
|
||||
pseudo-device bpf #Berkeley packet filter
|
||||
|
||||
# USB support
|
||||
#device uhci0 # UHCI PCI->USB interface
|
||||
#device ohci0 # OHCI PCI->USB interface
|
||||
#device usb0 # USB Bus (required)
|
||||
#device ugen0 # Generic
|
||||
#device uhid0 # "Human Interface Devices"
|
||||
#device ukbd0 # Keyboard
|
||||
#device ulpt0 # Printer
|
||||
#device umass0 # Disks/Mass storage - Requires scbus and da0
|
||||
#device ums0 # Mouse
|
||||
#device aue0 # ADMtek USB ethernet
|
||||
#device cue0 # CATC USB ethernet
|
||||
#device kue0 # Kawasaki LSI USB ethernet
|
||||
#device uhci # UHCI PCI->USB interface
|
||||
#device ohci # OHCI PCI->USB interface
|
||||
#device usb # USB Bus (required)
|
||||
#device ugen # Generic
|
||||
#device uhid # "Human Interface Devices"
|
||||
#device ukbd # Keyboard
|
||||
#device ulpt # Printer
|
||||
#device umass # Disks/Mass storage - Requires scbus and da0
|
||||
#device ums # Mouse
|
||||
#device aue # ADMtek USB ethernet
|
||||
#device cue # CATC USB ethernet
|
||||
#device kue # Kawasaki LSI USB ethernet
|
||||
|
||||
options DDB
|
||||
|
||||
Loading…
Reference in New Issue
Block a user