X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fmain.c;h=8c13bf8988c87bb7f748c5b6240bedf4d119716d;hb=195268cae3bb2f462d82dc0178dbca07f0cff706;hp=e36dfad2df0013ad7d22567b63754bf5065db7f3;hpb=dbb81597c39e9ecf9a76420ac374a179d5b94c91;p=carl9170fw.git diff --git a/carlfw/src/main.c b/carlfw/src/main.c index e36dfad..8c13bf8 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 . */ #include "carl9170.h" @@ -84,10 +83,13 @@ static void handle_fw(void) static void tally_update(void) { - unsigned int boff, time, delta; + unsigned int time; time = get_clock_counter(); +#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS if (fw.phy.state == CARL9170_PHY_ON) { + unsigned int boff, delta; + delta = (time - fw.tally_clock); fw.tally.active += delta; @@ -98,7 +100,7 @@ static void tally_update(void) if (boff & AR9170_MAC_BACKOFF_CCA) fw.tally.cca += delta; } - +#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */ fw.tally_clock = time; fw.counter++; } @@ -135,7 +137,7 @@ static void __noreturn main_loop(void) * we put _start() there with the linker script carl9170.lds. */ -void __section(boot) __noreturn __visible start(void) +void __in_section(boot) __noreturn __visible start(void) { clock_set(AHB_40MHZ_OSC, true);