From owner-svn-src-all@FreeBSD.ORG Fri Dec 18 16:13:21 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3223106568F; Fri, 18 Dec 2009 16:13:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 918F38FC1F; Fri, 18 Dec 2009 16:13:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBIGDLJB097496; Fri, 18 Dec 2009 16:13:21 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBIGDLL0097491; Fri, 18 Dec 2009 16:13:21 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200912181613.nBIGDLL0097491@svn.freebsd.org> From: John Baldwin Date: Fri, 18 Dec 2009 16:13:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200670 - in head/sys: amd64/conf conf i386/conf pc98/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2009 16:13:21 -0000 Author: jhb Date: Fri Dec 18 16:13:21 2009 New Revision: 200670 URL: http://svn.freebsd.org/changeset/base/200670 Log: - Create a separate section in in the MI NOTES file for PCI wireless NIC drivers and move bwi(4) there from the PCI Ethernet NIC section. - Move ath(4) and ral(4) to the MI NOTES file. Reviewed by: rpaulo Modified: head/sys/amd64/conf/NOTES head/sys/conf/NOTES head/sys/i386/conf/NOTES head/sys/pc98/conf/NOTES Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Fri Dec 18 15:01:46 2009 (r200669) +++ head/sys/amd64/conf/NOTES Fri Dec 18 16:13:21 2009 (r200670) @@ -277,7 +277,6 @@ options DRM_DEBUG # Include debug print # iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking -# ral: Ralink Technology IEEE 802.11 wireless adapter # wpi: Intel 3945ABG Wireless LAN controller device ed @@ -289,16 +288,8 @@ device iwn device ipw device nfe device nve -device ral device wpi -device ath # Atheros pci/cardbus NIC's -device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -device ath_rate_sample # SampleRate tx rate control for ath -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver - # #XXX this stores pointers in a 32bit field that is defined by the hardware #device pst Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Fri Dec 18 15:01:46 2009 (r200669) +++ head/sys/conf/NOTES Fri Dec 18 16:13:21 2009 (r200670) @@ -1862,6 +1862,7 @@ device xmphy # XaQti XMAC II # L1 PCI express gigabit ethernet controllers. # alc: Support for Atheros AR8131/AR8132 PCIe ethernet controllers. # ale: Support for Atheros AR8121/AR8113/AR8114 PCIe ethernet controllers. +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # bce: Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet # adapters. # bfe: Broadcom BCM4401 Ethernet adapter. @@ -1920,6 +1921,7 @@ device xmphy # XaQti XMAC II # pcn(4) driver is left out of the kernel. The le(4) driver does not # support the additional features like the MII bus and burst mode of # the PCnet-FAST and greater chipsets though. +# ral: Ralink Technology IEEE 802.11 wireless adapter # re: RealTek 8139C+/8169/816xS/811xS/8101E PCI/PCIe Ethernet adapter # rl: Support for PCI fast ethernet adapters based on the RealTek 8129/8139 # chipset. Note that the RealTek driver defaults to using programmed @@ -2039,7 +2041,6 @@ device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # PCI Ethernet NICs. -device bwi # Broadcom BCM430* BCM431* device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel Pro/1000 Gigabit Ethernet device igb # Intel Pro/1000 PCIE Gigabit Ethernet @@ -2058,6 +2059,26 @@ device fpa # PCI WAN adapters. device lmc +# PCI IEEE 802.11 Wireless NICs +device ath # Atheros pci/cardbus NIC's +device ath_hal # pci/cardbus chip support +#device ath_ar5210 # AR5210 chips +#device ath_ar5211 # AR5211 chips +#device ath_ar5212 # AR5212 chips +#device ath_rf2413 +#device ath_rf2417 +#device ath_rf2425 +#device ath_rf5111 +#device ath_rf5112 +#device ath_rf5413 +#device ath_ar5416 # AR5416 chips +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +#device ath_ar9160 # AR9160 chips +#device ath_ar9280 # AR9280 chips +device ath_rate_sample # SampleRate tx rate control for ath +device bwi # Broadcom BCM430* BCM431* +device ral # Ralink Technology RT2500 wireless NICs. + # Use "private" jumbo buffers allocated exclusively for the ti(4) driver. # This option is incompatible with the TI_JUMBO_HDRSPLIT option below. #options TI_PRIVATE_JUMBOS Modified: head/sys/i386/conf/NOTES ============================================================================== --- head/sys/i386/conf/NOTES Fri Dec 18 15:01:46 2009 (r200669) +++ head/sys/i386/conf/NOTES Fri Dec 18 16:13:21 2009 (r200670) @@ -533,7 +533,6 @@ hint.mse.0.irq="5" # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ce: Cronyx Tau-PCI/32 sync single/dual port G.703/E1 serial adaptor # with 32 HDLC subchannels (requires sppp (default), or NETGRAPH if # NETGRAPH_CRONYX is configured) @@ -555,29 +554,12 @@ hint.mse.0.irq="5" # iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking -# ral: Ralink Technology IEEE 802.11 wireless adapter # sbni: Granch SBNI12-xx ISA and PCI adapters # wl: Lucent Wavelan (ISA card only). # wpi: Intel 3945ABG Wireless LAN controller # Order for ISA/EISA devices is important here -device ath # Atheros pci/cardbus NIC's -device ath_hal # pci/cardbus chip support -#device ath_ar5210 # AR5210 chips -#device ath_ar5211 # AR5211 chips -#device ath_ar5212 # AR5212 chips -#device ath_rf2413 -#device ath_rf2417 -#device ath_rf2425 -#device ath_rf5111 -#device ath_rf5112 -#device ath_rf5413 -#device ath_ar5416 # AR5416 chips -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -#device ath_ar9160 # AR9160 chips -#device ath_ar9280 # AR9280 chips -device ath_rate_sample # SampleRate tx rate control for ath device ce device cp device cs @@ -612,7 +594,6 @@ hint.le.0.irq="10" hint.le.0.drq="0" device nfe # nVidia nForce MCP on-board Ethernet Networking device nve # nVidia nForce MCP on-board Ethernet Networking -device ral device sbni hint.sbni.0.at="isa" hint.sbni.0.port="0x210" Modified: head/sys/pc98/conf/NOTES ============================================================================== --- head/sys/pc98/conf/NOTES Fri Dec 18 15:01:46 2009 (r200669) +++ head/sys/pc98/conf/NOTES Fri Dec 18 16:13:21 2009 (r200670) @@ -382,10 +382,8 @@ hint.mse.0.irq="13" # ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; # Intel EtherExpress # le: AMD Am7900 LANCE and Am79C9xx ILACC/PCnet Ethernet interface driver -# ral: Ralink Technology IEEE 802.11 wireless adapter # sbni: Granch SBNI12-xx ISA and PCI adapters # snc: National Semiconductor DP8393X SONIC Ethernet adapter driver -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # Order for ISA/EISA devices is important here @@ -407,7 +405,6 @@ hint.ie.2.maddr="0xd0000" hint.le.0.at="isa" hint.le.0.port="0x03d0" hint.le.0.irq="6" -device ral device sbni hint.sbni.0.at="isa" hint.sbni.0.port="0x210" @@ -419,23 +416,6 @@ hint.snc.0.port="0x888" hint.snc.0.irq="6" hint.snc.0.maddr="0xc0000" -device ath # Atheros pci/cardbus NIC's -device ath_hal # pci/cardbus chip support -#device ath_ar5210 # AR5210 chips -#device ath_ar5211 # AR5211 chips -#device ath_ar5212 # AR5212 chips -#device ath_rf2413 -#device ath_rf2417 -#device ath_rf2425 -#device ath_rf5111 -#device ath_rf5112 -#device ath_rf5413 -#device ath_ar5416 # AR5416 chips -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -#device ath_ar9160 # AR9160 chips -#device ath_ar9280 # AR9280 chips -device ath_rate_sample # SampleRate tx rate control for ath - # # SCSI host adapters: #