X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Frf.c;h=5e8d3d86483159fd7809229ca5a7760bc7718d64;hb=b94cc57fa4ee29cb70415b699a1efc5f66eb41c7;hp=8deafb50cb167fbbe54845bbc7a583b27f0a92e5;hpb=d57b31e45dca1087cefd56876a0a8064efe4e29c;p=carl9170fw.git

diff --git a/carlfw/src/rf.c b/carlfw/src/rf.c
index 8deafb5..5e8d3d8 100644
--- a/carlfw/src/rf.c
+++ b/carlfw/src/rf.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "carl9170.h"
@@ -29,32 +28,6 @@
 #include "rf.h"
 #include "shared/phy.h"
 
-void tally_update(void)
-{
-	unsigned int time;
-
-#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
-	unsigned int main_not_free, ext_not_free;
-
-	main_not_free = get(AR9170_MAC_REG_CHANNEL_BUSY);
-	ext_not_free = get(AR9170_MAC_REG_EXT_BUSY);
-	time = get_clock_counter();
-
-	if (fw.phy.state == CARL9170_PHY_ON) {
-		unsigned int us_delta = (time - fw.tally_clock) / max(fw.ticks_per_usec, 40u);
-
-		fw.tally.active += us_delta;
-		fw.tally.main_free += main_not_free;
-		fw.tally.ext_free += ext_not_free;
-	}
-#else
-	time = get_clock_counter();
-
-#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
-
-	fw.tally_clock = time;
-}
-
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
 static void set_channel_end(void)
 {
@@ -64,16 +37,11 @@ static void set_channel_end(void)
 	andl(AR9170_MAC_REG_QOS_PRIORITY_VIRTUAL_CCA,
 	     ~AR9170_MAC_VIRTUAL_CCA_ALL);
 
-	/* clear statistics */
-	tally_update();
-
 	fw.phy.state = CARL9170_PHY_ON;
 }
 
 void rf_notify_set_channel(void)
 {
-	tally_update();
-
 	/* Manipulate CCA threshold to stop transmission */
 	set(AR9170_PHY_REG_CCA_THRESHOLD, 0x300);
 	/* Enable Virtual CCA */
@@ -82,8 +50,8 @@ void rf_notify_set_channel(void)
 
 	/* reset CCA stats */
 	fw.tally.active = 0;
-	fw.tally.main_free = 0;
-	fw.tally.ext_free = 0;
+	fw.tally.cca = 0;
+	fw.tally.tx_time = 0;
 	fw.phy.state = CARL9170_PHY_OFF;
 }
 
@@ -236,10 +204,14 @@ void rf_cmd(const struct carl9170_cmd *cmd, struct carl9170_rsp *resp)
 	/*
 	 * Is the clock controlled by the PHY?
 	 */
+#ifdef CONFIG_CARL9170FW_80MHZ_CLOCK
 	if ((fw.phy.ht_settings & EIGHTY_FLAG) == EIGHTY_FLAG)
 		clock_set(AHB_80_88MHZ, true);
 	else
 		clock_set(AHB_40_44MHZ, true);
+#else
+	clock_set(AHB_40_44MHZ, true);
+#endif
 
 	ret = rf_init(le32_to_cpu(cmd->rf_init.delta_slope_coeff_exp),
 		      le32_to_cpu(cmd->rf_init.delta_slope_coeff_man),
@@ -276,7 +248,6 @@ void rf_psm(void)
 		/* Synthesizer off + RX off */
 		bank3 = 0x00400018;
 
-		tally_update();
 		fw.phy.state = CARL9170_PHY_OFF;
 	} else {
 		/* advance to the next PSM step */
@@ -294,7 +265,6 @@ void rf_psm(void)
 			/* Synthesizer on + RX on */
 			bank3 = 0x01420098;
 
-			tally_update();
 			fw.phy.state = CARL9170_PHY_ON;
 		} else {
 			return ;