PERFORCE change 153750 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=153750

Change 153750 by sam at sam_ebb on 2008/11/29 07:31:41

	fixup ath_hal going away

Affected files ...

.. //depot/projects/vap/sys/amd64/conf/GENERIC#22 edit
.. //depot/projects/vap/sys/amd64/conf/NOTES#15 edit
.. //depot/projects/vap/sys/i386/conf/GENERIC#25 edit
.. //depot/projects/vap/sys/i386/conf/NOTES#20 edit
.. //depot/projects/vap/sys/i386/conf/PAE#8 edit
.. //depot/projects/vap/sys/i386/conf/WIRELESS#4 edit
.. //depot/projects/vap/sys/mips/conf/IDT#7 edit
.. //depot/projects/vap/sys/mips/conf/SENTRY5#7 edit
.. //depot/projects/vap/sys/pc98/conf/GENERIC#17 edit
.. //depot/projects/vap/sys/pc98/conf/NOTES#14 edit
.. //depot/projects/vap/sys/sparc64/conf/GENERIC#20 edit

Differences ...

==== //depot/projects/vap/sys/amd64/conf/GENERIC#22 (text+ko) ====

@@ -248,7 +248,17 @@
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
-device		ath_hal		# Atheros HAL (Hardware Access Layer)
+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_rate_sample	# SampleRate tx rate control for ath
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.

==== //depot/projects/vap/sys/amd64/conf/NOTES#15 (text+ko) ====

@@ -258,7 +258,6 @@
 # Network interfaces:
 #
 
-# ath:  Atheros a/b/g WiFi adapters (requires ath_hal and wlan)
 # ed:   Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
 #       HP PC Lan+, various PC Card devices
 #       (requires miibus)
@@ -284,12 +283,21 @@
 device		ural
 device		wpi
 
-device		ath
-device		ath_hal		# Atheros HAL (includes binary component)
-#device		ath_rate_amrr	# AMRR rate control for ath driver
-#device		ath_rate_onoe	# Onoe rate control for ath driver
-device		ath_rate_sample	# SampleRate rate control for the ath driver
-#device		wlan		# 802.11 layer
+device		ath			# Atheros pci/cardbus NIC's
+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_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

==== //depot/projects/vap/sys/i386/conf/GENERIC#25 (text+ko) ====

@@ -263,7 +263,17 @@
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
-device		ath_hal		# Atheros HAL (Hardware Access Layer)
+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_rate_sample	# SampleRate tx rate control for ath
 device		ral		# Ralink Technology RT2500 wireless NICs.
 #device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.

==== //depot/projects/vap/sys/i386/conf/NOTES#20 (text+ko) ====

@@ -565,6 +565,19 @@
 hint.ar.0.port="0x300"
 hint.ar.0.irq="10"
 hint.ar.0.maddr="0xd0000"
+device		ath		# Atheros pci/cardbus NIC's
+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_rate_sample	# SampleRate tx rate control for ath
 device		ce
 device		cp
 device		cs
@@ -617,13 +630,6 @@
 options 	WLDEBUG		# enables verbose debugging output
 device		wpi
 
-device		ath
-device		ath_hal		# Atheros HAL (includes binary component)
-#device		ath_rate_amrr	# AMRR rate control for ath driver
-#device		ath_rate_onoe	# Onoe rate control for ath driver
-device		ath_rate_sample	# SampleRate rate control for the ath driver
-#device		wlan		# 802.11 layer
-
 #
 # ATA raid adapters
 #

==== //depot/projects/vap/sys/i386/conf/PAE#8 (text+ko) ====

@@ -78,7 +78,16 @@
 
 nodevice	an
 nodevice	ath		# Atheros pci/cardbus NIC's
-nodevice	ath_hal		# Atheros HAL (Hardware Access Layer)
+nodevice	ath_ar5210	# AR5210 chips
+nodevice	ath_ar5211	# AR5211 chips
+nodevice	ath_ar5212	# AR5212 chips
+nodevice	ath_rf2413
+nodevice	ath_rf2417
+nodevice	ath_rf2425
+nodevice	ath_rf5111
+nodevice	ath_rf5112
+nodevice	ath_rf5413
+nodevice	ath_ar5416	# AR5416 chips
 nodevice	ath_rate_sample	# SampleRate tx rate control for ath
 nodevice	ral
 nodevice	wi

