carl9170 firmware: checkpatch/style fixes

[carl9170fw.git] / carlfw / src / main.c

diff --git a/carlfw/src/main.c b/carlfw/src/main.c
index 55acb44792e9fe776666d6bd218d2abfc037a4c5..17cbaf922d06500a76234b4e78988edfc19cc76f 100644 (file)
--- 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,6 +29,8 @@
 #include "printf.h"
 #include "gpio.h"
 #include "wl.h"
+#include "rf.h"
+#include "usb.h"
 
 #define AR9170_WATCH_DOG_TIMER            0x100
 
@@ -44,6 +46,38 @@ static void timer_init(const unsigned int timer, const unsigned int interval)
        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();
@@ -70,14 +104,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) &
@@ -135,6 +164,27 @@ static void handle_timer(void)
 #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 */
@@ -153,23 +203,23 @@ static void __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 start(void)
+void __section(boot) start(void)
 {
-       clock_set(true, AHB_40MHZ_OSC);
+       clock_set(AHB_40MHZ_OSC, true);
 
        /* watchdog magic pattern check */
        if ((get(AR9170_PWR_REG_WATCH_DOG_MAGIC) & 0xffff0000) == 0x12340000) {