d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the ISA nic section look like the other device sections with

Browse Source 
comments on the same line like so:
	device		foo		# FooInc Brand NetEther cards

Also, move the wireless NIC cards to their own section.

Add commented out wl driver in wireless section.

Remove obsolete or redundant comments about some of the wireless cards
that used to apply but don't since we've removed 'at foobus'.

There should be no functional changes in this change.
This commit is contained in:
Warner Losh 2000-11-07 21:20:52 +00:00
parent 7a90c33a8a
commit 30cb2a0dfb
2 changed files with 52 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
sys/amd64/conf/GENERIC
View File

@ -88,11 +88,11 @@ device isp # Qlogic family
#device ncr # NCR/Symbios Logic #device ncr # NCR/Symbios Logic
device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
device adv device adv # Advansys scsi adapters
device adw device adw # Advansys wide scsi adapters
device aha 1 device aha 1 # Adaptec 154x scsi adapters
device aic device aic # Adaptec 15[012]x scsi adapters, AIC-6[23]60.
device bt device bt # Buslogic/Mylex MultiMaster scsi adapters
device ncv # NCR 53C500 device ncv # NCR 53C500
device nsp # Workbit Ninja SCSI-3 device nsp # Workbit Ninja SCSI-3
@ -118,11 +118,11 @@ device mlx # Mylex DAC960 family
device twe # 3ware ATA RAID device twe # 3ware ATA RAID
# atkbdc0 controls both the keyboard and the PS/2 mouse # atkbdc0 controls both the keyboard and the PS/2 mouse
device atkbdc 1 device atkbdc 1 # At keyboard controller
device atkbd device atkbd # at keyboard
device psm device psm # psm mouse
device vga device vga # VGA screen
# splash screen/screen saver # splash screen/screen saver
device splash device splash
@ -144,11 +144,11 @@ device npx
device apm device apm
# PCCARD (PCMCIA) support # PCCARD (PCMCIA) support
device card device card # pccard bus
device pcic device pcic # pcmcia bridge
# Serial (COM) ports # Serial (COM) ports
device sio device sio # 8250, 16[45]50 based serial ports
# Parallel port # Parallel port
device ppc device ppc
@ -180,33 +180,26 @@ device vr # VIA Rhine, Rhine II
device wb # Winbond W89C840F device wb # Winbond W89C840F
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
# ISA Ethernet NICs. # ISA Ethernet NICs. pccard nics included.
device cs device cs # Crystal Semiconductor CS89x0 NIC
device ed device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
device ex device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep device ep # Etherlink III based cards
device fe device fe # Fujitsu MB8696x based cards
device sn device sn # SMC's 9000 series of ethernet chips
# WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really device xe # Xircom pccard ethernet
# 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 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 an
# BayStack 660 and others
device awi
# Xircom pccard ethernet
device xe
# The probe order of these is presently determined by i386/isa/isa_compat.c. # The probe order of these is presently determined by i386/isa/isa_compat.c.
device ie device ie
device le device le
device lnc device lnc
# Wireless NIC cards
device an # Aironet 4500/4800 802.11 wireless NICs.
device awi # BayStack 660 and others
device wi # WaveLAN/IEEE 802.11 wireless NICs.
#device wl # Older non 802.11 Wavelan wireless NIC.
# Pseudo devices - the number indicates how many units to allocated. # Pseudo devices - the number indicates how many units to allocated.
device random # Entropy device device random # Entropy device
options NOBLOCKRANDOM # avoid any blocking on device random options NOBLOCKRANDOM # avoid any blocking on device random

59
sys/i386/conf/GENERIC
View File

@ -88,11 +88,11 @@ device isp # Qlogic family
#device ncr # NCR/Symbios Logic #device ncr # NCR/Symbios Logic
device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
device adv device adv # Advansys scsi adapters
device adw device adw # Advansys wide scsi adapters
device aha 1 device aha 1 # Adaptec 154x scsi adapters
device aic device aic # Adaptec 15[012]x scsi adapters, AIC-6[23]60.
device bt device bt # Buslogic/Mylex MultiMaster scsi adapters
device ncv # NCR 53C500 device ncv # NCR 53C500
device nsp # Workbit Ninja SCSI-3 device nsp # Workbit Ninja SCSI-3
@ -118,11 +118,11 @@ device mlx # Mylex DAC960 family
device twe # 3ware ATA RAID device twe # 3ware ATA RAID
# atkbdc0 controls both the keyboard and the PS/2 mouse # atkbdc0 controls both the keyboard and the PS/2 mouse
device atkbdc 1 device atkbdc 1 # At keyboard controller
device atkbd device atkbd # at keyboard
device psm device psm # psm mouse
device vga device vga # VGA screen
# splash screen/screen saver # splash screen/screen saver
device splash device splash
@ -144,11 +144,11 @@ device npx
device apm device apm
# PCCARD (PCMCIA) support # PCCARD (PCMCIA) support
device card device card # pccard bus
device pcic device pcic # pcmcia bridge
# Serial (COM) ports # Serial (COM) ports
device sio device sio # 8250, 16[45]50 based serial ports
# Parallel port # Parallel port
device ppc device ppc
@ -180,33 +180,26 @@ device vr # VIA Rhine, Rhine II
device wb # Winbond W89C840F device wb # Winbond W89C840F
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
# ISA Ethernet NICs. # ISA Ethernet NICs. pccard nics included.
device cs device cs # Crystal Semiconductor CS89x0 NIC
device ed device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
device ex device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep device ep # Etherlink III based cards
device fe device fe # Fujitsu MB8696x based cards
device sn device sn # SMC's 9000 series of ethernet chips
# WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really device xe # Xircom pccard ethernet
# 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 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 an
# BayStack 660 and others
device awi
# Xircom pccard ethernet
device xe
# The probe order of these is presently determined by i386/isa/isa_compat.c. # The probe order of these is presently determined by i386/isa/isa_compat.c.
device ie device ie
device le device le
device lnc device lnc
# Wireless NIC cards
device an # Aironet 4500/4800 802.11 wireless NICs.
device awi # BayStack 660 and others
device wi # WaveLAN/IEEE 802.11 wireless NICs.
#device wl # Older non 802.11 Wavelan wireless NIC.
# Pseudo devices - the number indicates how many units to allocated. # Pseudo devices - the number indicates how many units to allocated.
device random # Entropy device device random # Entropy device
options NOBLOCKRANDOM # avoid any blocking on device random options NOBLOCKRANDOM # avoid any blocking on device random