projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 firmware: report device tallies
[carl9170fw.git]
/
carlfw
/
src
/
main.c
diff --git
a/carlfw/src/main.c
b/carlfw/src/main.c
index 2c8ea9a30540acf7cf2744e9599943e4ad4caa37..97a4331c285d1a9e91b0eb0376f0ebc844437d6c 100644
(file)
--- a/
carlfw/src/main.c
+++ b/
carlfw/src/main.c
@@
-29,6
+29,7
@@
#include "printf.h"
#include "gpio.h"
#include "wl.h"
#include "printf.h"
#include "gpio.h"
#include "wl.h"
+#include "rf.h"
#include "usb.h"
#define AR9170_WATCH_DOG_TIMER 0x100
#include "usb.h"
#define AR9170_WATCH_DOG_TIMER 0x100
@@
-52,10
+53,14
@@
void clock_set(enum cpu_clock_t clock_, bool on)
* This setting does more than just mess with the CPU Clock.
* So watch out, if you need _stable_ timer interrupts.
*/
* 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);
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));
fw.ticks_per_usec = GET_VAL(AR9170_PWR_PLL_ADDAC_DIV,
get(AR9170_PWR_REG_PLL_ADDAC));
@@
-131,6
+136,10
@@
static void timer0_isr(void)
gpio_timer();
#endif /* CONFIG_CARL9170FW_GPIO_INTERRUPT */
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 */
#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 */