carl9170 firmware: remove debug tx/rx paths crud

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index a122f804237d273b9627d2aaa063a82138be5e12..f42268c417919c2cff9ba5e2173cf20b541a29d1 100644 (file)
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -198,35 +198,9 @@ config CARL9170FW_UART_CLOCK_40M
 
 endchoice
 
-
-choice
-       prompt "TX / RX Path"
-
-       default CARL9170FW_NORMAL_TX_RX
-
-       config CARL9170FW_NORMAL_TX_RX
-               bool
-               prompt "Normal WLAN TX/RX routines"
-
-       config CARL9170FW_LOOPBACK
-               bool
-               depends on CARL9170FW_BROKEN_FEATURES
-               prompt "TX->(tx feedback)->RX loopback"
-               ---help---
-                Useful carlu testcase.
-
-       config CARL9170FW_DISCARD
-               bool
-               depends on CARL9170FW_BROKEN_FEATURES
-               prompt "TX->(tx feedback)"
-               ---help---
-                Useful carlu testcase
-
-endchoice
-
 config CARL9170FW_UNUSABLE
        def_bool y
-       depends on CARL9170FW_BROKEN || CARL9170FW_LOOPBACK
+       depends on CARL9170FW_BROKEN || CARL9170FW_DEBUG
 
 config CARL9170FW_USB_MODESWITCH
        def_bool n

diff --git a/carlfw/include/config.h b/carlfw/include/config.h
index 739c0dadd1da495ac37bb067b4ed89e30d8af6fe..e7c358d6b7e3ab657c7ac15fa487b6f65a2716df 100644 (file)
--- a/carlfw/include/config.h
+++ b/carlfw/include/config.h
@@ -54,11 +54,6 @@
 
 #define CONFIG_CARL9170FW_BACK_REQS_NUM        4
 
-#if ((defined CONFIG_CARL9170FW_DEBUG) ||      \
-       (defined CONFIG_CARL9170FW_LOOPBACK))
-#define CARL9170FW_UNUSABLE    y
-#endif
-
 static inline void __config_check(void)
 {
        BUILD_BUG_ON(!CARL9170_TX_STATUS_NUM);

diff --git a/carlfw/src/hostif.c b/carlfw/src/hostif.c
index 0708a725aeda21bf926698503466b7eba6ce39b4..e445d5f164ad008ef7c14e25ca08b1e17766650b 100644 (file)
--- a/carlfw/src/hostif.c
+++ b/carlfw/src/hostif.c
@@ -96,13 +96,8 @@ static void handle_upload(void)
                        fw.usb.int_desc = desc;
                        fw.usb.int_desc_available = 1;
                } else {
-#ifdef CONFIG_CARL9170FW_LOOPBACK
-                       dma_reclaim(&fw.pta.down_queue, desc);
-                       down_trigger();
-#else
                        dma_reclaim(&fw.wlan.rx_queue, desc);
                        wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
-#endif /* CONFIG_CARL9170FW_LOOPBACK */
                }
        }
 

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index a7c805b588908267541bd994f6c878a0abea16c2..cb2dc75c0ef43805b86989ec3a9798cbaee764fe 100644 (file)
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -292,25 +292,12 @@ static void __wlan_tx(struct dma_desc *desc)
 
        wlan_tx_ampdu(super);
 
-#if (defined CONFIG_CARL9170FW_LOOPBACK) || (defined CONFIG_CARL9170FW_DISCARD)
-       wlan_tx_complete(super, true);
-       unhide_super(desc);
-# ifdef CONFIG_CARL9170FW_LOOPBACK
-       dma_put(&fw.pta.up_queue, desc);
-       up_trigger();
-# elif CONFIG_CARL9170FW_DISCARD
-       dma_reclaim(&fw.pta.down_queue, desc);
-       down_trigger();
-# endif
-#else /* CONFIG_CARL9170FW_LOOPBACK */
-
-# ifdef CONFIG_CARL9170FW_DEBUG
+#ifdef CONFIG_CARL9170FW_DEBUG
        BUG_ON(fw.phy.psm.state != CARL9170_PSM_WAKE);
-# endif /* CONFIG_CARL9170FW_DEBUG */
+#endif /* CONFIG_CARL9170FW_DEBUG */
 
        /* insert desc into the right queue */
        dma_put(&fw.wlan.tx_queue[super->s.queue], desc);
-#endif /* CONFIG_CARL9170FW_LOOPBACK */
 }
 
 static void wlan_assign_seq(struct ieee80211_hdr *hdr, unsigned int vif)