svn commit: r186918 - in projects/vap7/sys: . amd64/conf arm/conf
conf contrib/dev/ath contrib/dev/ral contrib/pf dev dev/ath
dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211
dev/ath/ath_hal/ar5212 de...
Sam Leffler
sam at FreeBSD.org
Fri Jan 9 01:47:26 UTC 2009
Author: sam
Date: Fri Jan 9 01:47:24 2009
New Revision: 186918
URL: http://svn.freebsd.org/changeset/base/186918
Log:
start backmerging vap support; this brings in net80211 and drivers; GENERIC
compiles but nothing tested or reviewed
Added:
projects/vap7/sys/contrib/dev/ral/
- copied from r178354, head/sys/contrib/dev/ral/
projects/vap7/sys/modules/ralfw/
- copied from r178354, head/sys/modules/ralfw/
projects/vap7/sys/modules/wlan_rssadapt/
- copied from r178354, head/sys/modules/wlan_rssadapt/
projects/vap7/sys/net80211/ieee80211_adhoc.c
- copied, changed from r178375, head/sys/net80211/ieee80211_adhoc.c
projects/vap7/sys/net80211/ieee80211_adhoc.h
- copied unchanged from r178375, head/sys/net80211/ieee80211_adhoc.h
projects/vap7/sys/net80211/ieee80211_ddb.c
- copied, changed from r178375, head/sys/net80211/ieee80211_ddb.c
projects/vap7/sys/net80211/ieee80211_dfs.c
- copied, changed from r178375, head/sys/net80211/ieee80211_dfs.c
projects/vap7/sys/net80211/ieee80211_dfs.h
- copied, changed from r178375, head/sys/net80211/ieee80211_dfs.h
projects/vap7/sys/net80211/ieee80211_hostap.c
- copied, changed from r178375, head/sys/net80211/ieee80211_hostap.c
projects/vap7/sys/net80211/ieee80211_hostap.h
- copied unchanged from r178375, head/sys/net80211/ieee80211_hostap.h
projects/vap7/sys/net80211/ieee80211_monitor.c
- copied unchanged from r178375, head/sys/net80211/ieee80211_monitor.c
projects/vap7/sys/net80211/ieee80211_monitor.h
- copied unchanged from r178375, head/sys/net80211/ieee80211_monitor.h
projects/vap7/sys/net80211/ieee80211_phy.c
- copied, changed from r178375, head/sys/net80211/ieee80211_phy.c
projects/vap7/sys/net80211/ieee80211_phy.h
- copied, changed from r178375, head/sys/net80211/ieee80211_phy.h
projects/vap7/sys/net80211/ieee80211_rssadapt.c
- copied unchanged from r178375, head/sys/net80211/ieee80211_rssadapt.c
projects/vap7/sys/net80211/ieee80211_rssadapt.h
- copied unchanged from r178375, head/sys/net80211/ieee80211_rssadapt.h
projects/vap7/sys/net80211/ieee80211_sta.c
- copied, changed from r178375, head/sys/net80211/ieee80211_sta.c
projects/vap7/sys/net80211/ieee80211_sta.h
- copied unchanged from r178375, head/sys/net80211/ieee80211_sta.h
projects/vap7/sys/net80211/ieee80211_tdma.c
- copied unchanged from r186915, head/sys/net80211/ieee80211_tdma.c
projects/vap7/sys/net80211/ieee80211_tdma.h
- copied unchanged from r186915, head/sys/net80211/ieee80211_tdma.h
projects/vap7/sys/net80211/ieee80211_wds.c
- copied, changed from r178375, head/sys/net80211/ieee80211_wds.c
projects/vap7/sys/net80211/ieee80211_wds.h
- copied unchanged from r178375, head/sys/net80211/ieee80211_wds.h
Deleted:
projects/vap7/sys/contrib/dev/ath/
projects/vap7/sys/dev/awi/
projects/vap7/sys/dev/ral/if_ralrate.c
projects/vap7/sys/dev/ral/if_ralrate.h
projects/vap7/sys/dev/ral/rt2661_ucode.h
projects/vap7/sys/dev/wi/spectrum24t_cf.h
projects/vap7/sys/modules/ath_hal/
projects/vap7/sys/modules/ath_rate_amrr/
projects/vap7/sys/modules/ath_rate_onoe/
projects/vap7/sys/modules/ath_rate_sample/
projects/vap7/sys/modules/awi/
projects/vap7/sys/modules/wlan_scan_ap/
projects/vap7/sys/modules/wlan_scan_sta/
projects/vap7/sys/net80211/ieee80211_scan_ap.c
Modified:
projects/vap7/sys/ (props changed)
projects/vap7/sys/amd64/conf/GENERIC
projects/vap7/sys/amd64/conf/NOTES
projects/vap7/sys/arm/conf/AVILA
projects/vap7/sys/arm/conf/HL200
projects/vap7/sys/arm/conf/KB920X
projects/vap7/sys/conf/NOTES
projects/vap7/sys/conf/files
projects/vap7/sys/conf/files.amd64
projects/vap7/sys/conf/files.arm
projects/vap7/sys/conf/files.i386
projects/vap7/sys/conf/files.pc98
projects/vap7/sys/conf/files.powerpc
projects/vap7/sys/conf/files.sparc64
projects/vap7/sys/conf/kern.pre.mk
projects/vap7/sys/conf/options
projects/vap7/sys/contrib/pf/ (props changed)
projects/vap7/sys/dev/ (props changed)
projects/vap7/sys/dev/ath/ (props changed)
projects/vap7/sys/dev/ath/ah_osdep.c
projects/vap7/sys/dev/ath/ah_osdep.h
projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed)
projects/vap7/sys/dev/ath/ath_rate/amrr/amrr.c
projects/vap7/sys/dev/ath/ath_rate/amrr/amrr.h
projects/vap7/sys/dev/ath/ath_rate/onoe/onoe.c
projects/vap7/sys/dev/ath/ath_rate/onoe/onoe.h
projects/vap7/sys/dev/ath/ath_rate/sample/sample.c
projects/vap7/sys/dev/ath/ath_rate/sample/sample.h
projects/vap7/sys/dev/ath/if_ath.c
projects/vap7/sys/dev/ath/if_ath_pci.c
projects/vap7/sys/dev/ath/if_athioctl.h
projects/vap7/sys/dev/ath/if_athrate.h
projects/vap7/sys/dev/ath/if_athvar.h
projects/vap7/sys/dev/cxgb/ (props changed)
projects/vap7/sys/dev/if_ndis/if_ndis.c
projects/vap7/sys/dev/if_ndis/if_ndisvar.h
projects/vap7/sys/dev/ipw/if_ipw.c
projects/vap7/sys/dev/ipw/if_ipwvar.h
projects/vap7/sys/dev/iwi/if_iwi.c
projects/vap7/sys/dev/iwi/if_iwivar.h
projects/vap7/sys/dev/malo/if_malo.c
projects/vap7/sys/dev/malo/if_malo.h
projects/vap7/sys/dev/ral/if_ral_pci.c
projects/vap7/sys/dev/ral/rt2560.c
projects/vap7/sys/dev/ral/rt2560reg.h
projects/vap7/sys/dev/ral/rt2560var.h
projects/vap7/sys/dev/ral/rt2661.c
projects/vap7/sys/dev/ral/rt2661var.h
projects/vap7/sys/dev/usb/if_rum.c
projects/vap7/sys/dev/usb/if_rumvar.h
projects/vap7/sys/dev/usb/if_ural.c
projects/vap7/sys/dev/usb/if_uralvar.h
projects/vap7/sys/dev/usb/if_zyd.c
projects/vap7/sys/dev/usb/if_zydreg.h
projects/vap7/sys/dev/wi/if_wavelan_ieee.h
projects/vap7/sys/dev/wi/if_wi.c
projects/vap7/sys/dev/wi/if_wi_pccard.c
projects/vap7/sys/dev/wi/if_wi_pci.c
projects/vap7/sys/dev/wi/if_wivar.h
projects/vap7/sys/dev/wpi/if_wpi.c
projects/vap7/sys/dev/wpi/if_wpivar.h
projects/vap7/sys/i386/conf/GENERIC
projects/vap7/sys/i386/conf/NOTES
projects/vap7/sys/i386/conf/PAE
projects/vap7/sys/kern/kern_timeout.c
projects/vap7/sys/modules/Makefile
projects/vap7/sys/modules/ath/Makefile
projects/vap7/sys/modules/malo/Makefile
projects/vap7/sys/modules/ral/Makefile
projects/vap7/sys/modules/wlan/Makefile
projects/vap7/sys/modules/wlan_acl/Makefile
projects/vap7/sys/modules/wlan_amrr/Makefile
projects/vap7/sys/modules/wlan_ccmp/Makefile
projects/vap7/sys/modules/wlan_tkip/Makefile
projects/vap7/sys/modules/wlan_wep/Makefile
projects/vap7/sys/modules/wlan_xauth/Makefile
projects/vap7/sys/net/if.c
projects/vap7/sys/net/if_clone.c
projects/vap7/sys/net/if_clone.h
projects/vap7/sys/net/if_var.h
projects/vap7/sys/net80211/ (props changed)
projects/vap7/sys/net80211/_ieee80211.h
projects/vap7/sys/net80211/ieee80211.c
projects/vap7/sys/net80211/ieee80211.h
projects/vap7/sys/net80211/ieee80211_acl.c
projects/vap7/sys/net80211/ieee80211_amrr.c
projects/vap7/sys/net80211/ieee80211_amrr.h
projects/vap7/sys/net80211/ieee80211_crypto.c
projects/vap7/sys/net80211/ieee80211_crypto.h
projects/vap7/sys/net80211/ieee80211_crypto_ccmp.c
projects/vap7/sys/net80211/ieee80211_crypto_none.c
projects/vap7/sys/net80211/ieee80211_crypto_tkip.c
projects/vap7/sys/net80211/ieee80211_crypto_wep.c
projects/vap7/sys/net80211/ieee80211_freebsd.c
projects/vap7/sys/net80211/ieee80211_freebsd.h
projects/vap7/sys/net80211/ieee80211_ht.c
projects/vap7/sys/net80211/ieee80211_ht.h
projects/vap7/sys/net80211/ieee80211_input.c
projects/vap7/sys/net80211/ieee80211_input.h
projects/vap7/sys/net80211/ieee80211_ioctl.c
projects/vap7/sys/net80211/ieee80211_ioctl.h
projects/vap7/sys/net80211/ieee80211_node.c
projects/vap7/sys/net80211/ieee80211_node.h
projects/vap7/sys/net80211/ieee80211_output.c
projects/vap7/sys/net80211/ieee80211_power.c
projects/vap7/sys/net80211/ieee80211_power.h
projects/vap7/sys/net80211/ieee80211_proto.c
projects/vap7/sys/net80211/ieee80211_proto.h
projects/vap7/sys/net80211/ieee80211_regdomain.c
projects/vap7/sys/net80211/ieee80211_regdomain.h
projects/vap7/sys/net80211/ieee80211_scan.c
projects/vap7/sys/net80211/ieee80211_scan.h
projects/vap7/sys/net80211/ieee80211_scan_sta.c
projects/vap7/sys/net80211/ieee80211_var.h
projects/vap7/sys/net80211/ieee80211_xauth.c
projects/vap7/sys/pc98/conf/GENERIC
projects/vap7/sys/pc98/conf/NOTES
projects/vap7/sys/sparc64/conf/GENERIC
projects/vap7/sys/sys/callout.h
Modified: projects/vap7/sys/amd64/conf/GENERIC
==============================================================================
--- projects/vap7/sys/amd64/conf/GENERIC Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/amd64/conf/GENERIC Fri Jan 9 01:47:24 2009 (r186918)
@@ -238,13 +238,11 @@ device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_amrr # AMRR transmit rate control algorithm
-device wlan_scan_ap # 802.11 AP mode scanning
-device wlan_scan_sta # 802.11 STA mode scanning
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_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 awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
Modified: projects/vap7/sys/amd64/conf/NOTES
==============================================================================
--- projects/vap7/sys/amd64/conf/NOTES Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/amd64/conf/NOTES Fri Jan 9 01:47:24 2009 (r186918)
@@ -305,7 +305,6 @@ options DRM_DEBUG # Include debug print
# 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)
@@ -329,12 +328,12 @@ device ral
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_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
Modified: projects/vap7/sys/arm/conf/AVILA
==============================================================================
--- projects/vap7/sys/arm/conf/AVILA Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/arm/conf/AVILA Fri Jan 9 01:47:24 2009 (r186918)
@@ -127,11 +127,13 @@ device random # Entrop
# Wireless NIC cards
device wlan # 802.11 support
-#device wlan_wep # 802.11 WEP support
-#device wlan_ccmp # 802.11 CCMP support
-#device wlan_tkip # 802.11 TKIP support
+device wlan_wep # 802.11 WEP support
+device wlan_ccmp # 802.11 CCMP support
+device wlan_tkip # 802.11 TKIP support
+device wlan_xauth
device ath # Atheros pci/cardbus NIC's
device ath_hal # Atheros HAL (Hardware Access Layer)
+options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
device ath_rate_sample # SampleRate tx rate control for ath
options ATH_DEBUG
Modified: projects/vap7/sys/arm/conf/HL200
==============================================================================
--- projects/vap7/sys/arm/conf/HL200 Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/arm/conf/HL200 Fri Jan 9 01:47:24 2009 (r186918)
@@ -148,5 +148,3 @@ device wlan_wep # 802.11
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_amrr # AMRR transmit rate control algorithm
-device wlan_scan_ap # 802.11 AP mode scanning
-device wlan_scan_sta # 802.11 STA mode scanning
Modified: projects/vap7/sys/arm/conf/KB920X
==============================================================================
--- projects/vap7/sys/arm/conf/KB920X Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/arm/conf/KB920X Fri Jan 9 01:47:24 2009 (r186918)
@@ -136,5 +136,3 @@ device wlan_wep # 802.11
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_amrr # AMRR transmit rate control algorithm
-device wlan_scan_ap # 802.11 AP mode scanning
-device wlan_scan_sta # 802.11 STA mode scanning
Modified: projects/vap7/sys/conf/NOTES
==============================================================================
--- projects/vap7/sys/conf/NOTES Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/conf/NOTES Fri Jan 9 01:47:24 2009 (r186918)
@@ -713,7 +713,7 @@ device mn # Munich32x/Falc54 Nx64kbit/s
# according to IEEE 802.1Q. It requires `device miibus'.
# The `wlan' device provides generic code to support 802.11
# drivers, including host AP mode; it is MANDATORY for the wi,
-# ath, and awi drivers and will eventually be required by all 802.11 drivers.
+# and ath drivers and will eventually be required by all 802.11 drivers.
# The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide
# support for WEP, TKIP, and AES-CCMP crypto protocols optionally
# used with 802.11 devices that depend on the `wlan' module.
@@ -774,8 +774,6 @@ device wlan_tkip #802.11 TKIP support
device wlan_xauth #802.11 external authenticator support
device wlan_acl #802.11 MAC ACL support
device wlan_amrr #AMRR transmit rate control algorithm
-device wlan_scan_ap #802.11 AP mode scanning
-device wlan_scan_sta #802.11 STA mode scanning
device token #Generic TokenRing
device fddi #Generic FDDI
device arcnet #Generic Arcnet
@@ -1720,8 +1718,6 @@ device miibus
# L2 PCI-Express FastEthernet controllers.
# an: Aironet 4500/4800 802.11 wireless adapters. Supports the PCMCIA,
# PCI and ISA varieties.
-# awi: Support for IEEE 802.11 PC Card devices using the AMD Am79C930 and
-# Harris (Intersil) Chipset with PCnetMobile firmware by AMD.
# age: Support for gigabit ethernet adapters based on the Attansic/Atheros
# L1 PCI express gigabit ethernet controllers.
# ale: Support for Atheros AR8121/AR8113/AR8114 PCIe ethernet controllers.
@@ -1861,7 +1857,6 @@ hint.sn.0.at="isa"
hint.sn.0.port="0x300"
hint.sn.0.irq="10"
device an
-device awi
device cnw
device wi
device xe
Modified: projects/vap7/sys/conf/files
==============================================================================
--- projects/vap7/sys/conf/files Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/conf/files Fri Jan 9 01:47:24 2009 (r186918)
@@ -475,21 +475,179 @@ dev/ata/atapi-cam.c optional atapicam
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
-dev/ath/ah_osdep.c optional ath_hal \
+dev/ath/if_ath.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath_pci.c optional ath pci \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ah_osdep.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ah.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ah_eeprom_v1.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ah_eeprom_v3.c optional ath_hal | ath_ar5211 | ath_ar5212 \
compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ah_eeprom_v14.c optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ah_regdomain.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ar5210/ar5210_attach.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_beacon.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_interrupts.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_keycache.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_misc.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_phy.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_power.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_recv.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_reset.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_xmit.c optional ath_hal | ath_ar5210 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_attach.c optional ath_hal | ath_ar5211 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_beacon.c optional ath_hal | ath_ar5211 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_interrupts.c optional ath_hal | ath_ar5211 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_keycache.c optional ath_hal | ath_ar5211 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_misc.c optional ath_hal | ath_ar5211 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_phy.c optional ath_hal | ath_ar5211 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_power.c optional ath_hal | ath_ar5211 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_recv.c optional ath_hal | ath_ar5211 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_reset.c optional ath_hal | ath_ar5211 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_xmit.c optional ath_hal | ath_ar5211 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_ani.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_attach.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_beacon.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_eeprom.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_gpio.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_interrupts.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_keycache.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_misc.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_phy.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_power.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_recv.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_reset.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_rfgain.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_xmit.c \
+ optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar2316.c optional ath_rf2316 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar2317.c optional ath_rf2317 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar2413.c optional ath_hal | ath_rf2413 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar2425.c optional ath_hal | ath_rf2425 | ath_rf2417 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5111.c optional ath_hal | ath_rf5111 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5112.c optional ath_hal | ath_rf5112 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5413.c optional ath_hal | ath_rf5413 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar2133.c optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_ani.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_attach.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_beacon.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_cal.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_cal_iq.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_eeprom.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_gpio.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_interrupts.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_keycache.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_misc.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_phy.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_power.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_recv.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_reset.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_xmit.c \
+ optional ath_hal | ath_ar5416 | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar9160_attach.c optional ath_hal | ath_ar9160 \
+ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \
compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \
compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \
compile-with "${NORMAL_C} -I$S/dev/ath"
-dev/ath/if_ath.c optional ath \
- compile-with "${NORMAL_C} -I$S/dev/ath"
-dev/ath/if_ath_pci.c optional ath pci \
- compile-with "${NORMAL_C} -I$S/dev/ath"
-dev/awi/am79c930.c optional awi
-dev/awi/awi.c optional awi
-dev/awi/if_awi_pccard.c optional awi pccard
dev/bce/if_bce.c optional bce
dev/bfe/if_bfe.c optional bfe
dev/bge/if_bge.c optional bge
@@ -759,6 +917,9 @@ dev/le/lance.c optional le
dev/led/led.c standard
dev/lge/if_lge.c optional lge
dev/lmc/if_lmc.c optional lmc
+dev/malo/if_malo.c optional malo
+dev/malo/if_malohal.c optional malo
+dev/malo/if_malo_pci.c optional malo pci
dev/mc146818/mc146818.c optional mc146818
dev/mca/mca_bus.c optional mca
dev/mcd/mcd.c optional mcd isa nowerror
@@ -910,7 +1071,6 @@ dev/puc/puc_pci.c optional puc pci
dev/puc/pucdata.c optional puc pci
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
-dev/ral/if_ralrate.c optional ral
dev/ral/if_ral_pci.c optional ral pci
dev/random/harvest.c standard
dev/random/hash.c optional random
@@ -1663,24 +1823,33 @@ net/zlib.c optional crypto | geom_uzip
ddb_ctf
net80211/ieee80211.c optional wlan
net80211/ieee80211_acl.c optional wlan_acl
+net80211/ieee80211_adhoc.c optional wlan
net80211/ieee80211_amrr.c optional wlan_amrr
net80211/ieee80211_crypto.c optional wlan
net80211/ieee80211_crypto_ccmp.c optional wlan_ccmp
net80211/ieee80211_crypto_none.c optional wlan
net80211/ieee80211_crypto_tkip.c optional wlan_tkip
net80211/ieee80211_crypto_wep.c optional wlan_wep
+net80211/ieee80211_ddb.c optional wlan ddb
+net80211/ieee80211_dfs.c optional wlan
net80211/ieee80211_freebsd.c optional wlan
+net80211/ieee80211_hostap.c optional wlan
net80211/ieee80211_ht.c optional wlan
net80211/ieee80211_input.c optional wlan
net80211/ieee80211_ioctl.c optional wlan
+net80211/ieee80211_monitor.c optional wlan
net80211/ieee80211_node.c optional wlan
net80211/ieee80211_output.c optional wlan
+net80211/ieee80211_phy.c optional wlan
net80211/ieee80211_power.c optional wlan
net80211/ieee80211_proto.c optional wlan
net80211/ieee80211_regdomain.c optional wlan
+net80211/ieee80211_rssadapt.c optional wlan_rssadapt
net80211/ieee80211_scan.c optional wlan
-net80211/ieee80211_scan_ap.c optional wlan_scan_ap
-net80211/ieee80211_scan_sta.c optional wlan_scan_sta
+net80211/ieee80211_scan_sta.c optional wlan
+net80211/ieee80211_sta.c optional wlan
+net80211/ieee80211_tdma.c optional wlan
+net80211/ieee80211_wds.c optional wlan
net80211/ieee80211_xauth.c optional wlan_xauth
netatalk/aarp.c optional netatalk
netatalk/at_control.c optional netatalk
Modified: projects/vap7/sys/conf/files.amd64
==============================================================================
--- projects/vap7/sys/conf/files.amd64 Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/conf/files.amd64 Fri Jan 9 01:47:24 2009 (r186918)
@@ -47,16 +47,6 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
-hal.o optional ath_hal \
- dependency "$S/contrib/dev/ath/public/x86_64-elf.hal.o.uu" \
- compile-with "uudecode < $S/contrib/dev/ath/public/x86_64-elf.hal.o.uu" \
- no-implicit-rule
-opt_ah.h optional ath_hal \
- dependency "$S/contrib/dev/ath/public/x86_64-elf.opt_ah.h" \
- compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/x86_64-elf.opt_ah.h opt_ah.h" \
- no-obj no-implicit-rule before-depend \
- clean "opt_ah.h"
-#
nvenetlib.o optional nve pci \
dependency "$S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu" \
compile-with "uudecode $S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
Modified: projects/vap7/sys/conf/files.arm
==============================================================================
--- projects/vap7/sys/conf/files.arm Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/conf/files.arm Fri Jan 9 01:47:24 2009 (r186918)
@@ -52,13 +52,6 @@ geom/geom_bsd.c standard
geom/geom_bsd_enc.c standard
geom/geom_mbr.c standard
geom/geom_mbr_enc.c standard
-hal.o optional ath_hal \
- compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \
- no-implicit-rule
-opt_ah.h optional ath_hal \
- compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; rm -f opt_ah.h; cp $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.opt_ah.h opt_ah.h" \
- no-obj no-implicit-rule before-depend \
- clean "opt_ah.h"
libkern/arm/divsi3.S standard
libkern/arm/ffs.S standard
libkern/arm/muldi3.c standard
Modified: projects/vap7/sys/conf/files.i386
==============================================================================
--- projects/vap7/sys/conf/files.i386 Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/conf/files.i386 Fri Jan 9 01:47:24 2009 (r186918)
@@ -50,17 +50,6 @@ trlld.o optional oltr \
dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \
compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \
no-implicit-rule
-#
-hal.o optional ath_hal \
- dependency "$S/contrib/dev/ath/public/i386-elf.hal.o.uu" \
- compile-with "uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \
- no-implicit-rule
-opt_ah.h optional ath_hal \
- dependency "$S/contrib/dev/ath/public/i386-elf.opt_ah.h" \
- compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \
- no-obj no-implicit-rule before-depend \
- clean "opt_ah.h"
-#
nvenetlib.o optional nve pci \
dependency "$S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu" \
compile-with "uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
Modified: projects/vap7/sys/conf/files.pc98
==============================================================================
--- projects/vap7/sys/conf/files.pc98 Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/conf/files.pc98 Fri Jan 9 01:47:24 2009 (r186918)
@@ -42,17 +42,6 @@ trlld.o optional oltr \
dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \
compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \
no-implicit-rule
-#
-hal.o optional ath_hal \
- dependency "$S/contrib/dev/ath/public/i386-elf.hal.o.uu" \
- compile-with "uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \
- no-implicit-rule
-opt_ah.h optional ath_hal \
- dependency "$S/contrib/dev/ath/public/i386-elf.opt_ah.h" \
- compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \
- no-obj no-implicit-rule before-depend \
- clean "opt_ah.h"
-#
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
compat/linux/linux_emul.c optional compat_linux
Modified: projects/vap7/sys/conf/files.powerpc
==============================================================================
--- projects/vap7/sys/conf/files.powerpc Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/conf/files.powerpc Fri Jan 9 01:47:24 2009 (r186918)
@@ -14,16 +14,6 @@ font.h optional
no-obj no-implicit-rule before-depend \
clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
#
-hal.o optional ath_hal \
- dependency "$S/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu" \
- compile-with "uudecode < $S/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu" \
- no-implicit-rule
-opt_ah.h optional ath_hal \
- dependency "$S/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h" \
- compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h opt_ah.h" \
- no-obj no-implicit-rule before-depend \
- clean "opt_ah.h"
-#
dev/bm/if_bm.c optional bm powermac
dev/fb/fb.c optional sc
Modified: projects/vap7/sys/conf/files.sparc64
==============================================================================
--- projects/vap7/sys/conf/files.sparc64 Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/conf/files.sparc64 Fri Jan 9 01:47:24 2009 (r186918)
@@ -22,16 +22,6 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
-hal.o optional ath_hal \
- dependency "$S/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu" \
- compile-with "uudecode < $S/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu" \
- no-implicit-rule
-opt_ah.h optional ath_hal \
- dependency "$S/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h" \
- compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h opt_ah.h" \
- no-obj no-implicit-rule before-depend \
- clean "opt_ah.h"
-#
crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb
dev/atkbdc/atkbd.c optional atkbd atkbdc
Modified: projects/vap7/sys/conf/kern.pre.mk
==============================================================================
--- projects/vap7/sys/conf/kern.pre.mk Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/conf/kern.pre.mk Fri Jan 9 01:47:24 2009 (r186918)
@@ -67,8 +67,8 @@ INCLUDES+= -I$S/contrib/ipfilter
# ... and the same for pf
INCLUDES+= -I$S/contrib/pf
-# ... and the same for Atheros HAL
-INCLUDES+= -I$S/dev/ath
+# ... and the same for ath
+INCLUDES+= -I$S/dev/ath -I$S/dev/ath/ath_hal
# ... and the same for the NgATM stuff
INCLUDES+= -I$S/contrib/ngatm
Modified: projects/vap7/sys/conf/options
==============================================================================
--- projects/vap7/sys/conf/options Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/conf/options Fri Jan 9 01:47:24 2009 (r186918)
@@ -726,6 +726,27 @@ ATH_TXBUF opt_ath.h
ATH_RXBUF opt_ath.h
ATH_DIAGAPI opt_ath.h
ATH_TX99_DIAG opt_ath.h
+ATH_SUPPORT_TDMA opt_ath.h
+
+# options for the Atheros hal
+AH_SUPPORT_AR5416 opt_ah.h
+
+AH_DEBUG opt_ah.h
+AH_ASSERT opt_ah.h
+AH_DEBUG_ALQ opt_ah.h
+AH_REGOPS_FUNC opt_ah.h
+AH_WRITE_REGDOMAIN opt_ah.h
+AH_DEBUG_COUNTRY opt_ah.h
+AH_WRITE_EEPROM opt_ah.h
+AH_PRIVATE_DIAG opt_ah.h
+AH_NEED_DESC_SWAP opt_ah.h
+AH_USE_INIPDGAIN opt_ah.h
+AH_SUPPORT_11D opt_ah.h
+
+# options for the Marvell 8335 wireless driver
+MALO_DEBUG opt_malo.h
+MALO_TXBUF opt_malo.h
+MALO_RXBUF opt_malo.h
# dcons options
DCONS_BUF_SIZE opt_dcons.h
@@ -754,4 +775,17 @@ XBOX opt_xbox.h
XFS
# Interrupt filtering
-INTR_FILTER opt_global.h
+INTR_FILTER
+
+# 802.11 support layer
+IEEE80211_DEBUG opt_wlan.h
+IEEE80211_DEBUG_REFCNT opt_wlan.h
+IEEE80211_AMPDU_AGE opt_wlan.h
+IEEE80211_SUPPORT_TDMA opt_wlan.h
+
+# 802.11 TDMA support
+TDMA_SLOTLEN_DEFAULT opt_tdma.h
+TDMA_SLOTCNT_DEFAULT opt_tdma.h
+TDMA_BINTVAL_DEFAULT opt_tdma.h
+TDMA_TXRATE_11B_DEFAULT opt_tdma.h
+TDMA_TXRATE_11G_DEFAULT opt_tdma.h
Modified: projects/vap7/sys/dev/ath/ah_osdep.c
==============================================================================
--- projects/vap7/sys/dev/ath/ah_osdep.c Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/dev/ath/ah_osdep.c Fri Jan 9 01:47:24 2009 (r186918)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
+ * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
#include <net/ethernet.h> /* XXX for ether_sprintf */
-#include <contrib/dev/ath/ah.h>
+#include <dev/ath/ath_hal/ah.h>
/*
* WiSoC boards overload the bus tag with information about the
@@ -56,7 +56,7 @@
#define BUSTAG(ah) \
((bus_space_tag_t) ((struct ar531x_config *)((ah)->ah_st))->tag)
#else
-#define BUSTAG(ah) ((bus_space_tag_t) (ah)->ah_st)
+#define BUSTAG(ah) ((ah)->ah_st)
#endif
extern void ath_hal_printf(struct ath_hal *, const char*, ...)
@@ -71,8 +71,12 @@ extern void ath_hal_assert_failed(const
int lineno, const char* msg);
#endif
#ifdef AH_DEBUG
+#if HAL_ABI_VERSION >= 0x08090101
+extern void HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...);
+#else
extern void HALDEBUG(struct ath_hal *ah, const char* fmt, ...);
extern void HALDEBUGn(struct ath_hal *ah, u_int level, const char* fmt, ...);
+#endif
#endif /* AH_DEBUG */
/* NB: put this here instead of the driver to avoid circular references */
@@ -86,9 +90,6 @@ SYSCTL_INT(_hw_ath_hal, OID_AUTO, debug,
TUNABLE_INT("hw.ath.hal.debug", &ath_hal_debug);
#endif /* AH_DEBUG */
-SYSCTL_STRING(_hw_ath_hal, OID_AUTO, version, CTLFLAG_RD, ath_hal_version, 0,
- "Atheros HAL version");
-
/* NB: these are deprecated; they exist for now for compatibility */
int ath_hal_dma_beacon_response_time = 2; /* in TU's */
SYSCTL_INT(_hw_ath_hal, OID_AUTO, dma_brt, CTLFLAG_RW,
@@ -139,6 +140,18 @@ ath_hal_ether_sprintf(const u_int8_t *ma
}
#ifdef AH_DEBUG
+#if HAL_ABI_VERSION >= 0x08090101
+void
+HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...)
+{
+ if (ath_hal_debug & mask) {
+ __va_list ap;
+ va_start(ap, fmt);
+ ath_hal_vprintf(ah, fmt, ap);
+ va_end(ap);
+ }
+}
+#else
void
HALDEBUG(struct ath_hal *ah, const char* fmt, ...)
{
@@ -160,6 +173,7 @@ HALDEBUGn(struct ath_hal *ah, u_int leve
va_end(ap);
}
}
+#endif
#endif /* AH_DEBUG */
#ifdef AH_DEBUG_ALQ
@@ -178,7 +192,7 @@ HALDEBUGn(struct ath_hal *ah, u_int leve
*/
#include <sys/alq.h>
#include <sys/pcpu.h>
-#include <contrib/dev/ath/ah_decode.h>
+#include <dev/ath/ath_hal/ah_decode.h>
static struct alq *ath_hal_alq;
static int ath_hal_alq_emitdev; /* need to emit DEVICE record */
@@ -256,7 +270,7 @@ void
ath_hal_reg_write(struct ath_hal *ah, u_int32_t reg, u_int32_t val)
{
bus_space_tag_t tag = BUSTAG(ah);
- bus_space_handle_t h = (bus_space_handle_t) ah->ah_sh;
+ bus_space_handle_t h = ah->ah_sh;
if (ath_hal_alq) {
struct ale *ale = ath_hal_alq_get(ah);
@@ -280,7 +294,7 @@ u_int32_t
ath_hal_reg_read(struct ath_hal *ah, u_int32_t reg)
{
bus_space_tag_t tag = BUSTAG(ah);
- bus_space_handle_t h = (bus_space_handle_t) ah->ah_sh;
+ bus_space_handle_t h = ah->ah_sh;
u_int32_t val;
#if _BYTE_ORDER == _BIG_ENDIAN
@@ -332,7 +346,7 @@ void
ath_hal_reg_write(struct ath_hal *ah, u_int32_t reg, u_int32_t val)
{
bus_space_tag_t tag = BUSTAG(ah);
- bus_space_handle_t h = (bus_space_handle_t) ah->ah_sh;
+ bus_space_handle_t h = ah->ah_sh;
#if _BYTE_ORDER == _BIG_ENDIAN
if (reg >= 0x4000 && reg < 0x5000)
@@ -346,7 +360,7 @@ u_int32_t
ath_hal_reg_read(struct ath_hal *ah, u_int32_t reg)
{
bus_space_tag_t tag = BUSTAG(ah);
- bus_space_handle_t h = (bus_space_handle_t) ah->ah_sh;
+ bus_space_handle_t h = ah->ah_sh;
u_int32_t val;
#if _BYTE_ORDER == _BIG_ENDIAN
@@ -398,37 +412,3 @@ ath_hal_memcpy(void *dst, const void *sr
{
return memcpy(dst, src, n);
}
-
-/*
- * Module glue.
- */
-
-static int
-ath_hal_modevent(module_t mod, int type, void *unused)
-{
- const char *sep;
- int i;
-
- switch (type) {
- case MOD_LOAD:
- printf("ath_hal: %s (", ath_hal_version);
- sep = "";
- for (i = 0; ath_hal_buildopts[i] != NULL; i++) {
- printf("%s%s", sep, ath_hal_buildopts[i]);
- sep = ", ";
- }
- printf(")\n");
- return 0;
- case MOD_UNLOAD:
- return 0;
- }
- return EINVAL;
-}
-
-static moduledata_t ath_hal_mod = {
- "ath_hal",
- ath_hal_modevent,
- 0
-};
-DECLARE_MODULE(ath_hal, ath_hal_mod, SI_SUB_DRIVERS, SI_ORDER_ANY);
-MODULE_VERSION(ath_hal, 1);
Modified: projects/vap7/sys/dev/ath/ah_osdep.h
==============================================================================
--- projects/vap7/sys/dev/ath/ah_osdep.h Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/dev/ath/ah_osdep.h Fri Jan 9 01:47:24 2009 (r186918)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
+ * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,13 +33,29 @@
/*
* Atheros Hardware Access Layer (HAL) OS Dependent Definitions.
*/
+#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/endian.h>
+#include <sys/linker_set.h>
#include <machine/bus.h>
/*
+ * Bus i/o type definitions.
+ */
+typedef void *HAL_SOFTC;
+typedef bus_space_tag_t HAL_BUS_TAG;
+typedef bus_space_handle_t HAL_BUS_HANDLE;
+
+/*
+ * Linker set writearounds for chip and RF backend registration.
+ */
+#define OS_DATA_SET(set, item) DATA_SET(set, item)
+#define OS_SET_DECLARE(set, ptype) SET_DECLARE(set, ptype)
+#define OS_SET_FOREACH(pvar, set) SET_FOREACH(pvar, set)
+
+/*
* Delay n microseconds.
*/
extern void ath_hal_delay(int);
Modified: projects/vap7/sys/dev/ath/ath_rate/amrr/amrr.c
==============================================================================
--- projects/vap7/sys/dev/ath/ath_rate/amrr/amrr.c Thu Jan 8 23:50:32 2009 (r186917)
+++ projects/vap7/sys/dev/ath/ath_rate/amrr/amrr.c Fri Jan 9 01:47:24 2009 (r186918)
@@ -46,11 +46,11 @@ __FBSDID("$FreeBSD$");
* Mathieu Lacage, Hossein Manshaei, Thierry Turletti
*/
#include "opt_inet.h"
+#include "opt_wlan.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysctl.h>
-#include <sys/module.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/mutex.h>
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_media.h>
#include <net/if_arp.h>
-#include <net/ethernet.h> /* XXX for ether_sprintf */
#include <net80211/ieee80211_var.h>
@@ -78,23 +77,12 @@ __FBSDID("$FreeBSD$");
#include <dev/ath/if_athvar.h>
#include <dev/ath/ath_rate/amrr/amrr.h>
-#include <contrib/dev/ath/ah_desc.h>
-
-#define AMRR_DEBUG
-#ifdef AMRR_DEBUG
-#define DPRINTF(sc, _fmt, ...) do { \
- if (sc->sc_debug & 0x10) \
- printf(_fmt, __VA_ARGS__); \
-} while (0)
-#else
-#define DPRINTF(sc, _fmt, ...)
-#endif
+#include <dev/ath/ath_hal/ah_desc.h>
static int ath_rateinterval = 1000; /* rate ctl interval (ms) */
static int ath_rate_max_success_threshold = 10;
static int ath_rate_min_success_threshold = 1;
-static void ath_ratectl(void *);
static void ath_rate_update(struct ath_softc *, struct ieee80211_node *,
int rate);
static void ath_rate_ctl_start(struct ath_softc *, struct ieee80211_node *);
@@ -104,7 +92,6 @@ void
ath_rate_node_init(struct ath_softc *sc, struct ath_node *an)
{
/* NB: assumed to be zero'd by caller */
- ath_rate_update(sc, &an->an_node, 0);
}
void
@@ -166,6 +153,11 @@ ath_rate_tx_complete(struct ath_softc *s
amn->amn_tx_try3_cnt++;
amn->amn_tx_failure_cnt++;
}
+ if (amn->amn_interval != 0 &&
+ ticks - amn->amn_ticks > amn->amn_interval) {
+ ath_rate_ctl(sc, &an->an_node);
+ amn->amn_ticks = ticks;
+ }
}
void
@@ -176,7 +168,7 @@ ath_rate_newassoc(struct ath_softc *sc,
}
static void
-node_reset (struct amrr_node *amn)
+node_reset(struct amrr_node *amn)
{
amn->amn_tx_try0_cnt = 0;
amn->amn_tx_try1_cnt = 0;
@@ -200,17 +192,18 @@ ath_rate_update(struct ath_softc *sc, st
{
struct ath_node *an = ATH_NODE(ni);
struct amrr_node *amn = ATH_NODE_AMRR(an);
+ struct ieee80211vap *vap = ni->ni_vap;
const HAL_RATE_TABLE *rt = sc->sc_currates;
u_int8_t rix;
KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
- DPRINTF(sc, "%s: set xmit rate for %s to %dM\n",
- __func__, ether_sprintf(ni->ni_macaddr),
+ IEEE80211_NOTE(vap, IEEE80211_MSG_RATECTL, ni,
+ "%s: set xmit rate to %dM", __func__,
ni->ni_rates.rs_nrates > 0 ?
(ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL) / 2 : 0);
- ni->ni_txrate = rate;
+ amn->amn_rix = rate;
/*
* Before associating a node has no rate set setup
* so we can't calculate any transmit codes to use.
@@ -219,8 +212,8 @@ ath_rate_update(struct ath_softc *sc, st
* lowest hardware rate.
*/
if (ni->ni_rates.rs_nrates > 0) {
- amn->amn_tx_rix0 = sc->sc_rixmap[
- ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL];
+ ni->ni_txrate = ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL;
+ amn->amn_tx_rix0 = sc->sc_rixmap[ni->ni_txrate];
amn->amn_tx_rate0 = rt->info[amn->amn_tx_rix0].rateCode;
amn->amn_tx_rate0sp = amn->amn_tx_rate0 |
rt->info[amn->amn_tx_rix0].shortPreamble;
@@ -268,7 +261,12 @@ ath_rate_update(struct ath_softc *sc, st
amn->amn_tx_rate3 = amn->amn_tx_rate3sp = 0;
}
}
- node_reset (amn);
+ node_reset(amn);
+
+ amn->amn_interval = ath_rateinterval;
+ if (vap->iv_opmode == IEEE80211_M_STA)
+ amn->amn_interval /= 2;
+ amn->amn_interval = (amn->amn_interval * hz) / 1000;
}
/*
@@ -278,11 +276,11 @@ static void
ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni)
{
#define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL)
- struct ieee80211com *ic = &sc->sc_ic;
+ const struct ieee80211_txparam *tp = ni->ni_txparms;
int srate;
KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates"));
- if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) {
+ if (tp == NULL || tp->ucastrate == IEEE80211_FIXED_RATE_NONE) {
/*
* No fixed rate is requested. For 11b start with
* the highest negotiated rate; otherwise, for 11g
@@ -308,7 +306,7 @@ ath_rate_ctl_start(struct ath_softc *sc,
*/
/* NB: the rate set is assumed sorted */
srate = ni->ni_rates.rs_nrates - 1;
- for (; srate >= 0 && RATE(srate) != ic->ic_fixed_rate; srate--)
+ for (; srate >= 0 && RATE(srate) != tp->ucastrate; srate--)
;
}
/*
@@ -321,64 +319,6 @@ ath_rate_ctl_start(struct ath_softc *sc,
#undef RATE
}
-static void
-ath_rate_cb(void *arg, struct ieee80211_node *ni)
-{
- struct ath_softc *sc = arg;
-
- ath_rate_update(sc, ni, 0);
-}
-
-/*
- * Reset the rate control state for each 802.11 state transition.
- */
-void
-ath_rate_newstate(struct ath_softc *sc, enum ieee80211_state state)
-{
- struct amrr_softc *asc = (struct amrr_softc *) sc->sc_rc;
- struct ieee80211com *ic = &sc->sc_ic;
- struct ieee80211_node *ni;
-
- if (state == IEEE80211_S_INIT) {
- callout_stop(&asc->timer);
- return;
- }
- if (ic->ic_opmode == IEEE80211_M_STA) {
- /*
- * Reset local xmit state; this is really only
- * meaningful when operating in station mode.
- */
- ni = ic->ic_bss;
- if (state == IEEE80211_S_RUN) {
- ath_rate_ctl_start(sc, ni);
- } else {
- ath_rate_update(sc, ni, 0);
- }
- } else {
- /*
- * When operating as a station the node table holds
- * the AP's that were discovered during scanning.
- * For any other operating mode we want to reset the
- * tx rate state of each node.
- */
- ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc);
- ath_rate_update(sc, ic->ic_bss, 0);
- }
- if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE &&
- state == IEEE80211_S_RUN) {
- int interval;
- /*
- * Start the background rate control thread if we
- * are not configured to use a fixed xmit rate.
- */
- interval = ath_rateinterval;
- if (ic->ic_opmode == IEEE80211_M_STA)
- interval /= 2;
- callout_reset(&asc->timer, (interval * hz) / 1000,
- ath_ratectl, sc->sc_ifp);
- }
-}
-
/*
* Examine and potentially adjust the transmit rate.
*/
@@ -387,7 +327,7 @@ ath_rate_ctl(void *arg, struct ieee80211
{
struct ath_softc *sc = arg;
struct amrr_node *amn = ATH_NODE_AMRR(ATH_NODE (ni));
- int old_rate;
+ int rix;
#define is_success(amn) \
(amn->amn_tx_try1_cnt < (amn->amn_tx_try0_cnt/10))
@@ -395,52 +335,53 @@ ath_rate_ctl(void *arg, struct ieee80211
(amn->amn_tx_try0_cnt > 10)
#define is_failure(amn) \
(amn->amn_tx_try1_cnt > (amn->amn_tx_try0_cnt/3))
-#define is_max_rate(ni) \
-((ni->ni_txrate + 1) >= ni->ni_rates.rs_nrates)
-#define is_min_rate(ni) \
-(ni->ni_txrate == 0)
- old_rate = ni->ni_txrate;
+ rix = amn->amn_rix;
- DPRINTF (sc, "cnt0: %d cnt1: %d cnt2: %d cnt3: %d -- threshold: %d\n",
- amn->amn_tx_try0_cnt,
- amn->amn_tx_try1_cnt,
- amn->amn_tx_try2_cnt,
- amn->amn_tx_try3_cnt,
- amn->amn_success_threshold);
+ IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_RATECTL, ni,
+ "cnt0: %d cnt1: %d cnt2: %d cnt3: %d -- threshold: %d",
+ amn->amn_tx_try0_cnt, amn->amn_tx_try1_cnt, amn->amn_tx_try2_cnt,
+ amn->amn_tx_try3_cnt, amn->amn_success_threshold);
if (is_success (amn) && is_enough (amn)) {
amn->amn_success++;
if (amn->amn_success == amn->amn_success_threshold &&
- !is_max_rate (ni)) {
+ rix + 1 < ni->ni_rates.rs_nrates) {
amn->amn_recovery = 1;
amn->amn_success = 0;
- ni->ni_txrate++;
- DPRINTF (sc, "increase rate to %d\n", ni->ni_txrate);
+ rix++;
+ IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_RATECTL, ni,
+ "increase rate to %d", rix);
} else {
amn->amn_recovery = 0;
}
} else if (is_failure (amn)) {
amn->amn_success = 0;
- if (!is_min_rate (ni)) {
+ if (rix > 0) {
if (amn->amn_recovery) {
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list