projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 toolchain: update to gcc 6.2.0 and binutils 2.27
[carl9170fw.git]
/
carlfw
/
src
/
main.c
diff --git
a/carlfw/src/main.c
b/carlfw/src/main.c
index e36dfad2df0013ad7d22567b63754bf5065db7f3..8cb5fc13986a9d2af967d107faba3912453b51c1 100644
(file)
--- 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
* 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"
*/
#include "carl9170.h"
@@
-31,6
+30,7
@@
#include "wl.h"
#include "rf.h"
#include "usb.h"
#include "wl.h"
#include "rf.h"
#include "usb.h"
+#include "pattern_generator.h"
#define AR9170_WATCH_DOG_TIMER 0x100
#define AR9170_WATCH_DOG_TIMER 0x100
@@
-84,10
+84,13
@@
static void handle_fw(void)
static void tally_update(void)
{
static void tally_update(void)
{
- unsigned int
boff, time, delta
;
+ unsigned int
time
;
time = get_clock_counter();
time = get_clock_counter();
+#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
if (fw.phy.state == CARL9170_PHY_ON) {
if (fw.phy.state == CARL9170_PHY_ON) {
+ unsigned int boff, delta;
+
delta = (time - fw.tally_clock);
fw.tally.active += delta;
delta = (time - fw.tally_clock);
fw.tally.active += delta;
@@
-98,7
+101,7
@@
static void tally_update(void)
if (boff & AR9170_MAC_BACKOFF_CCA)
fw.tally.cca += delta;
}
if (boff & AR9170_MAC_BACKOFF_CCA)
fw.tally.cca += delta;
}
-
+#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
fw.tally_clock = time;
fw.counter++;
}
fw.tally_clock = time;
fw.counter++;
}
@@
-122,6
+125,8
@@
static void __noreturn main_loop(void)
handle_timer();
tally_update();
handle_timer();
tally_update();
+
+ pattern_generator();
}
}
}
}
@@
-135,7
+140,7
@@
static void __noreturn main_loop(void)
* we put _start() there with the linker script carl9170.lds.
*/
* 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);
{
clock_set(AHB_40MHZ_OSC, true);