ath9k: clarify what hw code is and remove ath9k.h from a few files
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Mon, 14 Sep 2009 06:39:31 +0000 (23:39 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 7 Oct 2009 20:39:30 +0000 (16:39 -0400)
hw code will be shared between ath9k and ath9k_htc.
Just a few more files are left to clean up, mark them as well.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
12 files changed:
drivers/net/wireless/ath/ath9k/Makefile
drivers/net/wireless/ath/ath9k/ani.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/btcoex.c
drivers/net/wireless/ath/ath9k/calib.c
drivers/net/wireless/ath/ath9k/eeprom_4k.c
drivers/net/wireless/ath/ath9k/eeprom_9287.c
drivers/net/wireless/ath/ath9k/eeprom_def.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/mac.c
drivers/net/wireless/ath/ath9k/phy.c

index ff2c9a26c10cc40d14804e4e1f124761ee74516f..f85dc823577467cfe8057b016cc543f7c87c6990 100644 (file)
@@ -1,19 +1,23 @@
-ath9k-y +=     hw.o \
-               eeprom.o \
+ATH9K_HW_FIX +=        eeprom.o \
+               mac.o \
+
+ATH9K_HW +=    hw.o \
                eeprom_def.o \
                eeprom_4k.o \
                eeprom_9287.o \
-               mac.o \
                calib.o \
                ani.o \
                phy.o \
+               btcoex.o
+
+ath9k-y +=     $(ATH9K_HW) \
+               $(ATH9K_HW_FIX) \
                beacon.o \
                main.o \
                recv.o \
                xmit.o \
                virtual.o \
-               rc.o \
-               btcoex.o
+               rc.o
 
 ath9k-$(CONFIG_PCI) += pci.o
 ath9k-$(CONFIG_ATHEROS_AR71XX) += ahb.o
index bb0a6d9852704b4a7f7b4096ea192687e724a754..ecb23f302c3d44d13ee9cb3b3dfa1abf3ea5828b 100644 (file)
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "ath9k.h"
+#include "hw.h"
 
 static int ath9k_hw_get_ani_channel_idx(struct ath_hw *ah,
                                        struct ath9k_channel *chan)
index e512d519c5962fe617a984c6b3b92f8c4db15295..9aff11da37968b021e71652a93990a419cdf4e62 100644 (file)
@@ -499,7 +499,6 @@ struct ath_led {
  * Used when PCI device not fully initialized by bootrom/BIOS
 */
 #define DEFAULT_CACHELINE       32
-#define        ATH_DEFAULT_NOISE_FLOOR -95
 #define ATH_REGCLASSIDS_MAX     10
 #define ATH_CABQ_READY_TIME     80      /* % of beacon interval */
 #define ATH_MAX_SW_RETRIES      10
index 5d1095f18d7728227197d2f3cff11d5b0b3cfd90..0c54489ca443024e8def364afd763501156f3b6e 100644 (file)
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "ath9k.h"
+#include "hw.h"
 
 enum ath_bt_mode {
        ATH_BT_COEX_MODE_LEGACY,        /* legacy rx_clear mode */
index 2a2212465ea3137fecc51afcb1ec23760ba09053..36c5f89e2fc795d151726edde40ebe861b7f5f4b 100644 (file)
@@ -14,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "ath9k.h"
 #include "hw.h"
 
 /* We can tune this as we go by monitoring really low values */
index 079dd201a2d8b537d441e13e436fcc3ada86a12f..c2ac85c2aab73e94dd9e059c820ad08d12d47017 100644 (file)
@@ -14,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "ath9k.h"
 #include "hw.h"
 
 static int ath9k_hw_4k_get_eeprom_ver(struct ath_hw *ah)
index 6ffe85de75c12deadddb54ab43e2d2ae8e1b4098..839eed89179d68eb212b973825a5878b52a055d0 100644 (file)
@@ -14,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "ath9k.h"
 #include "hw.h"
 
 static int ath9k_hw_AR9287_get_eeprom_ver(struct ath_hw *ah)
index b0687e5bdc1d26ba1a8fd7ae694aec47a370295b..56e90baf69491f3ae6c7a9f401a6feaa4ef60331 100644 (file)
@@ -14,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "ath9k.h"
 #include "hw.h"
 
 static void ath9k_get_txgain_index(struct ath_hw *ah,
index 93da19cbff1033c19b19730dace8d432370daf86..b120c2127e9ad049b629afdfe760b74ed440b798 100644 (file)
@@ -18,7 +18,7 @@
 #include <asm/unaligned.h>
 
 #include "hw.h"
-#include "ath9k.h"
+#include "rc.h"
 #include "initvals.h"
 
 #define ATH9K_CLOCK_RATE_CCK           22
index 35a3224b56feb7f0113c99767912c83e79720c79..874fb11cbac297230ae56191b209c7d7e4deac3a 100644 (file)
@@ -53,6 +53,8 @@
 
 #define ATH_AMPDU_LIMIT_MAX        (64 * 1024 - 1)
 
+#define        ATH_DEFAULT_NOISE_FLOOR -95
+
 /* Register read/write primitives */
 #define REG_WRITE(_ah, _reg, _val) \
        ath9k_hw_common(_ah)->ops->write((_ah), (_val), (_reg))
index 926f201ce4fa688ac3a6c4fd8fbaf833d23edbb8..1796ac773f91dd5e66b3662c1130be45347b8e93 100644 (file)
@@ -15,7 +15,6 @@
  */
 
 #include "ath9k.h"
-#include "hw.h"
 
 static void ath9k_hw_set_txq_interrupts(struct ath_hw *ah,
                                        struct ath9k_tx_queue_info *qi)
index b263025997655a97ae9abf5a2f05c32a4348e821..eec4f1064a6884ce260476b744d58d55b630bab5 100644 (file)
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "ath9k.h"
+#include "hw.h"
 
 void
 ath9k_hw_write_regs(struct ath_hw *ah, u32 modesIndex, u32 freqIndex,