X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fmain.c;h=b2d16390cff576eea2f4fd2608ba849b650f1849;hb=5b149f61948fee829cb9407702c17231c0aa1b6b;hp=bf6602a8d8cc29af60916edb97737b4facf9d84f;hpb=10280c74bd62f63b1483bf1b17d40b0eeb35845e;p=carl9170fw.git

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index bf6602a..b2d1639 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
@@ -29,21 +29,11 @@
 #include "printf.h"
 #include "gpio.h"
 #include "wl.h"
+#include "rf.h"
+#include "usb.h"
 
 #define AR9170_WATCH_DOG_TIMER		   0x100
 
-static void timer_init(const unsigned int timer, const unsigned int interval)
-{
-	/* Set timer to periodic mode */
-	orl(AR9170_TIMER_REG_CONTROL, BIT(timer));
-
-	/* Set time interval */
-	set(AR9170_TIMER_REG_TIMER0 + (timer << 2), interval - 1);
-
-	/* Clear timer interrupt flag */
-	orl(AR9170_TIMER_REG_INTERRUPT, BIT(timer));
-}
-
 static void init(void)
 {
 	led_init();
@@ -70,14 +60,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) &
@@ -97,42 +82,28 @@ static void handle_fw(void)
 		reboot();
 }
 
-static void timer0_isr(void)
+static void tally_update(void)
 {
-	wlan_timer();
+	unsigned int time;
 
-#ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
-	gpio_timer();
-#endif /* CONFIG_CARL9170FW_GPIO_INTERRUPT */
+	time = get_clock_counter();
+#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
+	if (fw.phy.state == CARL9170_PHY_ON) {
+		unsigned int boff, delta;
 
-#ifdef CONFIG_CARL9170FW_DEBUG_LED_HEARTBEAT
-	set(AR9170_GPIO_REG_PORT_DATA, get(AR9170_GPIO_REG_PORT_DATA) ^ 1);
-#endif /* CONFIG_CARL9170FW_DEBUG_LED_HEARTBEAT */
-}
+		delta = (time - fw.tally_clock);
 
-static void handle_timer(void)
-{
-	uint32_t intr;
-
-	intr = get(AR9170_TIMER_REG_INTERRUPT);
-
-	/* ACK timer interrupt */
-	set(AR9170_TIMER_REG_INTERRUPT, intr);
-
-#define HANDLER(intr, flag, func)			\
-	do {						\
-		if ((intr & flag) != 0) {		\
-			intr &= ~flag;			\
-			func();				\
-		}					\
-	} while (0)
+		fw.tally.active += delta;
 
-	HANDLER(intr, BIT(0), timer0_isr);
-
-	if (intr)
-		DBG("Unhandled Timer Event %x", (unsigned int) intr);
-
-#undef HANDLER
+		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)
@@ -153,7 +124,7 @@ static void __noreturn main_loop(void)
 
 		handle_timer();
 
-		fw.counter++;
+		tally_update();
 	}
 }
 
@@ -167,7 +138,7 @@ static void __noreturn main_loop(void)
  * we put _start() there with the linker script carl9170.lds.
  */
 
-void start(void)
+void __section(boot) __noreturn __visible start(void)
 {
 	clock_set(AHB_40MHZ_OSC, true);