X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fmain.c;h=8c13bf8988c87bb7f748c5b6240bedf4d119716d;hb=HEAD;hp=f62e5ee7b6ce612a1c786ebf4a049fe990e76c53;hpb=1386db71e21e2d9eacc21b0986f1f91fb441b519;p=carl9170fw.git

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index f62e5ee..8c13bf8 100644
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2000-2005 ZyDAS Technology Corporation
  * Copyright (c) 2007-2009 Atheros Communications, Inc.
  * Copyright	2009	Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2011	Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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,6 +28,8 @@
 #include "printf.h"
 #include "gpio.h"
 #include "wl.h"
+#include "rf.h"
+#include "usb.h"
 
 #define AR9170_WATCH_DOG_TIMER		   0x100
 
@@ -46,6 +47,7 @@ static void init(void)
 	/* USB init */
 	usb_init();
 
+	/* initialize DMA memory */
 	memset(&dma_mem, 0, sizeof(dma_mem));
 
 	/* fill DMA rings */
@@ -57,14 +59,9 @@ static void init(void)
 	orl(AR9170_MAC_REG_AFTER_PNP, 1);
 
 	/* Init watch dog control flag */
-#ifdef CONFIG_CARL9170FW_WATCHDOG
 	fw.watchdog_enable = 1;
 
 	set(AR9170_TIMER_REG_WATCH_DOG, AR9170_WATCH_DOG_TIMER);
-#else
-	fw.watchdog_enable = 0;
-	set(AR9170_TIMER_REG_WATCH_DOG, 0xffff);
-#endif /* CONFIG_CARL9170FW_WATCHDOG */
 
 #ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
 	fw.cached_gpio_state.gpio = get(AR9170_GPIO_REG_PORT_DATA) &
@@ -84,7 +81,31 @@ static void handle_fw(void)
 		reboot();
 }
 
-static void __attribute__((noreturn)) main_loop(void)
+static void tally_update(void)
+{
+	unsigned int time;
+
+	time = get_clock_counter();
+#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
+	if (fw.phy.state == CARL9170_PHY_ON) {
+		unsigned int boff, delta;
+
+		delta = (time - fw.tally_clock);
+
+		fw.tally.active += delta;
+
+		boff = get(AR9170_MAC_REG_BACKOFF_STATUS);
+		if (boff & AR9170_MAC_BACKOFF_TX_PE)
+			fw.tally.tx_time += delta;
+		if (boff & AR9170_MAC_BACKOFF_CCA)
+			fw.tally.cca += delta;
+	}
+#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
+	fw.tally_clock = time;
+	fw.counter++;
+}
+
+static void __noreturn main_loop(void)
 {
 	/* main loop */
 	while (1) {
@@ -102,26 +123,23 @@ static void __attribute__((noreturn)) main_loop(void)
 
 		handle_timer();
 
-		fw.counter++;
+		tally_update();
 	}
 }
 
 /*
  * The bootcode will work with the device driver to load the firmware
- * onto the device's Program SRAM. The Program SRAM has a size of 32 KB
- * and also contains the stack, which grows down from 0x208000.
+ * onto the device's Program SRAM. The Program SRAM has a size of 16 KB
+ * and also contains the stack, which grows down from 0x204000.
  *
  * The Program SRAM starts at address 0x200000 on the device.
  * The firmware entry point (0x200004) is located in boot.S.
  * we put _start() there with the linker script carl9170.lds.
  */
 
-void __attribute__((noreturn)) start(void)
+void __in_section(boot) __noreturn __visible start(void)
 {
-	clock_set(true, AHB_40MHZ_OSC);
-
-	/* initialize firmware context and DMA memory */
-	memset(&fw, 0, sizeof(fw));
+	clock_set(AHB_40MHZ_OSC, true);
 
 	/* watchdog magic pattern check */
 	if ((get(AR9170_PWR_REG_WATCH_DOG_MAGIC) & 0xffff0000) == 0x12340000) {