From e3d7caf487a47d88fd7e896f040916d22a325ecd Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Mon, 12 Jun 2006 20:38:17 +0000 Subject: [PATCH] Enable a few more things in x86 NOTES to get broader LINT coverage: - Turn on iwi(4), ipw(4), and ndis(4) on amd64 and i386. - Turn on ral(4) and ural(4) on i386, pc98, and amd64. --- sys/amd64/conf/NOTES | 12 ++++++++++++ sys/i386/conf/NOTES | 16 ++++++++++++++-- sys/pc98/conf/NOTES | 6 +++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index b6e36656ade4..fee40cbd8d14 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -221,13 +221,21 @@ options DRM_DEBUG # Include debug printfs (slow) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) +# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter +# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # nve: nVidia nForce MCP on-board Ethernet Networking +# ral: Ralink Technology IEEE 802.11 wireless adapter +# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter device ed options ED_3C503 options ED_HPP options ED_SIC +device iwi +device ipw device nve # nVidia nForce MCP on-board Ethernet Networking +device ral +device ural device ath device ath_hal # Atheros HAL (includes binary component) @@ -556,6 +564,10 @@ options VM_KMEM_SIZE options VM_KMEM_SIZE_MAX options VM_KMEM_SIZE_SCALE +# Enable NDIS binary driver support +options NDISAPI +device ndis + # The I/O device device io diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 355ea0ea79ee..aef21ecbd87c 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -498,12 +498,16 @@ hint.mse.0.irq="5" # (requires miibus) # ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; # Intel EtherExpress +# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter +# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # nve: nVidia nForce MCP on-board Ethernet Networking # oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133. # Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, # OC-3141, OC-3540 and OC-3250. +# ral: Ralink Technology IEEE 802.11 wireless adapter # sbni: Granch SBNI12-xx ISA and PCI adapters # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) +# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter # wl: Lucent Wavelan (ISA card only). # Order for ISA/EISA devices is important here @@ -546,12 +550,17 @@ hint.ie.2.at="isa" hint.ie.2.port="0x300" hint.ie.2.irq="5" hint.ie.2.maddr="0xd0000" +device iwi +device ipw # Hint for the i386-only ISA front-end of le(4). hint.le.0.at="isa" hint.le.0.port="0x280" hint.le.0.irq="10" hint.le.0.drq="0" device nve # nVidia nForce MCP on-board Ethernet Networking +device oltr +hint.oltr.0.at="isa" +device ral device sbni hint.sbni.0.at="isa" hint.sbni.0.port="0x210" @@ -562,8 +571,7 @@ hint.sr.0.at="isa" hint.sr.0.port="0x300" hint.sr.0.irq="5" hint.sr.0.maddr="0xd0000" -device oltr -hint.oltr.0.at="isa" +device ural device wl hint.wl.0.at="isa" hint.wl.0.port="0x300" @@ -1045,6 +1053,10 @@ options COMPAT_SVR4 # build emulator statically options DEBUG_SVR4 # enable verbose debugging device streams # STREAMS network driver (required for svr4). +# Enable NDIS binary driver support +options NDISAPI +device ndis + ##################################################################### # VM OPTIONS diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES index b5c4d76cccd2..9e017ccb5570 100644 --- a/sys/pc98/conf/NOTES +++ b/sys/pc98/conf/NOTES @@ -363,8 +363,10 @@ hint.mse.0.irq="13" # oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133. # Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, # OC-3141, OC-3540 and OC-3250. +# ral: Ralink Technology IEEE 802.11 wireless adapter # sbni: Granch SBNI12-xx ISA and PCI adapters # sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) +# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter # Order for ISA/EISA devices is important here @@ -386,6 +388,8 @@ hint.ie.2.maddr="0xd0000" hint.le.0.at="isa" hint.le.0.port="0x03d0" hint.le.0.irq="6" +device oltr +device ral device sbni hint.sbni.0.at="isa" hint.sbni.0.port="0x210" @@ -397,7 +401,7 @@ hint.snc.0.port="0x888" hint.snc.0.irq="6" hint.snc.0.maddr="0xc0000" device sr -device oltr +device ural device ath device ath_hal # Atheros HAL (includes binary component)