X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fmain.c;h=8cb5fc13986a9d2af967d107faba3912453b51c1;hb=refs%2Fheads%2Fradar;hp=92b74a0a12a37316d930fccb3ecef19746940cbd;hpb=ab43d8cf291c5a517841ac0ae445c9bc6d74cf5c;p=carl9170fw.git

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index 92b74a0..8cb5fc1 100644
--- a/carlfw/src/main.c
+++ b/carlfw/src/main.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"
@@ -31,53 +30,10 @@
 #include "wl.h"
 #include "rf.h"
 #include "usb.h"
+#include "pattern_generator.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));
-}
-
-void clock_set(enum cpu_clock_t clock_, bool on)
-{
-	/*
-	 * Word of Warning!
-	 * This setting does more than just mess with the CPU Clock.
-	 * So watch out, if you need _stable_ timer interrupts.
-	 */
-#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
-        if (fw.phy.frequency < 3000000)
-		set(AR9170_PWR_REG_PLL_ADDAC, 0x5163);
-        else
-                set(AR9170_PWR_REG_PLL_ADDAC, 0x5143);
-#else
-	set(AR9170_PWR_REG_PLL_ADDAC, 0x5163);
-#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
-
-	fw.ticks_per_usec = GET_VAL(AR9170_PWR_PLL_ADDAC_DIV,
-		get(AR9170_PWR_REG_PLL_ADDAC));
-
-	set(AR9170_PWR_REG_CLOCK_SEL, (uint32_t) ((on ? 0x70 : 0x600) | clock_));
-
-	switch (clock_) {
-	case AHB_20_22MHZ:
-		fw.ticks_per_usec >>= 1;
-	case AHB_40MHZ_OSC:
-	case AHB_40_44MHZ:
-		fw.ticks_per_usec >>= 1;
-	case AHB_80_88MHZ:
-		break;
-	}
-}
-
 static void init(void)
 {
 	led_init();
@@ -126,46 +82,28 @@ static void handle_fw(void)
 		reboot();
 }
 
-static void timer0_isr(void)
+static void tally_update(void)
 {
-	wlan_timer();
-
-#ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
-	gpio_timer();
-#endif /* CONFIG_CARL9170FW_GPIO_INTERRUPT */
+	unsigned int time;
 
+	time = get_clock_counter();
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
-	tally_update();
-#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
-
-#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 */
-}
+	if (fw.phy.state == CARL9170_PHY_ON) {
+		unsigned int boff, delta;
 
-static void handle_timer(void)
-{
-	uint32_t intr;
+		delta = (time - fw.tally_clock);
 
-	intr = get(AR9170_TIMER_REG_INTERRUPT);
+		fw.tally.active += delta;
 
-	/* ACK timer interrupt */
-	set(AR9170_TIMER_REG_INTERRUPT, intr);
-
-#define HANDLER(intr, flag, func)			\
-	do {						\
-		if ((intr & flag) != 0) {		\
-			intr &= ~flag;			\
-			func();				\
-		}					\
-	} while (0)
-
-	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)
@@ -186,7 +124,9 @@ static void __noreturn main_loop(void)
 
 		handle_timer();
 
-		fw.counter++;
+		tally_update();
+
+		pattern_generator();
 	}
 }
 
@@ -200,7 +140,7 @@ static void __noreturn main_loop(void)
  * we put _start() there with the linker script carl9170.lds.
  */
 
-void __section(boot) start(void)
+void __in_section(boot) __noreturn __visible start(void)
 {
 	clock_set(AHB_40MHZ_OSC, true);