==== //depot/projects/vap/sys/i386/conf/WIRELESS#4 (text+ko) ====

@@ -124,7 +124,8 @@
 device		cardbus		# CardBus (32-bit) bus
 
 # Serial (COM) ports
-device		sio		# 8250, 16[45]50 based serial ports
+#device		sio		# 8250, 16[45]50 based serial ports
+device		uart		# 8250, 16[45]50 based serial ports
 
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
@@ -170,7 +171,23 @@
 device		wlan_rssadapt
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
-device		ath_hal		# Atheros HAL (Hardware Access Layer)
+device		ath_ar5210
+device		ath_ar5211
+device		ath_ar5212
+device		ath_rf2413
+device		ath_rf2417
+device		ath_rf2425
+device		ath_rf5111
+device		ath_rf5112
+device		ath_rf5413
+#define		ath_ar5312
+#device		ath_rf2316
+#device		ath_rf2317
+device		ath_ar5416
+options		AH_SUPPORT_AR5416
+device		ath_ar9160
+#device		ath_ar9280
+#device		ath_ar9285
 device		ath_rate_sample	# SampleRate tx rate control for ath
 device		bwi		# Broadcom BCM43xx
 device		ipw		# Intel 2100
@@ -190,8 +207,8 @@
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
+#device		sl		# Kernel SLIP
+#device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
@@ -221,7 +238,7 @@
 device		ucom		# Generic com ttys
 device		uark		# Technologies ARK3116 based serial adapters
 device		ubsa		# Belkin F5U103 and compatible serial adapters
-device		ubser		# BWCT console serial adapters
+#device		ubser		# BWCT console serial adapters
 device		uftdi		# For FTDI usb serial adapters
 device		uipaq		# Some WinCE based devices
 device		uplcom		# Prolific PL-2303 serial adapters

==== //depot/projects/vap/sys/mips/conf/IDT#7 (text+ko) ====

@@ -44,7 +44,17 @@
 device		wlan_wep	# 802.11 WEP support
 device		wlan_tkip	# 802.11 TKIP support
 device		ath		# Atheros pci/cardbus NIC's
-device		ath_hal		# Atheros HAL (Hardware Access Layer)
+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_rate_sample	# SampleRate tx rate control for ath
 options		ATH_DEBUG
 

==== //depot/projects/vap/sys/mips/conf/SENTRY5#7 (text+ko) ====

@@ -79,7 +79,17 @@
 # pci devices
 # notyet:
 #device		ath			# in pci slot
-#device		ath_hal			# in pci slot
+#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		usb			# USB Bus (required)
 device		uhci			# UHCI PCI->USB interface

==== //depot/projects/vap/sys/pc98/conf/GENERIC#17 (text+ko) ====

@@ -221,7 +221,17 @@
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
-device		ath_hal		# Atheros HAL (Hardware Access Layer)
+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_rate_sample	# SampleRate tx rate control for ath
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.

==== //depot/projects/vap/sys/pc98/conf/NOTES#14 (text+ko) ====

@@ -418,12 +418,19 @@
 device		sr
 device		ural
 
-device		ath
-device		ath_hal		# Atheros HAL (includes binary component)
-#device		ath_rate_amrr	# AMRR rate control for ath driver
-#device		ath_rate_onoe	# Onoe rate control for ath driver
-device		ath_rate_sample	# SampleRate rate control for the ath driver
-#device		wlan		# 802.11 layer
+device		ath		# Atheros pci/cardbus NIC's
+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_rate_sample	# SampleRate tx rate control for ath
 
 #
 # SCSI host adapters:

==== //depot/projects/vap/sys/sparc64/conf/GENERIC#20 (text+ko) ====

@@ -199,7 +199,17 @@
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
 device		ath		# Atheros pci/cardbus NIC's
-device		ath_hal		# Atheros HAL (Hardware Access Layer)
+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_rate_sample	# SampleRate tx rate control for ath
 
 # Pseudo devices.