* So watch out, if you need _stable_ timer interrupts.
*/
#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
- if (fw.phy.frequency < 3000000)
+ 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, 0x5143);
#else
set(AR9170_PWR_REG_PLL_ADDAC, 0x5163);
#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
case AHB_80_88MHZ:
break;
}
-
- timer_init(1, (fw.ticks_per_usec * 25) >> 1);
}
static void init(void)
gpio_timer();
#endif /* CONFIG_CARL9170FW_GPIO_INTERRUPT */
-#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 */
}
-static void timer1_isr(void)
-{
-}
-
static void handle_timer(void)
{
uint32_t intr;
HANDLER(intr, BIT(0), timer0_isr);
- HANDLER(intr, BIT(1), timer1_isr);
-
if (intr)
DBG("Unhandled Timer Event %x", (unsigned int) intr);
#undef HANDLER
}
+static void tally_update(void)
+{
+ unsigned int boff, time, delta;
+
+ time = get_clock_counter();
+ if (fw.phy.state == CARL9170_PHY_ON) {
+ 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;
+ }
+
+ fw.tally_clock = time;
+ fw.counter++;
+}
+
static void __noreturn main_loop(void)
{
/* main loop */
handle_timer();
- fw.counter++;
+ tally_update();
}
}