summaryrefslogtreecommitdiffstats
path: root/firmware/zpu/apps
diff options
context:
space:
mode:
authorNick Foster <nick@nerdnetworks.org>2011-04-21 19:45:05 -0700
committerNick Foster <nick@nerdnetworks.org>2011-04-21 19:45:05 -0700
commit3dd74062fc6cfad68a62faac6669bada96f3aecf (patch)
tree9179979b9245e4ea5979100701ac017f52c74d62 /firmware/zpu/apps
parentf9080d0a3f7d6b0478150581a0c2e8af3f4e3c95 (diff)
downloaduhd-3dd74062fc6cfad68a62faac6669bada96f3aecf.tar.gz
uhd-3dd74062fc6cfad68a62faac6669bada96f3aecf.tar.bz2
uhd-3dd74062fc6cfad68a62faac6669bada96f3aecf.zip
N210: Moved u2p_init into main app and changed bootloader behavior to not load safe fw if safe mode button pressed
Diffstat (limited to 'firmware/zpu/apps')
-rw-r--r--firmware/zpu/apps/txrx_uhd.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/firmware/zpu/apps/txrx_uhd.c b/firmware/zpu/apps/txrx_uhd.c
index 12f173f5c..8c27618e9 100644
--- a/firmware/zpu/apps/txrx_uhd.c
+++ b/firmware/zpu/apps/txrx_uhd.c
@@ -39,6 +39,10 @@
#include <string.h>
#include <stdbool.h>
+#ifdef USRP2P
+#include "u2p_init.h"
+#endif
+
extern uint16_t dsp0_dst_port, err0_dst_port, dsp1_dst_port;
static void handle_udp_data_packet(
@@ -284,6 +288,9 @@ int
main(void)
{
u2_init();
+#ifdef USRP2P
+ u2p_init();
+#endif
putstr("\nTxRx-UHD-ZPU\n");
print_mac_addr(ethernet_mac_addr()); newline();